From eab0736c9796c02dda2ca12e36885ecba88df3a4 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Wed, 19 Jul 2006 10:30:59 +0000 Subject: [PATCH] - add patch to support COPTFLAG (#199365) --- libcap-1.10-useCFLAGSwithCC.patch | 22 ++++++++++++++++++++++ libcap.spec | 7 ++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 libcap-1.10-useCFLAGSwithCC.patch diff --git a/libcap-1.10-useCFLAGSwithCC.patch b/libcap-1.10-useCFLAGSwithCC.patch new file mode 100644 index 0000000..4fa83ad --- /dev/null +++ b/libcap-1.10-useCFLAGSwithCC.patch @@ -0,0 +1,22 @@ +--- libcap-1.10/libcap/Makefile.BAD 2006-07-13 20:42:35.000000000 -0400 ++++ libcap-1.10/libcap/Makefile 2006-07-13 20:42:53.000000000 -0400 +@@ -56,7 +56,7 @@ + # @sed -ne '/^#define[ \t]CAP[_A-Z]\+[ \t]\+[0-9]\+/{s/^#define CAP_\([^ \t]*\)[ \t]*\([^ \t]*\)/ \{ \2, \"\1\" \},/;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;p;}' < /usr/include/linux/capability.h | fgrep -v 0x > cap_names.sed + + $(MINLIBNAME): $(OBJS) +- $(CC) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS) ++ $(CC) $(COPTFLAG) -Wl,-soname,$(MAJLIBNAME) -Wl,-x -shared -o $@ $(OBJS) + ln -sf $(MINLIBNAME) $(MAJLIBNAME) + ln -sf $(MAJLIBNAME) $(LIBNAME) + +--- libcap-1.10/progs/Makefile.BAD 2006-07-13 20:48:44.000000000 -0400 ++++ libcap-1.10/progs/Makefile 2006-07-13 20:48:54.000000000 -0400 +@@ -36,7 +36,7 @@ + all: $(PROGS) + + $(PROGS): %: %.o +- $(CC) $(LDFLAGS) -o $@ $< $(LIBS) ++ $(CC) $(COPTFLAG) $(LDFLAGS) -o $@ $< $(LIBS) + + %.o: %.c $(INCS) + $(CC) $(CFLAGS) -c $< -o $@ diff --git a/libcap.spec b/libcap.spec index 31563f7..cc4b355 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 1.10 -Release: 24.2.1 +Release: 25 Summary: Library for getting and setting POSIX.1e capabilities Source: ftp://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/%{name}-%{version}.tar.bz2 Source1: http://ftp.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.4/capfaq-0.2.txt @@ -9,6 +9,7 @@ Patch: libcap-1.10-ia64.patch Patch1: libcap-1.10-userland.patch Patch2: libcap-1.10-shared.patch Patch3: libcap-1.10-alpha.patch +Patch4: libcap-1.10-useCFLAGSwithCC.patch Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -40,6 +41,7 @@ libcap. %endif %patch1 -p1 -b .userland %patch2 -p1 -b .shared +%patch4 -p1 %build make PREFIX=%{_prefix} LIBDIR=%{_libdir} @@ -79,6 +81,9 @@ chmod +x ${RPM_BUILD_ROOT}/%{_lib}/*.so.* rm -rf ${RPM_BUILD_ROOT} %changelog +* Wed Jul 19 2006 Karsten Hopp 1.10-25 +- add patch to support COPTFLAG (#199365) + * Wed Jul 12 2006 Jesse Keating - 1.10-24.2.1 - rebuild