diff --git a/libcap-buildflags.patch b/libcap-2.25-buildflags.patch similarity index 42% rename from libcap-buildflags.patch rename to libcap-2.25-buildflags.patch index 63e6d639fb6fc8ee53f3e13b52de6204d88d98f5..48745fd3cbb002f1bbccbad6d8299512f9b23943 100644 --- a/libcap-buildflags.patch +++ b/libcap-2.25-buildflags.patch @@ -1,34 +1,22 @@ -From 11bdd43001c41d96769e437498bc57e8665ada2f Mon Sep 17 00:00:00 2001 -From: zhangchenfeng -Date: Fri, 17 Apr 2020 10:21:28 +0800 -Subject: [PATCH] bcap-2.32-buildflags - ---- - Make.Rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Make.Rules b/Make.Rules -index f02c770..b5d682b 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -50,7 +50,7 @@ KERNEL_HEADERS := $(topdir)/libcap/include/uapi +diff -up libcap-2.25/Make.Rules.rh libcap-2.25/Make.Rules +--- libcap-2.25/Make.Rules.rh 2016-04-11 18:52:01.418065682 +0200 ++++ libcap-2.25/Make.Rules 2016-04-11 18:52:10.790113866 +0200 +@@ -49,7 +49,8 @@ KERNEL_HEADERS := $(topdir)/libcap/inclu IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include CC := gcc -CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 +CFLAGS := $(RPM_OPT_FLAGS) -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 ++ BUILD_CC := $(CC) BUILD_CFLAGS := $(CFLAGS) $(IPATH) AR := ar -@@ -61,7 +61,7 @@ WARNINGS=-Wall -Wwrite-strings \ +@@ -60,7 +61,7 @@ WARNINGS=-Wall -Wwrite-strings \ -Wstrict-prototypes -Wmissing-prototypes \ -Wnested-externs -Winline -Wshadow LD=$(CC) -Wl,-x -shared -LDFLAGS := #-g +LDFLAGS := $(RPM_LD_FLAGS) #-g - LIBCAPLIB := -L$(topdir)/libcap -lcap - LIBPSXLIB := -L$(topdir)/libcap -lpsx -lpthread + BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) --- -1.8.3.1 - + SYSTEM_HEADERS = /usr/include diff --git a/libcap-2.27.tar.gz b/libcap-2.27.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..e0eb5b288f3df9854074e1e173d3ea2df073e372 Binary files /dev/null and b/libcap-2.27.tar.gz differ diff --git a/libcap-2.32.tar.gz b/libcap-2.32.tar.gz deleted file mode 100644 index 1f258334f23f3d1be596f4a162f475ffa88d1493..0000000000000000000000000000000000000000 Binary files a/libcap-2.32.tar.gz and /dev/null differ diff --git a/libcap.spec b/libcap.spec index 3f967c360b2e239e570e22254156ce589ace798d..5b3894ff5490ae1008f91078caac8832cc32800a 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,12 +1,12 @@ Name: libcap -Version: 2.32 +Version: 2.27 Release: 1 Summary: A library for getting and setting POSIX.1e draft 15 capabilities License: GPLv2 URL: https://sites.google.com/site/fullycapable Source0: https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.gz -Patch6000: libcap-buildflags.patch +Patch1: libcap-2.25-buildflags.patch BuildRequires: libattr-devel pam-devel perl-interpreter gcc @@ -67,12 +67,6 @@ chmod +x %{buildroot}/%{_libdir}/*.so.* %{_mandir}/man8/*.gz %changelog -* Thu Apr 16 2020 zhangchenfeng - 2.32-1 -- Type:enhancement -- ID:NA -- SUG:NA -- DESC: upgrade version to 2.32 - * Mon Oct 14 2019 openEuler Buildteam - 2.27-1 - update to 2.27