pool/pcp
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 670357 from Base:System

Browse Source 
- Drop distribution-release build dependency completely; (bsc#1123311).
  + modify 0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch

- Replace openSUSE/sles-release build dependency; (bsc#1123311).

OBS-URL: https://build.opensuse.org/request/show/670357
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pcp?expand=0&rev=47
This commit is contained in:
Stephan Kulow 2019-02-06 13:05:05 +00:00 committed by Git OBS Bridge
commit 1ac54f7b08
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
0010-pmns-don-t-package-.NeedRebuild-for-SUSE-distros.patch
View File

@ -14,10 +14,10 @@ Signed-off-by: David Disseldorp <ddiss@suse.de>
src/pmns/GNUmakefile | 2 +- src/pmns/GNUmakefile | 2 +-
3 files changed, 3 insertions(+), 1 deletion(-) 3 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure b/configure Index: pcp-4.3.0/configure
index 99e07b368..e69366f07 100755 ===================================================================
--- a/configure --- pcp-4.3.0.orig/configure
+++ b/configure +++ pcp-4.3.0/configure
@@ -3324,6 +3324,7 @@ then @@ -3324,6 +3324,7 @@ then
$as_echo "#define IS_LINUX 1" >>confdefs.h $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/fedora-release && target_distro=fedora
test -f /etc/redhat-release && target_distro=redhat test -f /etc/redhat-release && target_distro=redhat
test -f /etc/debian_version && target_distro=debian test -f /etc/debian_version && target_distro=debian
diff --git a/configure.ac b/configure.ac Index: pcp-4.3.0/configure.ac
index 359ed5507..7d8082c56 100644 ===================================================================
--- a/configure.ac --- pcp-4.3.0.orig/configure.ac
+++ b/configure.ac +++ pcp-4.3.0/configure.ac
@@ -281,6 +281,7 @@ if test $target_os = linux @@ -281,6 +281,7 @@ if test $target_os = linux
then then
AC_DEFINE(IS_LINUX, [1], [Platform is Linux]) 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/fedora-release && target_distro=fedora
test -f /etc/redhat-release && target_distro=redhat test -f /etc/redhat-release && target_distro=redhat
test -f /etc/debian_version && target_distro=debian test -f /etc/debian_version && target_distro=debian
diff --git a/src/pmns/GNUmakefile b/src/pmns/GNUmakefile Index: pcp-4.3.0/src/pmns/GNUmakefile
index e8707a7e5..9b9458359 100644 ===================================================================
--- a/src/pmns/GNUmakefile --- pcp-4.3.0.orig/src/pmns/GNUmakefile
+++ b/src/pmns/GNUmakefile +++ pcp-4.3.0/src/pmns/GNUmakefile
@@ -60,7 +60,7 @@ install: default @@ -60,7 +60,7 @@ install: default
$(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild $(INSTALL) -m 755 Rebuild $(PMNS_VAR_DIR)/Rebuild
$(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid $(INSTALL) -m 755 Make.stdpmid $(PMNS_VAR_DIR)/Make.stdpmid
$(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR) $(INSTALL) -m 644 $(STDPMID) $(PMNS_VAR_DIR)
-ifeq (, $(filter redhat debian, $(PACKAGE_DISTRIBUTION))) -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 $(INSTALL) -m 644 .NeedRebuild $(PMNS_VAR_DIR)/.NeedRebuild
endif endif
--
2.13.7

11
pcp.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
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
- Replace openSUSE/sles-release build dependency; (bsc#1123311).
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jan 18 13:13:04 UTC 2019 - ddiss@suse.com Fri Jan 18 13:13:04 UTC 2019 - ddiss@suse.com

5
pcp.spec
View File

@ -249,11 +249,6 @@ BuildRequires: zlib-devel
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: mozilla-nss-devel BuildRequires: mozilla-nss-devel
%if 0%{?is_opensuse}
BuildRequires: openSUSE-release
%else
BuildRequires: sles-release
%endif
%else # suse_version %else # suse_version
BuildRequires: nss-devel BuildRequires: nss-devel
%endif # suse_version %endif # suse_version