X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=attr.spec;h=a04eb314c0b0392c411a9533a267c03302d00903;hb=HEAD;hp=71aadf4530c1977fe86f66ad88e8133c39e11c16;hpb=d55df4ce66ac6e09e0d6a4ad36b9b61b1a4a3abf;p=packages%2Fattr.git

diff --git a/attr.spec b/attr.spec
index 71aadf4..a04eb31 100644
--- a/attr.spec
+++ b/attr.spec
@@ -1,26 +1,26 @@
 Summary:	Utility for managing filesystem extended attributes
 Summary(pl.UTF-8):	Narzędzia do zarządzania rozszerzonymi atrybutami systemu plików
 Name:		attr
-Version:	2.4.39
-Release:	2
+Version:	2.5.2
+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}-1.tar.gz
-# Source0-md5:	6015feba42b18307de90bb6be9909f7d
-Patch0:		%{name}-miscfix.patch
-Patch1:		%{name}-lt.patch
-Patch2:		%{name}-LDFLAGS.patch
-URL:		http://oss.sgi.com/projects/xfs/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	gettext-devel
-BuildRequires:	libtool
-Obsoletes:	libattr
+Source0:	https://download.savannah.nongnu.org/releases/attr/%{name}-%{version}.tar.xz
+# Source0-md5:	4da9c1d25394946434e5913f49d778b6
+Patch0:		%{name}-pl.po-update.patch
+URL:		http://savannah.nongnu.org/projects/attr/
+BuildRequires:	autoconf >= 2.50
+BuildRequires:	automake >= 1:1.15
+BuildRequires:	gettext-tools >= 0.18.2
+BuildRequires:	libtool >= 2:2
+BuildRequires:	rpmbuild(macros) >= 1.402
+BuildRequires:	sed >= 4.0
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
+Obsoletes:	libattr < 2.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_bindir		/bin
-%define		_libdir		/%{_lib}
-%define		_libexecdir	/usr/%{_lib}
 
 %description
 An experimental attr command to manipulate extended attributes under
@@ -58,58 +58,39 @@ Biblioteki statyczne do korzystania z rozszerzonych atrybutów.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
-rm -f aclocal.m4
+%{__rm} po/stamp-po
 
 %build
+%{__gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
+	%{?debug:--enable-debug} \
+	--disable-silent-rules
 
-%{__make} \
-	LLDFLAGS="%{rpmldflags}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-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
+install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
-	DIST_MANIFEST=$DIST_INSTALL
-%{__make} install-dev \
-	DIST_MANIFEST=$DIST_INSTALL_DEV
-%{__make} install-lib \
-	DIST_MANIFEST=$DIST_INSTALL_LIB
-
-rm -f	$RPM_BUILD_ROOT%{_mandir}/man3/{attr_getf,attr_listf}.3
-rm -f	$RPM_BUILD_ROOT%{_mandir}/man3/{attr_multif,attr_removef,attr_setf}.3
-rm -rf	$RPM_BUILD_ROOT%{_mandir}/man2
+	DESTDIR=$RPM_BUILD_ROOT
 
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} ; echo libattr.so.*.*.*) \
-	 $RPM_BUILD_ROOT%{_libexecdir}/libattr.so
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/libattr.so.* \
+	$RPM_BUILD_ROOT/%{_lib}
 
-%{__sed} -i "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
-	$RPM_BUILD_ROOT%{_libexecdir}/libattr.la
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libattr.so.*.*.*) \
+	$RPM_BUILD_ROOT%{_libdir}/libattr.so
 
-echo ".so attr_get.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/attr_getf.3
-echo ".so attr_list.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/attr_listf.3
-echo ".so attr_multi.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/attr_multif.3
-echo ".so attr_remove.3" > $RPM_BUILD_ROOT%{_mandir}/man3/attr_removef.3
-echo ".so attr_set.3"	> $RPM_BUILD_ROOT%{_mandir}/man3/attr_setf.3
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 %find_lang %{name}
 
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -119,17 +100,24 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc README doc/CHANGES
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/libattr.so.*.*
-%{_mandir}/man[158]/*
+%attr(755,root,root) %{_bindir}/attr
+%attr(755,root,root) %{_bindir}/getfattr
+%attr(755,root,root) %{_bindir}/setfattr
+%attr(755,root,root) /%{_lib}/libattr.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libattr.so.1
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/xattr.conf
+%{_mandir}/man1/attr.1*
+%{_mandir}/man1/getfattr.1*
+%{_mandir}/man1/setfattr.1*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/libattr.so
-%{_libexecdir}/libattr.la
+%attr(755,root,root) %{_libdir}/libattr.so
+%{_libdir}/libattr.la
 %{_includedir}/attr
-%{_mandir}/man3/*
+%{_pkgconfigdir}/libattr.pc
+%{_mandir}/man3/attr_*.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libexecdir}/libattr.a
+%{_libdir}/libattr.a