X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=acl.spec;h=041332a4b5c04659892d58acb3dabaaeb061318e;hb=5d545f2f89eb2bda80ce947bd8ca2cd62539ef1b;hp=a3f220c9c2d628d6da7df523f835e623bf419c97;hpb=2b3f58b488b767cbf132424e619a630fca94da67;p=packages%2Facl.git

diff --git a/acl.spec b/acl.spec
index a3f220c..041332a 100644
--- a/acl.spec
+++ b/acl.spec
@@ -1,24 +1,28 @@
 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.2.21
-Release:	2
-License:	GPL v2 (chacl utility), LGPL v2+ (library and the rest)
+Version:	2.2.39
+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:	585131965e8a2475b8212075a6eeb5c3
+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.12
-BuildRequires:  gettext-devel
+BuildRequires:	attr-devel >= 2.4.16-3
 BuildRequires:	autoconf
 BuildRequires:	automake
-Requires:	attr >= 2.4.12
+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
@@ -32,8 +36,8 @@ POSIX listami kontroli dost
 Summary:	Header files for acl library
 Summary(pl):	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
@@ -47,7 +51,7 @@ listami kontroli dost
 Summary:	Static acl library
 Summary(pl):	Statyczna biblioteka acl
 Group:		Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{version}-%{release}
 
 %description static
 Static acl library.
@@ -58,17 +62,19 @@ Statyczna biblioteka acl.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-#DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"; export DEBUG
 rm -f aclocal.m4
 %{__aclocal} -I m4
 %{__autoconf}
 %configure \
 	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags}"
+	OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
 
-%{__make}
+%{__make} \
+	LLDFLAGS="%{rpmldflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -90,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
@@ -98,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}