From 0d74a603de64a9a9ec481d76414ff9b76c8db698 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Thu, 9 Sep 2004 02:52:09 +0000 Subject: [PATCH] auto-import changelog data from acl-2.2.3-1.src.rpm Tue Jan 28 2003 Michael K. Johnson 2.2.3-1 - udpate/rebuild Sat Jan 04 2003 Jeff Johnson 2.0.11-7 - set execute bits on library so that requires are generated. Tue Nov 19 2002 Elliot Lee 2.0.11-5 - Correct patch in previous fix so that shared libraries go in /lib* instead of /usr/lib* Tue Nov 19 2002 Elliot Lee 2.0.11-4 - Fix multilibbing Wed Sep 11 2002 Than Ngo 2.0.11-3 - Added fix to install libs in correct directory on 64bit machine --- .cvsignore | 2 +- acl-2.2.3-multilib.patch | 11 ++++++++++ acl.spec | 43 +++++++++++++++++++++++++++++++--------- sources | 2 +- 4 files changed, 47 insertions(+), 11 deletions(-) create mode 100644 acl-2.2.3-multilib.patch diff --git a/.cvsignore b/.cvsignore index 541a366..bf35c39 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -acl-2.0.11.src.tar.gz +acl-2.2.3.src.tar.gz diff --git a/acl-2.2.3-multilib.patch b/acl-2.2.3-multilib.patch new file mode 100644 index 0000000..3d33399 --- /dev/null +++ b/acl-2.2.3-multilib.patch @@ -0,0 +1,11 @@ +--- acl-2.2.3/include/buildmacros.multilib 2003-01-28 19:00:05.000000000 -0500 ++++ acl-2.2.3/include/buildmacros 2003-01-28 19:04:13.000000000 -0500 +@@ -103,8 +103,6 @@ + ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ + ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ + ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ + ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).so $(PKG_DEVLIB_DIR)/$(LIBNAME).so + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) diff --git a/acl.spec b/acl.spec index 14658d5..b8ae2e5 100644 --- a/acl.spec +++ b/acl.spec @@ -1,11 +1,13 @@ Summary: Access control list utilities. Name: acl -Version: 2.0.11 -Release: 2 +Version: 2.2.3 +Release: 1 BuildRoot: %{_tmppath}/%{name}-root BuildRequires: libattr-devel -Source: acl-2.0.11.src.tar.gz -Copyright: GPL +Source: http://acl.bestbits.at/current/tar/acl-%{version}.src.tar.gz +Patch: acl-2.2.3-multilib.patch +BuildRequires: autoconf +License: GPL Group: System Environment/Base URL: http://acl.bestbits.at/ @@ -36,14 +38,18 @@ programs which make use of the access control list programming interface defined in POSIX 1003.1e draft standard 17. %prep -%setup +%setup -q +%patch -p1 -b .multilib +autoconf %build touch .census -./configure +# acl abuses libexecdir +%configure --libdir=/%{_lib} --libexecdir=%{_libdir} make %install +rm -rf $RPM_BUILD_ROOT DIST_ROOT="$RPM_BUILD_ROOT" DIST_INSTALL=`pwd`/install.manifest DIST_INSTALL_DEV=`pwd`/install-dev.manifest @@ -52,6 +58,9 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB make install DIST_MANIFEST="$DIST_INSTALL" make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV" make install-lib DIST_MANIFEST="$DIST_INSTALL_LIB" + +chmod +x ${RPM_BUILD_ROOT}/%{_lib}/libacl.so.* + files() { sort | uniq | awk ' @@ -67,9 +76,9 @@ $1 == "f" { if (match ($6, "/usr/share/man") || match ($6, "/usr/share/doc/acl") $1 == "l" { if (match ($3, "/usr/share/man") || match ($3, "/usr/share/doc/acl")) printf ("%%%%doc "); if (match ($3, "/usr/share/man")) - printf ("%attr(0777,root,root) %s*\n", $3); + printf ("%%%%attr(0777,root,root) %s*\n", $3); else - printf ("%attr(0777,root,root) %s\n", $3); }' + printf ("%%%%attr(0777,root,root) %s\n", $3); }' } set +x files < "$DIST_INSTALL" > files.rpm @@ -78,7 +87,7 @@ files < "$DIST_INSTALL_LIB" > fileslib.rpm set -x %clean -[ "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %post -n libacl -p /sbin/ldconfig @@ -91,6 +100,22 @@ set -x %files -n libacl -f fileslib.rpm %changelog +* Tue Jan 28 2003 Michael K. Johnson 2.2.3-1 +- udpate/rebuild + +* Sat Jan 4 2003 Jeff Johnson 2.0.11-7 +- set execute bits on library so that requires are generated. + +* Tue Nov 19 2002 Elliot Lee 2.0.11-5 +- Correct patch in previous fix so that shared libraries go in /lib* + instead of /usr/lib* + +* Tue Nov 19 2002 Elliot Lee 2.0.11-4 +- Fix multilibbing + +* Wed Sep 11 2002 Than Ngo 2.0.11-3 +- Added fix to install libs in correct directory on 64bit machine + * Thu Aug 08 2002 Michael K. Johnson 2.0.11-2 - Made the package only own the one directory that is unique to it: /usr/include/acl diff --git a/sources b/sources index af0e9ef..e4bed92 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9cf22f0b13e3f675f2c89c8fdcba4f96 acl-2.0.11.src.tar.gz +9294d7eedd6d3a2639e7b8eb158cf371 acl-2.2.3.src.tar.gz