X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=397d6512e61b040a7182645842e2c55437bce58a;hb=53bb381ba9d3b227b03f15378d00b596e84de396;hp=3e660d52b8d0c8cf5c0c74ad06e67f78de2b7234;hpb=0ac0b6875f38d2f7e65f9ab72c9531ace529041a;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index 3e660d5..397d651 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,65 +1,92 @@
-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.0.9
+Version:	2.2.22
 Release:	1
-License:	GPL
+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:	c448c1bee6014bc48a386c222d357873
 Patch0:		%{name}-miscfix.patch
 URL:		http://oss.sgi.com/projects/xfs/
+BuildRequires:	attr-devel >= 2.4.12
 BuildRequires:	autoconf
-BuildRequires:	attr-devel >= 2.0.0
-Requires:	attr
+BuildRequires:	automake
+BuildRequires:	gettext-devel
+Requires:	attr >= 2.4.12
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		_bindir		/bin
+%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 and libraries to manipulate acls
-Summary(pl):	Pliki nag³ówkowe i biblioteki do manipulacji ACL-ami
+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 and libraries to develop software which manipulate access
-control lists.
+Header files to develop software which manipulate access control
+lists.
 
 %description devel -l pl
-Pliki nag³ówkowe i biblioteki potrzebne do rozwoju oprogramowania
-manipuluj±cego listami kontroli dostêpu (ACL).
+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
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}
+
+%description static
+Static acl library.
+
+%description static -l pl
+Statyczna biblioteka acl.
 
 %prep
-%setup  -q
+%setup -q
 %patch0 -p1
 
 %build
-DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+#DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
+rm -f aclocal.m4
+%{__aclocal} -I m4
 %{__autoconf}
-%configure
+%configure \
+	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
+	OPTIMIZER="%{rpmcflags}"
 
 %{__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"
 
+%{__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
 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
@@ -68,29 +95,34 @@ 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%{_libdir}/lib*.so
-ln -sf /lib/libacl.so.1.0.0 $RPM_BUILD_ROOT%{_libdir}/libacl.so
+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
 
-gzip -9nf doc/CHANGES
+%find_lang %{name}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc doc/*.gz
+%doc README doc/{CHANGES,TODO}
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) /lib/lib*.so.*.*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%{_mandir}/man[15]/*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.la
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/lib*.a
+%doc doc/{extensions.txt,libacl.txt}
+%attr(755,root,root) %{_libexecdir}/lib*.so
+%{_libexecdir}/lib*.la
 %{_includedir}/acl
 %{_includedir}/sys/*
-%{_mandir}/man[235]/*
+%{_mandir}/man[23]/*
+
+%files static
+%defattr(644,root,root,755)
+%{_libexecdir}/lib*.a