X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=b26ae43a645c432f550fcd008b032b048916bab8;hb=914939843ba3a2be2bf11f7948195efa65a3f19f;hp=9c34538d007b788966f00329291169490350dd63;hpb=f87c10ec13882e932ca737246bf2b7c0626d5625;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index 9c34538..b26ae43 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,20 +1,22 @@
 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.28
+Version:	2.2.47
 Release:	1
 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:	69ba4f7e2bb87d20aedd15249f8747eb
+Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}_%{version}-1.tar.gz
+# Source0-md5:	a11e4571a54a0b1ae83010d1e68a64c2
 Patch0:		%{name}-miscfix.patch
 Patch1:		%{name}-lt.patch
+Patch2:		%{name}-LDFLAGS.patch
+Patch3:		%{name}-pl.po-update.patch
 URL:		http://oss.sgi.com/projects/xfs/
 BuildRequires:	attr-devel >= 2.4.16-3
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	gettext-devel
-BuildRequires:	sed >= 4.0
+BuildRequires:	libtool
 Requires:	attr >= 2.4.15
 Obsoletes:	libacl
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -27,13 +29,13 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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}-%{release}
 Requires:	attr-devel >= 2.4.16-3
@@ -42,53 +44,62 @@ Requires:	attr-devel >= 2.4.16-3
 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}-%{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
+%patch3 -p1
 
-%build
 rm -f aclocal.m4
+
+%build
+%{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
 	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
@@ -98,12 +109,17 @@ 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.*.*.*) \
+#rm -f $RPM_BUILD_ROOT%{_libexecdir}/lib*.so
+ln -snf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/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}
+
+# already in /usr
+rm -f $RPM_BUILD_ROOT%{_libdir}/libacl.{so,la,a}
+
 %find_lang %{name}
 
 %clean
@@ -115,19 +131,25 @@ 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) %{_libdir}/libacl.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/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) %{_libexecdir}/libacl.so
+%{_libexecdir}/libacl.la
 %{_includedir}/acl
-%{_includedir}/sys/*
-%{_mandir}/man[23]/*
+%{_includedir}/sys/acl.h
+%{_mandir}/man3/acl_*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/lib*.a
+%{_libexecdir}/libacl.a