- rel 2

[packages/acl.git] / acl.spec

diff --git a/acl.spec b/acl.spec
index ce4e00892ddc3951a34b766858425af7b84da2ca..f0a5fe5c01bb131b17c5b32c3e2f5a0122e95e49 100644 (file)
--- a/acl.spec
+++ b/acl.spec
@@ -1,12 +1,12 @@
 Summary:       Command and library for manipulating access control lists
 Summary(pl.UTF-8):     Polecenie i biblioteka do manipulacji listami kontroli dostępu (ACL)
 Name:          acl
-Version:       2.2.39
+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}-1.tar.gz
-# Source0-md5: 4edd450bbee60d6c4b3c51ae80499b00
+# Source0-md5: 6c33d0ff98c6294eccfd737da8ef2501
 Patch0:                %{name}-miscfix.patch
 Patch1:                %{name}-lt.patch
 Patch2:                %{name}-LDFLAGS.patch
@@ -65,9 +65,9 @@ Statyczna biblioteka acl.
 %patch1 -p1
 %patch2 -p1
 
-%build
 rm -f aclocal.m4
-cp -f /usr/share/automake/config.sub .
+
+%build
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -77,27 +77,27 @@ cp -f /usr/share/automake/config.sub .
 
 %{__make} \
        LLDFLAGS="%{rpmldflags}" \
-       top_buillddir="../"
+       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 \
-       top_buillddir="../"
+       top_builddir="../"
 %{__make} install-dev \
        DIST_MANIFEST=$DIST_INSTALL_DEV \
-       top_buillddir="../"
+       top_builddir="../"
 %{__make} install-lib \
        DIST_MANIFEST=$DIST_INSTALL_LIB \
-       top_buillddir="../"
+       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
@@ -108,11 +108,13 @@ 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}
 
 %clean
@@ -125,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