diff --git a/libcap-1.10-shared.patch b/libcap-1.10-shared.patch index b261ed5..54e5496 100644 --- a/libcap-1.10-shared.patch +++ b/libcap-1.10-shared.patch @@ -1,6 +1,6 @@ ---- libcap-1.10/libcap/Makefile.jj Sat Apr 17 18:16:31 1999 -+++ libcap-1.10/libcap/Makefile Tue Jul 10 01:47:29 2001 -@@ -56,7 +56,7 @@ cap_names.sed: Makefile /usr/include/lin +--- libcap-1.11/libcap/Makefile.shared 1999-04-17 18:16:31.000000000 -0400 ++++ libcap-1.11/libcap/Makefile 2002-07-19 06:24:23.000000000 -0400 +@@ -56,12 +56,12 @@ cap_names.sed: Makefile /usr/include/lin # @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) @@ -9,3 +9,9 @@ ln -sf $(MINLIBNAME) $(MAJLIBNAME) ln -sf $(MAJLIBNAME) $(LIBNAME) + %.o: %.c $(INCLS) +- $(CC) $(CFLAGS) -c $< -o $@ ++ $(CC) $(CFLAGS) -fpic -c $< -o $@ + + install: all + mkdir -p -m 0755 $(INCDIR)/sys diff --git a/libcap.spec b/libcap.spec index 53b6e5b..6b5109c 100644 --- a/libcap.spec +++ b/libcap.spec @@ -1,6 +1,6 @@ Name: libcap Version: 1.10 -Release: 11 +Release: 12 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 License: BSD-like and LGPL @@ -11,7 +11,6 @@ Patch3: libcap-1.10-alpha.patch Group: System Environment/Libraries Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-root -ExcludeArch: alpha %description %{name} is a library for getting and setting POSIX.1e (formerly POSIX 6) @@ -33,15 +32,13 @@ Install %{name}-devel if you want to develop or compile applications using %prep %setup -%ifarch ia64 s390 s390x %patch -p1 -b .ia64 -%endif %ifarch alpha %patch3 -p1 -b .alpha %endif %patch1 -p1 -b .userland %patch2 -p1 -b .shared -perl -pi -e "s,^COPTFLAGS=.*,COPTFLAGS=$RPM_OPT_FLAGS -fPIC,g" Make.Rules +perl -pi -e "s,^COPTFLAGS=.*,COPTFLAG=$RPM_OPT_FLAGS,g" Make.Rules perl -pi -e 's,^man_prefix=.*,man_prefix=\$\(prefix)/share,g' Make.Rules %build @@ -73,6 +70,13 @@ rm -rf $RPM_BUILD_ROOT%{_libdir} rm -rf $RPM_BUILD_ROOT $RPM_BUILD_DIR/%{name}-%{version} %changelog +* Fri Jul 19 2002 Jakub Jelinek 1.10-12 +- CFLAGS was using COPTFLAG variable, not COPTFLAGS +- build with -fpic +- apply the IA-64 patch everywhere, use capget/capset from glibc, + not directly as _syscall (as it is broken on IA-32 with -fpic) +- reenable alpha + * Fri Jun 21 2002 Tim Powers - automated rebuild