rpms/acl/devel acl-2.2.32-build.patch,NONE,1.1 acl.spec,1.19,1.20

Tue Dec 6 15:08:49 UTC 2005

Author: twoerner

Update of /cvs/dist/rpms/acl/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv14869

Modified Files:
	acl.spec 
Added Files:
	acl-2.2.32-build.patch 
Log Message:
[tw]
- spec file cleanup
- mark po files as lang specific



acl-2.2.32-build.patch:
 builddefs.in |   16 ++++++++--------
 buildmacros  |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE acl-2.2.32-build.patch ---
--- acl-2.2.32/include/buildmacros.build	2005-12-06 15:33:03.000000000 +0100
+++ acl-2.2.32/include/buildmacros	2005-12-06 15:33:06.000000000 +0100
@@ -54,7 +54,7 @@
 	  $(LFILES:.l=.o) \
 	  $(YFILES:%.y=%.tab.o)
 
-INSTALL	= $(TOPDIR)/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
+INSTALL	= $(TOPDIR)/install-sh
 
 SHELL = /bin/sh
 IMAGES_DIR = $(TOPDIR)/all-images
--- acl-2.2.32/include/builddefs.in.build	2005-10-07 18:51:14.000000000 +0200
+++ acl-2.2.32/include/builddefs.in	2005-12-06 15:34:20.000000000 +0100
@@ -53,14 +53,14 @@
 PKG_VERSION	= @pkg_version@
 PKG_PLATFORM	= @pkg_platform@
 PKG_DISTRIBUTION= @pkg_distribution@
-PKG_BIN_DIR	= @bindir@
-PKG_SBIN_DIR	= @sbindir@
-PKG_LIB_DIR	= @libdir@
-PKG_DEVLIB_DIR	= @libexecdir@
-PKG_INC_DIR	= @includedir@
-PKG_MAN_DIR	= @mandir@
-PKG_DOC_DIR	= @datadir@/doc/@pkg_name@
-PKG_LOCALE_DIR	= @datadir@/locale
+PKG_BIN_DIR	= $(DESTDIR)@bindir@
+PKG_SBIN_DIR	= $(DESTDIR)@sbindir@
+PKG_LIB_DIR	= $(DESTDIR)@libdir@
+PKG_DEVLIB_DIR	= $(DESTDIR)@libexecdir@
+PKG_INC_DIR	= $(DESTDIR)@includedir@
+PKG_MAN_DIR	= $(DESTDIR)@mandir@
+PKG_DOC_DIR	= $(DESTDIR)@datadir@/doc/@pkg_name at -@pkg_version@
+PKG_LOCALE_DIR	= $(DESTDIR)@datadir@/locale
 
 CC		= @cc@
 AWK		= @awk@


Index: acl.spec
===================================================================
RCS file: /cvs/dist/rpms/acl/devel/acl.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- acl.spec	6 Nov 2005 08:31:14 -0000	1.19
+++ acl.spec	6 Dec 2005 15:08:46 -0000	1.20
@@ -1,11 +1,12 @@
 Summary: Access control list utilities.
 Name: acl
 Version: 2.2.32
-Release: 1
+Release: 2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildRequires: libattr-devel >= 2.4.1
 Source: ftp://oss.sgi.com/projects/xfs/cmd_tars/acl-%{version}.src.tar.gz
 Patch0: acl-2.2.3-multilib.patch
+Patch1: acl-2.2.32-build.patch
 BuildRequires: autoconf, libtool >= 1.5, gettext
 License: GPL
 Group: System Environment/Base
@@ -40,6 +41,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .multilib
+%patch1 -p1 -b .build
 autoconf
 
 %build
@@ -50,46 +52,18 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-DIST_ROOT="$RPM_BUILD_ROOT"
-DIST_INSTALL=`pwd`/install.manifest
-DIST_INSTALL_DEV=`pwd`/install-dev.manifest
-DIST_INSTALL_LIB=`pwd`/install-lib.manifest
-export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV DIST_INSTALL_LIB
-make install DIST_MANIFEST="$DIST_INSTALL" PKG_DOC_DIR=%{_docdir}/acl-%{version}
-make install-dev DIST_MANIFEST="$DIST_INSTALL_DEV"
-make install-lib DIST_MANIFEST="$DIST_INSTALL_LIB"
-
-# Buahhh, ugly hack, but it works.
-perl -pi -e 's|^f 644|f 755|' $DIST_INSTALL_LIB
-chmod 755 $RPM_BUILD_ROOT/%{_lib}/*
-
-# get rid of *.la files
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
-
-files()
-{
-	sort | uniq | awk ' 
-$1 == "d" { 
-	    if (match ($6, "/usr/include/acl"))
-		printf ("%%%%dir %%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $5); } 
-$1 == "f" { if (match ($6, "/usr/share/man") || match ($6, "/usr/share/doc/acl"))
-		printf ("%%%%doc ");
-	    if (match ($6, "/usr/share/man"))
-		printf ("%%%%attr(%s,%s,%s) %s*\n", $2, $3, $4, $6);
-	    else
-		printf ("%%%%attr(%s,%s,%s) %s\n", $2, $3, $4, $6); }
-$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);
-	    else
-		printf ("%%%%attr(0777,root,root) %s\n", $3); }'
-}
-set +x
-files < "$DIST_INSTALL" > files.rpm
-files < "$DIST_INSTALL_DEV" | grep -v libacl.la > filesdevel.rpm
-files < "$DIST_INSTALL_LIB" > fileslib.rpm
-set -x
+make install DESTDIR=$RPM_BUILD_ROOT
+make install-dev DESTDIR=$RPM_BUILD_ROOT
+make install-lib DESTDIR=$RPM_BUILD_ROOT
+
+# get rid of libacl.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.la
+
+# create 
+rm -f $RPM_BUILD_ROOT/%{_libdir}/libacl.so
+ln -s /%{_lib}/libacl.so $RPM_BUILD_ROOT/%{_libdir}/libacl.so
+
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -98,16 +72,34 @@
 
 %postun -n libacl -p /sbin/ldconfig
 
-%files -f files.rpm
+%files -f %{name}.lang
 %defattr(-,root,root)
+%{_bindir}/chacl
+%{_bindir}/getfacl
+%{_bindir}/setfacl
+%{_datadir}/doc/acl-%{version}
+%{_mandir}/man1/chacl.1*
+%{_mandir}/man1/getfacl.1*
+%{_mandir}/man1/setfacl.1*
+%{_mandir}/man5/acl.5*
 
-%files -n libacl-devel -f filesdevel.rpm
+%files -n libacl-devel
 %defattr(-,root,root)
-/usr/include/acl
+/%{_lib}/libacl.so
+%{_includedir}/acl
+%{_includedir}/sys/acl.h
+%{_libdir}/libacl.*
+%{_mandir}/man3/acl_*
 
-%files -n libacl -f fileslib.rpm
+%files -n libacl
+%defattr(-,root,root)
+/%{_lib}/libacl.so.*
 
 %changelog
+* Tue Dec  6 2005 Thomas Woerner <twoerner at redhat.com> 2.2.32-2
+- spec file cleanup
+- mark po files as lang specific
+
 * Sun Nov 06 2005 Florian La Roche <laroche at redhat.com>
 - 2.2.32
 


