- updated to 2.44

- removed obsolete make patch

diff --git a/libcap-make.patch b/libcap-make.patch
deleted file mode 100644 (file)
index c123aa8..0000000
--- a/libcap-make.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- libcap-2.43/Make.Rules.orig        2020-08-22 09:14:05.046054584 +0200
-+++ libcap-2.43/Make.Rules     2020-08-22 09:16:07.162059691 +0200
-@@ -56,9 +56,11 @@
- 
- CC ?= $(CROSS_COMPILE)gcc
- DEFINES := -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
--CFLAGS ?= -O2 $(DEFINES)
-+CFLAGS ?= -O2
-+CFLAGS += $(DEFINES)
- BUILD_CC ?= $(CC)
--BUILD_CFLAGS ?= -O2 $(DEFINES) $(IPATH)
-+BUILD_CFLAGS ?= -O2
-+BUILD_CFLAGS += $(DEFINES) $(IPATH)
- AR ?= $(CROSS_COMPILE)ar
- RANLIB ?= $(CROSS_COMPILE)ranlib
- DEBUG = -g #-DDEBUG

diff --git a/libcap.spec b/libcap.spec
index 469c6cd7dfa66b49dd005ea7793cd62cf1973d8f..87026f5eb616a9d540395f18041de737eaab224b 100644 (file)
--- a/libcap.spec
+++ b/libcap.spec
@@ -9,14 +9,13 @@ Summary:      POSIX.1e capability suite
 Summary(pl.UTF-8):     Wsparcie dla standardu "capability" POSIX.1e
 Summary(pt_BR.UTF-8):  Biblioteca para leitura e configuração de capabilities.
 Name:          libcap
-Version:       2.43
+Version:       2.44
 Release:       1
 Epoch:         1
 License:       GPL v2 or BSD
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/%{name}-%{version}.tar.xz
-# Source0-md5: 28f65c74c7ea797f70d3627d0bf1b342
-Patch0:                %{name}-make.patch
+# Source0-md5: 46ab71759e17a07efa920692ac2f714d
 URL:           https://sites.google.com/site/fullycapable/
 BuildRequires: attr-devel
 %{?with_golang:BuildRequires:  golang}
@@ -95,13 +94,14 @@ Moduł PAM capability wymuszający dziedziczone zbiory uprawnień.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-CFLAGS="%{rpmcflags} %{rpmcppflags}" \
 LDFLAGS="%{rpmldflags}" \
 %{__make} -j1 \
        CC="%{__cc}" \
+       COPTS="%{rpmcflags} %{rpmcppflags}" \
+       BUILD_CC="%{__cc}" \
+       BUILD_COPTS="%{rpmcflags} %{rpmcppflags}" \
        DEBUG= \
        %{!?with_golang:GOLANG=0}