From a5adbb165c98d0e2e78cac2055b4efffe245da6aba88a484f3cb6f4bbabf3ad0 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 27 Mar 2015 10:18:43 +0000 Subject: [PATCH] - Ensure the perl modules correctly link against the PCP libraries; (bnc#841204). + remove 0004-Remove-CPAN-rpaths.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/pcp?expand=0&rev=44 --- 0004-Remove-CPAN-rpaths.patch | 53 ----------------------------------- pcp.changes | 7 +++++ pcp.spec | 31 ++++++++------------ 3 files changed, 19 insertions(+), 72 deletions(-) delete mode 100644 0004-Remove-CPAN-rpaths.patch diff --git a/0004-Remove-CPAN-rpaths.patch b/0004-Remove-CPAN-rpaths.patch deleted file mode 100644 index 2227883..0000000 --- a/0004-Remove-CPAN-rpaths.patch +++ /dev/null @@ -1,53 +0,0 @@ -From a5e63d1f241a9b574c30093a71e41ab7c9f64dc9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= -Date: Fri, 12 Dec 2014 15:45:33 +0100 -Subject: [PATCH 4/6] Remove CPAN rpaths - ---- - src/perl/LogImport/Makefile.PL | 2 +- - src/perl/MMV/Makefile.PL | 2 +- - src/perl/PMDA/Makefile.PL | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/perl/LogImport/Makefile.PL b/src/perl/LogImport/Makefile.PL -index 20b716dbea6f..89d5f61e67dc 100644 ---- a/src/perl/LogImport/Makefile.PL -+++ b/src/perl/LogImport/Makefile.PL -@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { - else { - $ldfrom = "LogImport.o", - $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; -- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp/src -L$ENV{PCP_TOPDIR}/src/libpcp_import/src -lpcp_import -lpcp"]; -+ $libs = ["-lpcp_import -lpcp"]; - } - if ($ENV{TARGET_OS} eq "darwin") { - # standard ones, minus -arch ppc -diff --git a/src/perl/MMV/Makefile.PL b/src/perl/MMV/Makefile.PL -index 6a85129842fb..3921421ad80c 100644 ---- a/src/perl/MMV/Makefile.PL -+++ b/src/perl/MMV/Makefile.PL -@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { - else { - $ldfrom = "MMV.o"; - $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; -- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_mmv/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_mmv -lpcp"]; -+ $libs = ["-lpcp_mmv -lpcp"]; - } - if ($ENV{TARGET_OS} eq "darwin") { - # standard ones, minus -arch ppc -diff --git a/src/perl/PMDA/Makefile.PL b/src/perl/PMDA/Makefile.PL -index 1191a025fedf..7b1155685ae2 100644 ---- a/src/perl/PMDA/Makefile.PL -+++ b/src/perl/PMDA/Makefile.PL -@@ -15,7 +15,7 @@ if ($ENV{TARGET_OS} eq "mingw") { - else { - $ldfrom = "local.o PMDA.o"; - $inc = "-I$ENV{PCP_TOPDIR}/src/include/pcp -I/usr/include/pcp"; -- $libs = ["-L$ENV{PCP_TOPDIR}/src/libpcp_pmda/src -L$ENV{PCP_TOPDIR}/src/libpcp/src -lpcp_pmda -lpcp"]; -+ $libs = ["-lpcp_pmda -lpcp"]; - } - if ($ENV{TARGET_OS} eq "darwin") { - # standard ones, minus -arch ppc --- -2.1.2 - diff --git a/pcp.changes b/pcp.changes index 9c28f63..0441afa 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Mar 18 23:13:23 UTC 2015 - ddiss@suse.com + +- Ensure the perl modules correctly link against the PCP libraries; + (bnc#841204). + + remove 0004-Remove-CPAN-rpaths.patch + ------------------------------------------------------------------- Tue Mar 3 14:08:18 UTC 2015 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index 6accc9c..de42c60 100644 --- a/pcp.spec +++ b/pcp.spec @@ -78,23 +78,21 @@ Source1: pcp-webjs.src.tar.gz Source2: pcp-rpmlintrc %endif -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch1: 0001-Fix-XEN-build.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch2: 0002-Install-libraries-without-exec-permission.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch3: 0003-pcp-legacy-init-lsb.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de -Patch4: 0004-Remove-CPAN-rpaths.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch5: 0005-Remove-runlevel-4-from-init-scripts.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch6: 0006-create-pmlogger-and-pmie-logdirs-during-install.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch7: 0007-Honor-CFLAGS-in-qmake.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch8: 0008-SUSE-fy-pmsnap-control-path.patch -# PACTH-FIX-OPENSUSE, kkaempf@suse.de +# PATCH-FIX-OPENSUSE, kkaempf@suse.de Patch9: 0009-pmsnap-control-var-www-srv-www.patch # There are no papi/libpfm devel packages for s390 nor for some rhels, disable @@ -449,9 +447,8 @@ Group: %{lib_devel_gr} Url: http://www.pcp.io %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-PMDA The PCP::PMDA Perl module contains the language bindings for @@ -471,9 +468,8 @@ Url: http://www.pcp.io Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-MMV The PCP::MMV module contains the Perl language bindings for @@ -494,9 +490,8 @@ Url: http://www.pcp.io Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-LogImport The PCP::LogImport module contains the Perl language bindings for @@ -514,9 +509,8 @@ Url: http://www.pcp.io Requires: pcp >= %{version} %if 0%{?suse_version} %perl_requires -%else -Requires: pcp-libs = %{version}-%{release} %endif +Requires: %{lib_pkg} = %{version}-%{release} %description -n perl-PCP-LogSummary The PCP::LogSummary module provides a Perl module for using the @@ -782,7 +776,6 @@ PCP utilities and daemons, and the PCP graphical tools. %patch1 -p1 %patch2 -p1 %patch3 -p1 -%patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1