diff --git a/0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch b/0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch index 5251f98..755ebd7 100644 --- a/0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch +++ b/0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch @@ -14,10 +14,10 @@ Signed-off-by: David Disseldorp src/pmns/GNUmakefile | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) -diff --git a/configure b/configure -index 99e07b368..e69366f07 100755 ---- a/configure -+++ b/configure +Index: pcp-4.3.0/configure +=================================================================== +--- pcp-4.3.0.orig/configure ++++ pcp-4.3.0/configure @@ -3324,6 +3324,7 @@ then $as_echo "#define IS_LINUX 1" >>confdefs.h @@ -26,10 +26,10 @@ index 99e07b368..e69366f07 100755 test -f /etc/fedora-release && target_distro=fedora test -f /etc/redhat-release && target_distro=redhat test -f /etc/debian_version && target_distro=debian -diff --git a/configure.ac b/configure.ac -index 359ed5507..7d8082c56 100644 ---- a/configure.ac -+++ b/configure.ac +Index: pcp-4.3.0/configure.ac +=================================================================== +--- pcp-4.3.0.orig/configure.ac ++++ pcp-4.3.0/configure.ac @@ -281,6 +281,7 @@ if test $target_os = linux then AC_DEFINE(IS_LINUX, [1], [Platform is Linux]) @@ -38,19 +38,16 @@ index 359ed5507..7d8082c56 100644 test -f /etc/fedora-release && target_distro=fedora test -f /etc/redhat-release && target_distro=redhat test -f /etc/debian_version && target_distro=debian -diff --git a/src/pmns/GNUmakefile b/src/pmns/GNUmakefile -index e8707a7e5..9b9458359 100644 ---- a/src/pmns/GNUmakefile -+++ b/src/pmns/GNUmakefile +Index: pcp-4.3.0/src/pmns/GNUmakefile +=================================================================== +--- pcp-4.3.0.orig/src/pmns/GNUmakefile ++++ pcp-4.3.0/src/pmns/GNUmakefile @@ -60,7 +60,7 @@ install: default $(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild $(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid $(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR) -ifeq (, $(filter redhat debian, $(PACKAGE_DISTRIBUTION))) -+ifeq (, $(filter redhat debian suse, $(PACKAGE_DISTRIBUTION))) ++ifneq "$(TARGET_OS)" "linux" $(INSTALL) -m 644 .NeedRebuild $(PMNS_VAR_DIR)/.NeedRebuild endif --- -2.13.7 - diff --git a/pcp.changes b/pcp.changes index ff28f77..c19f3d8 100644 --- a/pcp.changes +++ b/pcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 31 12:58:08 UTC 2019 - ddiss@suse.com + +- Drop distribution-release build dependency completely; (bsc#1123311). + + modify 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch + ------------------------------------------------------------------- Wed Jan 30 10:33:12 UTC 2019 - ddiss@suse.com diff --git a/pcp.spec b/pcp.spec index 2349df1..8da06b2 100644 --- a/pcp.spec +++ b/pcp.spec @@ -247,7 +247,6 @@ BuildRequires: flex BuildRequires: gcc-c++ BuildRequires: zlib-devel %if 0%{?suse_version} -BuildRequires: distribution-release BuildRequires: fdupes BuildRequires: mozilla-nss-devel %else # suse_version