- add libproxy-no-libperl.diff

OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=104

libproxy-no-libperl.diff

@@ -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 "")
+ 

libproxy-plugins.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  5 18:08:52 CEST 2013 - mls@suse.de
+
+- add libproxy-no-libperl.diff: 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.
+- use perl_requires if it is defined
+
 -------------------------------------------------------------------
 Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
 

libproxy-plugins.spec

@@ -45,6 +45,7 @@ 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
+Patch1:         libproxy-no-libperl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -271,8 +272,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 +312,7 @@ libproxy offers the following features: * extremely small core
 %prep
 %setup -q -n %{_sourcename}
 %patch0
+%patch1
 mkdir build
 
 %build

libproxy.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Sep  5 18:08:52 CEST 2013 - mls@suse.de
+
+- add libproxy-no-libperl.diff: 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.
+- use perl_requires if it is defined
+
 -------------------------------------------------------------------
 Mon Aug 26 18:07:54 UTC 2013 - dimstar@opensuse.org
 

libproxy.spec

@@ -45,6 +45,7 @@ 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
+Patch1:         libproxy-no-libperl.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
@@ -271,8 +272,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 +312,7 @@ libproxy offers the following features: * extremely small core
 %prep
 %setup -q -n %{_sourcename}
 %patch0
+%patch1
 mkdir build
 
 %build