From ea79433772719ff80bdff37240559e00b906a39a4e854328a945a005701e497c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Schr=C3=B6der?= Date: Thu, 5 Sep 2013 16:12:04 +0000 Subject: [PATCH 1/2] - add libproxy-no-libperl.diff OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=104 --- libproxy-no-libperl.diff | 11 +++++++++++ libproxy-plugins.changes | 8 ++++++++ libproxy-plugins.spec | 6 ++++++ libproxy.changes | 8 ++++++++ libproxy.spec | 6 ++++++ 5 files changed, 39 insertions(+) create mode 100644 libproxy-no-libperl.diff diff --git a/libproxy-no-libperl.diff b/libproxy-no-libperl.diff new file mode 100644 index 0000000..a6da987 --- /dev/null +++ b/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 "") + diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index 68e2613..dba30dd 100644 --- a/libproxy-plugins.changes +++ b/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 diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index 8226b59..a10fbe3 100644 --- a/libproxy-plugins.spec +++ b/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 diff --git a/libproxy.changes b/libproxy.changes index 68e2613..dba30dd 100644 --- a/libproxy.changes +++ b/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 diff --git a/libproxy.spec b/libproxy.spec index bea1a67..d4fcb18 100644 --- a/libproxy.spec +++ b/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 From 8748cfbb38bfe9c027feae4a51473bf8ed7e76262d69f083479a4ccb454ce2a8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Sep 2013 11:16:50 +0000 Subject: [PATCH 2/2] Checkin - cleaned up OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/libproxy?expand=0&rev=105 --- libproxy-no-libperl.diff => libproxy-no-libperl.patch | 0 libproxy-plugins.changes | 10 ++++++---- libproxy-plugins.spec | 3 ++- libproxy.changes | 10 ++++++---- libproxy.spec | 3 ++- 5 files changed, 16 insertions(+), 10 deletions(-) rename libproxy-no-libperl.diff => libproxy-no-libperl.patch (100%) diff --git a/libproxy-no-libperl.diff b/libproxy-no-libperl.patch similarity index 100% rename from libproxy-no-libperl.diff rename to libproxy-no-libperl.patch diff --git a/libproxy-plugins.changes b/libproxy-plugins.changes index dba30dd..2a1b744 100644 --- a/libproxy-plugins.changes +++ b/libproxy-plugins.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- 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 +- 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 diff --git a/libproxy-plugins.spec b/libproxy-plugins.spec index a10fbe3..15979b1 100644 --- a/libproxy-plugins.spec +++ b/libproxy-plugins.spec @@ -45,7 +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 -Patch1: libproxy-no-libperl.diff +# 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++ diff --git a/libproxy.changes b/libproxy.changes index dba30dd..2a1b744 100644 --- a/libproxy.changes +++ b/libproxy.changes @@ -1,10 +1,12 @@ ------------------------------------------------------------------- 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 +- 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 diff --git a/libproxy.spec b/libproxy.spec index d4fcb18..8ceb0e9 100644 --- a/libproxy.spec +++ b/libproxy.spec @@ -45,7 +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 -Patch1: libproxy-no-libperl.diff +# 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++