From 863d0aeced7534187e8604a0b2634f8e1e4a8f83 Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Sun, 14 Feb 2021 23:05:19 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libcap.git#b7ee31eb11f46fe42cacd01212b6651821767554
---
 libcap-use-compiler-flag-options.patch | 37 ++++++++++++++++++++++++++
 libcap.spec                            |  6 ++++-
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 libcap-use-compiler-flag-options.patch

diff --git a/libcap-use-compiler-flag-options.patch b/libcap-use-compiler-flag-options.patch
new file mode 100644
index 0000000..9728330
--- /dev/null
+++ b/libcap-use-compiler-flag-options.patch
@@ -0,0 +1,37 @@
+From 7c13fa4e4c044941afd3b3766de71821cdc04397 Mon Sep 17 00:00:00 2001
+From: "H.J. Lu" <hjl.tools@gmail.com>
+Date: Sun, 14 Feb 2021 14:06:49 -0800
+Subject: [PATCH] Update Make.Rules for Fedora RPM build
+
+---
+ Make.Rules | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/Make.Rules b/Make.Rules
+index ded9014..537cb6c 100644
+--- a/Make.Rules
++++ b/Make.Rules
+@@ -56,10 +56,10 @@ IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
+ 
+ CC := $(CROSS_COMPILE)gcc
+ DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
+-COPTS ?= -O2
++COPTS ?= $(RPM_OPT_FLAGS)
+ CFLAGS ?= $(COPTS) $(DEFINES)
+ BUILD_CC ?= $(CC)
+-BUILD_COPTS ?= -O2
++BUILD_COPTS ?= $(RPM_OPT_FLAGS)
+ BUILD_CFLAGS ?= $(BUILD_COPTS) $(DEFINES) $(IPATH)
+ AR := $(CROSS_COMPILE)ar
+ RANLIB := $(CROSS_COMPILE)ranlib
+@@ -69,7 +69,7 @@ WARNINGS=-Wall -Wwrite-strings \
+         -Wstrict-prototypes -Wmissing-prototypes \
+         -Wnested-externs -Winline -Wshadow
+ LD=$(CC) -Wl,-x -shared
+-LDFLAGS ?= #-g
++LDFLAGS ?= $(RPM_LD_FLAGS)
+ LIBCAPLIB := -L$(topdir)/libcap -lcap
+ PSXLINKFLAGS :=  -lpthread -Wl,-wrap,pthread_create
+ LIBPSXLIB := -L$(topdir)/libcap -lpsx $(PSXLINKFLAGS)
+-- 
+2.29.2
diff --git a/libcap.spec b/libcap.spec
index 8814d90..35a0881 100644
--- a/libcap.spec
+++ b/libcap.spec
@@ -1,11 +1,12 @@
 Name: libcap
 Version: 2.48
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Library for getting and setting POSIX.1e capabilities
 URL: https://sites.google.com/site/fullycapable/
 License: BSD or GPLv2
 
 Source: https://git.kernel.org/pub/scm/libs/libcap/libcap.git/snapshot/%{name}-%{version}.tar.gz
+Patch0: libcap-use-compiler-flag-options.patch
 
 BuildRequires: libattr-devel pam-devel perl-interpreter gcc
 BuildRequires: make
@@ -82,6 +83,9 @@ chmod +x %{buildroot}/%{_libdir}/*.so.*
 
 
 %changelog
+* Sun Feb 14 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 2.48-2
+- Rebase distro flags patch
+
 * Wed Feb 10 2021 Giuseppe Scrivano <gscrivan@redhat.com> - 2.48-1
 - Update to 0.2.48