X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=edf53bef2bdb0b21d03a87812ad14a6f2e93a081;hb=9f0f195fe951dcaadc6c25a8c4529e6f2d38ba47;hp=3bae6688e4d20bd0db477b53d363507b7cff2356;hpb=f75679b99063fb9977930384fdff582916c79a73;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index 3bae668..edf53be 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,102 +1,94 @@
 Summary:	Command and library for manipulating access control lists
-Summary(pl):	Polecenie i biblioteka do manipulacji listami kontroli dostêpu (ACL)
+Summary(pl.UTF-8):	Polecenie i biblioteka do manipulacji listami kontroli dostępu (ACL)
 Name:		acl
-Version:	2.2.21
+Version:	2.2.53
 Release:	1
-License:	GPL v2 (chacl utility), LGPL v2+ (library and the rest)
+License:	LGPL v2+ (library), GPL v2 (utilities)
 Group:		Applications/System
-Source0:	ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}-%{version}.src.tar.gz
-# Source0-md5:	585131965e8a2475b8212075a6eeb5c3
-Patch0:		%{name}-miscfix.patch
-URL:		http://oss.sgi.com/projects/xfs/
-BuildRequires:	attr-devel >= 2.4.12
-BuildRequires:	autoconf
-BuildRequires:	automake
-Requires:	attr >= 2.4.12
+Source0:	http://git.savannah.gnu.org/cgit/acl.git/snapshot/%{name}-%{version}.tar.gz
+# Source0-md5:	0c72e292be55ac60e890c00e6c561af8
+Patch0:		%{name}-pl.po-update.patch
+URL:		http://savannah.nongnu.org/projects/acl/
+BuildRequires:	attr-devel >= 2.4.16-3
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.11
+BuildRequires:	gettext-tools >= 0.18.2
+BuildRequires:	libtool >= 2:2
+BuildRequires:	rpmbuild(macros) >= 1.402
+BuildRequires:	sed >= 4.0
+Requires:	attr >= 2.4.15
+Obsoletes:	libacl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		_libdir		/lib
-%define		_libexecdir	/usr/lib
 
 %description
 A command (chacl) and a library (libacl) to manipulate POSIX access
 control lists under Linux.
 
-%description -l pl
+%description -l pl.UTF-8
 Polecenie (chacl) i biblioteka (libacl) do manipulowania zgodnymi z
-POSIX listami kontroli dostêpu (ACL) pod Linuksem.
+POSIX listami kontroli dostępu (ACL) pod Linuksem.
 
 %package devel
 Summary:	Header files for acl library
-Summary(pl):	Pliki nag³ówkowe biblioteki acl
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki acl
 Group:		Development/Libraries
-Requires:	%{name} = %{version}
-Requires:	attr-devel
+Requires:	%{name} = %{version}-%{release}
+Requires:	attr-devel >= 2.4.16-3
 
 %description devel
 Header files to develop software which manipulate access control
 lists.
 
-%description devel -l pl
-Pliki nag³ówkowe potrzebne do rozwoju oprogramowania manipuluj±cego
-listami kontroli dostêpu (ACL).
+%description devel -l pl.UTF-8
+Pliki nagłówkowe potrzebne do rozwoju oprogramowania manipulującego
+listami kontroli dostępu (ACL).
 
 %package static
 Summary:	Static acl library
-Summary(pl):	Statyczna biblioteka acl
+Summary(pl.UTF-8):	Statyczna biblioteka acl
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static acl library.
 
-%description static -l pl
+%description static -l pl.UTF-8
 Statyczna biblioteka acl.
 
 %prep
 %setup -q
 %patch0 -p1
 
+# prepare for gettextize
+%{__sed} -i -e 's,po/Makefile\.in,,' configure.ac
+
 %build
-#DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
-rm -f aclocal.m4
+po/update-potfiles
+%{__gettextize}
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
-%configure \
-	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags}"
+%{__autoheader}
+%{__automake}
+
+%configure
 
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_includedir}/acl,%{_mandir}/man3}
-
-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
-
-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
-echo ".so acl_get_fd.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/acl_set_fd.3
-echo ".so acl_get_file.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/acl_set_file.3
-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%{_libdir} ; echo libacl.so.*.*.*) \
-	$RPM_BUILD_ROOT%{_libexecdir}/libacl.so
+	DESTDIR=$RPM_BUILD_ROOT
+
+install -d $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libacl.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -snf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libacl.so.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libacl.so
+
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
 
@@ -109,19 +101,26 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README doc/{CHANGES,TODO}
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_mandir}/man[15]/*
+%attr(755,root,root) %{_bindir}/chacl
+%attr(755,root,root) %{_bindir}/getfacl
+%attr(755,root,root) %{_bindir}/setfacl
+%attr(755,root,root) /%{_lib}/libacl.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libacl.so.1
+%{_mandir}/man1/chacl.1*
+%{_mandir}/man1/getfacl.1*
+%{_mandir}/man1/setfacl.1*
+%{_mandir}/man5/acl.5*
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/{extensions.txt,libacl.txt}
-%attr(755,root,root) %{_libexecdir}/lib*.so
-%{_libexecdir}/lib*.la
+%attr(755,root,root) %{_libdir}/libacl.so
+%{_libdir}/libacl.la
 %{_includedir}/acl
-%{_includedir}/sys/*
-%{_mandir}/man[23]/*
+%{_includedir}/sys/acl.h
+%{_pkgconfigdir}/libacl.pc
+%{_mandir}/man3/acl_*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/lib*.a
+%{_libdir}/libacl.a