From bece568951568954eb61bdf36bc3674c4cd3b74e0363aa461a873317033f8574 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Thu, 2 Aug 2018 02:05:23 +0000 Subject: [PATCH 1/2] Accepting request 626963 from home:simotek:branches:Base:System - use packageand for nfs documentation rather then always installing nfs-doc as part of the documentation pattern. OBS-URL: https://build.opensuse.org/request/show/626963 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=190 --- nfs-utils.changes | 6 ++++++ nfs-utils.spec | 1 + 2 files changed, 7 insertions(+) diff --git a/nfs-utils.changes b/nfs-utils.changes index 3068461..ccb5b4a 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Aug 2 01:31:30 UTC 2018 - sflees@suse.de + +- use packageand for nfs documentation rather then always + installing nfs-doc as part of the documentation pattern. + ------------------------------------------------------------------- Thu Jul 26 23:05:27 UTC 2018 - nfbrown@suse.com diff --git a/nfs-utils.spec b/nfs-utils.spec index 5a0f8c1..95ab239 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -120,6 +120,7 @@ Summary: Support Utilities for NFS Group: Productivity/Networking/NFS Requires: latex2html-pngicons Obsoletes: nfs-utils < 1.1.0 +Supplements: (nfs-utils and patterns-base-documentation) %description -n nfs-doc This package contains additional NFS documentation. From 3e9193b0ebdcd498611eceac5d62f07f26e797ec777b083e3c55825b3f43b527 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 10 Aug 2018 07:00:58 +0000 Subject: [PATCH 2/2] Accepting request 628383 from home:Andreas_Schwab:glibc:rebuild - sysmacros.patch: include for major OBS-URL: https://build.opensuse.org/request/show/628383 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=192 --- nfs-utils.changes | 5 +++++ nfs-utils.spec | 2 ++ sysmacros.patch | 12 ++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 sysmacros.patch diff --git a/nfs-utils.changes b/nfs-utils.changes index ccb5b4a..7e327ed 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 6 07:29:37 UTC 2018 - schwab@suse.de + +- sysmacros.patch: include for major + ------------------------------------------------------------------- Thu Aug 2 01:31:30 UTC 2018 - sflees@suse.de diff --git a/nfs-utils.spec b/nfs-utils.spec index 95ab239..d636157 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -55,6 +55,7 @@ Patch1: 0001-conffile-ignore-empty-environment-variables.patch Patch2: 0002-mount-call-setgroups-before-setuid.patch Patch3: 0003-nfs-server-generator-handle-noauto-mounts-correctly.patch Patch4: nsm-headers.patch +Patch5: sysmacros.patch BuildRequires: e2fsprogs-devel BuildRequires: fedfs-utils-devel @@ -132,6 +133,7 @@ This package contains additional NFS documentation. %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 cp %{SOURCE6} . diff --git a/sysmacros.patch b/sysmacros.patch new file mode 100644 index 0000000..5365a4a --- /dev/null +++ b/sysmacros.patch @@ -0,0 +1,12 @@ +Index: nfs-utils-2.1.1/utils/blkmapd/device-discovery.c +=================================================================== +--- nfs-utils-2.1.1.orig/utils/blkmapd/device-discovery.c ++++ nfs-utils-2.1.1/utils/blkmapd/device-discovery.c +@@ -27,6 +27,7 @@ + */ + + #include ++#include + #include + #include + #include