X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs.spec;h=42fd53aa59cb19c8e71586bc720de5940a985599;hb=1c86294;hp=14d12be9e5031cf62ddfd30f0826ac94b0f58881;hpb=7c029ef70a1a74beab1bc94f63fee681c248f5d4;p=packages%2Fxfsprogs.git

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 14d12be..42fd53a 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,37 +1,29 @@
-#
-# Conditional build:
-%bcond_without	tcmalloc	# don't use tcmalloc
-#
 Summary:	Tools for the XFS filesystem
 Summary(pl.UTF-8):	Narzędzia do systemu plików XFS
 Name:		xfsprogs
-Version:	3.1.11
+Version:	4.7.0
 Release:	2
 License:	LGPL v2.1 (libhandle), GPL v2 (the rest)
 Group:		Applications/System
 Source0:	ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
-# Source0-md5:	de9f1f45026c2f4e0776058d429ff4b6
+# Source0-md5:	ae82b0ab63e89cfda52fb9859855bafa
 Source1:	xfs_lsprojid
 Patch0:		%{name}-miscfix-v2.patch
-Patch2:		%{name}-sharedlibs.patch
-Patch3:		%{name}-pl.po-update.patch
-Patch4:		%{name}-dynamic_exe.patch
-Patch5:		%{name}-diet.patch
-Patch6:		%{name}-repair-tcmalloc.patch
-Patch7:		%{name}-noquotasync.patch
+Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-noquotasync.patch
 URL:		http://www.xfs.org/
-BuildRequires:	autoconf
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	bash
-BuildRequires:	gettext-devel
+BuildRequires:	gettext-tools
+BuildRequires:	glibc-static
 BuildRequires:	libblkid-devel
-%{?with_tcmalloc:BuildRequires:	libtcmalloc-devel}
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
+BuildRequires:	libuuid-static
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.402
-%{?with_tcmalloc:Requires:	libtcmalloc >= 1.8.3-3}
 Obsoletes:	xfsprogs-initrd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,17 +32,10 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		filterout_ld -Wl,--as-needed
 %endif
 
-# libxlog uses symbols from binary that links to libxlog
-# libxcmd uses ("program") symbol from binary that links to libxcmd
-%define		skip_post_check_so	libxlog.so.0.0.0	libxcmd.so.0.0.0
-
 %define		_sbindir	/sbin
 %define		_bindir		/usr/sbin
 %define		_libdir		/%{_lib}
 %define		_libexecdir	/usr/%{_lib}
-# for some reason known only to rpm there must be "\\|" not "\|" here
-%define         dietarch        %(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
-%define         dietlibdir      %{_prefix}/lib/dietlibc/lib-%{dietarch}
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -104,12 +89,8 @@ Biblioteki statyczne do XFS.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1 -b .orig
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%{?with_tcmalloc:%patch6 -p1}
-%patch7 -p1
 
 %build
 %{__aclocal} -I m4
@@ -143,20 +124,12 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/xfs_lsprojid
 
 ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
 	 $RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
-ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxcmd.so.*.*.*) \
-	$RPM_BUILD_ROOT%{_libexecdir}/libxcmd.so
-ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxfs.so.*.*.*) \
-	$RPM_BUILD_ROOT%{_libexecdir}/libxfs.so
-ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxlog.so.*.*.*) \
-	$RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
 
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
-mv $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.la $RPM_BUILD_ROOT%{_libexecdir}
+%{__mv} $RPM_BUILD_ROOT%{_libdir}/lib*.a $RPM_BUILD_ROOT%{_libexecdir}
 
 %{__sed} -i -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
-	$RPM_BUILD_ROOT%{_libexecdir}/lib{handle,xcmd,xfs,xlog}.la
-%{__sed} -i -e "s| %{_libdir}/libxfs.la | %{_libexecdir}/libxfs.la |" \
-	$RPM_BUILD_ROOT%{_libexecdir}/libxlog.la
+	$RPM_BUILD_ROOT%{_libexecdir}/libhandle.la
 
 echo "#10:/mnt/ftp/roman"  >> $RPM_BUILD_ROOT/etc/projects
 echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
@@ -166,7 +139,7 @@ echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/%{name}
 
 # already in /usr
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{handle,xcmd,xfs,xlog}.so
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhandle.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,13 +157,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/xfs_repair
 %attr(755,root,root) %{_bindir}/xfs_*
 %attr(755,root,root) %{_libdir}/libhandle.so.*.*
-%attr(755,root,root) %{_libdir}/libxcmd.so.*.*
-%attr(755,root,root) %{_libdir}/libxfs.so.*.*
-%attr(755,root,root) %{_libdir}/libxlog.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libhandle.so.1
-%attr(755,root,root) %ghost %{_libdir}/libxcmd.so.0
-%attr(755,root,root) %ghost %{_libdir}/libxfs.so.0
-%attr(755,root,root) %ghost %{_libdir}/libxlog.so.0
 %{_mandir}/man5/projects.5*
 %{_mandir}/man5/projid.5*
 %{_mandir}/man5/xfs.5*
@@ -201,13 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libexecdir}/libhandle.so
-%attr(755,root,root) %{_libexecdir}/libxcmd.so
-%attr(755,root,root) %{_libexecdir}/libxfs.so
-%attr(755,root,root) %{_libexecdir}/libxlog.so
 %{_libexecdir}/libhandle.la
-%{_libexecdir}/libxcmd.la
-%{_libexecdir}/libxfs.la
-%{_libexecdir}/libxlog.la
 %{_includedir}/xfs
 %{_mandir}/man3/*handle.3*
 %{_mandir}/man3/xfsctl.3*
@@ -215,6 +176,3 @@ rm -rf $RPM_BUILD_ROOT
 %files static
 %defattr(644,root,root,755)
 %{_libexecdir}/libhandle.a
-%{_libexecdir}/libxcmd.a
-%{_libexecdir}/libxfs.a
-%{_libexecdir}/libxlog.a