X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=e205e5546cdf5067a432ee96685e396ed87f4704;hb=8f59f53fbf9297be46dd3dde45aa6cb23245fb9e;hp=66991930235ec0d54639df6ea93d15f0c52b4d8a;hpb=422cbcecb69a7e1c4f3f9d5e15847c35979d9fa4;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index 6699193..e205e55 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,36 +1,40 @@
-Summary:	Command for manipulating access control lists
-Summary(pl):	Komenda do manipulacji listami kontroli dostêpu (ACL)
+Summary:	Command and library for manipulating access control lists
+Summary(pl):	Polecenie i biblioteka do manipulacji listami kontroli dostêpu (ACL)
 Name:		acl
-Version:	2.2.7
-Release:	2
+Version:	2.2.23
+Release:	1
 License:	GPL v2 (chacl utility), LGPL v2+ (library and the rest)
 Group:		Applications/System
 Source0:	ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5:	44cd87acbb1983c8df2bf94b3660e86e
+# Source0-md5:	7e13778c38addfcdabf2cef291b78bcc
+Source1:	%{name}-pl.po
 Patch0:		%{name}-miscfix.patch
 URL:		http://oss.sgi.com/projects/xfs/
+BuildRequires:	attr-devel >= 2.4.15
 BuildRequires:	autoconf
-BuildRequires:	attr-devel >= 2.4.1
-Requires:	attr
+BuildRequires:	automake
+BuildRequires:	gettext-devel
+Requires:	attr >= 2.4.15
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		_libdir		/lib
-%define		_libexecdir	/usr/lib
+%define		_libdir		/%{_lib}
+%define		_libexecdir	/usr/%{_lib}
 
 %description
-A command (chacl) to manipulate POSIX access control lists under
-Linux.
+A command (chacl) and a library (libacl) to manipulate POSIX access
+control lists under Linux.
 
 %description -l pl
-Komenda (chacl) do manipulowania zgodnymi z POSIX listami kontroli
-dostêpu (ACL) pod Linuksem.
+Polecenie (chacl) i biblioteka (libacl) do manipulowania zgodnymi z
+POSIX listami kontroli dostêpu (ACL) pod Linuksem.
 
 %package devel
 Summary:	Header files for acl library
 Summary(pl):	Pliki nag³ówkowe biblioteki acl
 Group:		Development/Libraries
 Requires:	%{name} = %{version}
+Requires:	attr-devel
 
 %description devel
 Header files to develop software which manipulate access control
@@ -53,30 +57,40 @@ Static acl library.
 Statyczna biblioteka acl.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
+chmod -Rf u+w .
+
+cp %{SOURCE1} po/pl.po
+%{__perl} -pi -e 's/^(LINGUAS.*)/$1 pl/' po/Makefile
 
 %build
-DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+rm -f aclocal.m4
+%{__aclocal} -I m4
 %{__autoconf}
-%configure
+%configure \
+	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
+	OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_includedir}/acl
+install -d $RPM_BUILD_ROOT{%{_includedir}/acl,%{_mandir}/man3}
 
-DIST_ROOT="$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"
-%{__make} install-dev DIST_MANIFEST="$DIST_INSTALL_DEV"
-%{__make} install-lib DIST_MANIFEST="$DIST_INSTALL_LIB"
 
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3
+%{__make} install \
+	DIST_MANIFEST=$DIST_INSTALL
+%{__make} install-dev \
+	DIST_MANIFEST=$DIST_INSTALL_DEV
+%{__make} install-lib \
+	DIST_MANIFEST=$DIST_INSTALL_LIB
+
 rm -f	$RPM_BUILD_ROOT%{_mandir}/man3/{acl_copy_int,acl_set_fd,acl_set_file}.3
 rm -f	$RPM_BUILD_ROOT%{_mandir}/man3/{acl_to_short_text,acl_to_text}.3
 echo ".so acl_copy_ext.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/acl_copy_int.3
@@ -86,7 +100,7 @@ echo ".so acl_from_text.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/acl_to_short_text.3
 echo ".so acl_from_text.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/acl_to_text.3
 
 rm -f $RPM_BUILD_ROOT%{_libexecdir}/lib*.so
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT/lib ; echo libacl.so.*.*.*) \
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} ; echo libacl.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libexecdir}/libacl.so
 
 %find_lang %{name}