- tabs in preamble

[packages/acl.git] / acl.spec

diff --git a/acl.spec b/acl.spec
index 2b3b616c56bc46e54827b7e6a64d437e2be9cbfc..c9b1f63661da38ab75953dcff6f804b14bb8ed1e 100644 (file)
--- a/acl.spec
+++ b/acl.spec
@@ -1,19 +1,23 @@
 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.23
-Release:       1
-License:       GPL v2 (chacl utility), LGPL v2+ (library and the rest)
+Version:       2.2.39
+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: 7e13778c38addfcdabf2cef291b78bcc
+Source0:       ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
+# Source0-md5: 4edd450bbee60d6c4b3c51ae80499b00
 Patch0:                %{name}-miscfix.patch
+Patch1:                %{name}-lt.patch
+Patch2:                %{name}-LDFLAGS.patch
 URL:           http://oss.sgi.com/projects/xfs/
-BuildRequires: attr-devel >= 2.4.15
+BuildRequires: attr-devel >= 2.4.16-3
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: gettext-devel
+BuildRequires: libtool
 Requires:      attr >= 2.4.15
+Obsoletes:     libacl
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _bindir         /bin
@@ -24,40 +28,42 @@ 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
+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}-%{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
 rm -f aclocal.m4
@@ -67,7 +73,8 @@ rm -f aclocal.m4
        DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
        OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
 
-%{__make}
+%{__make} \
+       LLDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -89,7 +96,7 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV 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_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
@@ -97,6 +104,8 @@ 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
+%{__sed} -i "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
+       $RPM_BUILD_ROOT%{_libexecdir}/libacl.la
 
 %find_lang %{name}