X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=f0a5fe5c01bb131b17c5b32c3e2f5a0122e95e49;hb=75a58eecf8b756ca073b145bc09c4c59f45f3c6d;hp=6d29619b3568dd44e0b84b7a1d98a5d08ad038c0;hpb=00fab3bbb79c08155723c6b3f9e3bc0bd40e1a46;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index 6d29619..f0a5fe5 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,102 +1,119 @@
 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.13
-Release:	1
-License:	GPL v2 (chacl utility), LGPL v2+ (library and the rest)
+Version:	2.2.45
+Release:	2
+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:	179890f6dbd0b31701713947e6b8270f
+Source0:	ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
+# Source0-md5:	6c33d0ff98c6294eccfd737da8ef2501
 Patch0:		%{name}-miscfix.patch
+Patch1:		%{name}-lt.patch
+Patch2:		%{name}-LDFLAGS.patch
 URL:		http://oss.sgi.com/projects/xfs/
-BuildRequires:	attr-devel >= 2.4.1
+BuildRequires:	attr-devel >= 2.4.16-3
 BuildRequires:	autoconf
 BuildRequires:	automake
-Requires:	attr >= 2.4.1
+BuildRequires:	gettext-devel
+BuildRequires:	libtool
+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
+%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
+%patch1 -p1
+%patch2 -p1
 
-%build
-#DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
 rm -f aclocal.m4
+
+%build
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags}"
+	OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
 
-%{__make}
+%{__make} \
+	LLDFLAGS="%{rpmldflags}" \
+	top_builddir="../"
 
 %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
+export DIST_ROOT=$RPM_BUILD_ROOT
+P=$(pwd)
+DIST_INSTALL=$P/install.manifest
+DIST_INSTALL_DEV=$P/install-dev.manifest
+DIST_INSTALL_LIB=$P/install-lib.manifest
 
 %{__make} install \
-	DIST_MANIFEST=$DIST_INSTALL
+	DIST_MANIFEST=$DIST_INSTALL \
+	top_builddir="../"
 %{__make} install-dev \
-	DIST_MANIFEST=$DIST_INSTALL_DEV
+	DIST_MANIFEST=$DIST_INSTALL_DEV \
+	top_builddir="../"
 %{__make} install-lib \
-	DIST_MANIFEST=$DIST_INSTALL_LIB
+	DIST_MANIFEST=$DIST_INSTALL_LIB \
+	top_builddir="../"
 
 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_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.*.*.*) \
+ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libacl.so.*.*.*) \
 	$RPM_BUILD_ROOT%{_libexecdir}/libacl.so
+%{__sed} -i "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
+	$RPM_BUILD_ROOT%{_libexecdir}/libacl.la
+
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
 
@@ -110,18 +127,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README doc/{CHANGES,TODO}
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%attr(755,root,root) %{_libdir}/libacl.so.*.*
 %{_mandir}/man[15]/*
 
 %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) %{_libexecdir}/libacl.so
+%{_libexecdir}/libacl.la
 %{_includedir}/acl
 %{_includedir}/sys/*
 %{_mandir}/man[23]/*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/lib*.a
+%{_libexecdir}/libacl.a