Accepting request 197823 from GNOME:Factory
Submit mls' fix.. cleaned up and standardized OBS-URL: https://build.opensuse.org/request/show/197823 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libproxy?expand=0&rev=55
This commit is contained in:
commit
ad5685fa7d
11
libproxy-no-libperl.patch
Normal file
11
libproxy-no-libperl.patch
Normal file
@ -0,0 +1,11 @@
|
||||
--- ./bindings/perl/src/CMakeLists.txt.orig 2013-09-05 15:58:05.278486569 +0000
|
||||
+++ ./bindings/perl/src/CMakeLists.txt 2013-09-05 15:58:41.772486504 +0000
|
||||
@@ -12,7 +12,7 @@ set(Libproxy_LIB_SRCS Libproxy.c)
|
||||
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/perl/blib/arch/auto/Net)
|
||||
add_library(PLlibproxy SHARED ${Libproxy_LIB_SRCS})
|
||||
|
||||
-target_link_libraries(PLlibproxy ${PERL_LIBRARY} libproxy)
|
||||
+target_link_libraries(PLlibproxy libproxy)
|
||||
set_target_properties(PLlibproxy PROPERTIES OUTPUT_NAME "Libproxy")
|
||||
set_target_properties(PLlibproxy PROPERTIES PREFIX "")
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 18:08:52 CEST 2013 - mls@suse.de
|
||||
|
||||
- Add libproxy-no-libperl.patch: do not link the perl module
|
||||
against libperl. We do not want a dependency on the libperl
|
||||
library, as that would make as depend on the specific version of
|
||||
perl. As the bindings are running in perl context, libperl can
|
||||
be assumed to be loaded by that time.
|
||||
- Use perl_requires if it is defined.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
@ -45,6 +45,8 @@ Source98: update-from-svn.sh
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
|
||||
Patch0: libproxy-pxgsettings-crash.patch
|
||||
# PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream.
|
||||
Patch1: libproxy-no-libperl.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
@ -271,8 +273,12 @@ libproxy offers the following features: * extremely small core
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
%if 0%{?perl_requires:1}
|
||||
%{perl_requires}
|
||||
%else
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
%endif
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
@ -307,6 +313,7 @@ libproxy offers the following features: * extremely small core
|
||||
%prep
|
||||
%setup -q -n %{_sourcename}
|
||||
%patch0
|
||||
%patch1
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 5 18:08:52 CEST 2013 - mls@suse.de
|
||||
|
||||
- Add libproxy-no-libperl.patch: do not link the perl module
|
||||
against libperl. We do not want a dependency on the libperl
|
||||
library, as that would make as depend on the specific version of
|
||||
perl. As the bindings are running in perl context, libperl can
|
||||
be assumed to be loaded by that time.
|
||||
- Use perl_requires if it is defined.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
|
||||
|
||||
|
@ -45,6 +45,8 @@ Source98: update-from-svn.sh
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM libproxy-pxgsettings-crash.patch bnc#836576 dimstar@opensuse.org -- Fix crash when pxgsettings is closing, taken from svn.
|
||||
Patch0: libproxy-pxgsettings-crash.patch
|
||||
# PATCH-FIX-UPSTREAM libproxy-no-libperl.patch mls@suse.de -- Do not link against libperl. Submitted upstream.
|
||||
Patch1: libproxy-no-libperl.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
@ -271,8 +273,12 @@ libproxy offers the following features: * extremely small core
|
||||
Summary: Perl bindings for libproxy
|
||||
Group: Development/Libraries/Perl
|
||||
Requires: libproxy1 = %{version}
|
||||
%if 0%{?perl_requires:1}
|
||||
%{perl_requires}
|
||||
%else
|
||||
# For Fedora at least perl = perl_version does not work.
|
||||
Requires: perl >= %{perl_version}
|
||||
%endif
|
||||
|
||||
%description -n perl-Net-Libproxy
|
||||
libproxy offers the following features: * extremely small core
|
||||
@ -307,6 +313,7 @@ libproxy offers the following features: * extremely small core
|
||||
%prep
|
||||
%setup -q -n %{_sourcename}
|
||||
%patch0
|
||||
%patch1
|
||||
mkdir build
|
||||
|
||||
%build
|
||||
|
Loading…
Reference in New Issue
Block a user