X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs.spec;h=1c280a3abb4dafe66ef0d7bf18f4281d48487dbe;hb=3d585810b809dcbcd72815e22177f65e1cec8853;hp=8c2fdf24116311f56aeddbf0c688820b74aae808;hpb=4d8d2e78a0dcb436fdaa29e90c984d6e3360fa6f;p=packages%2Fxfsprogs.git

diff --git a/xfsprogs.spec b/xfsprogs.spec
index 8c2fdf2..1c280a3 100644
--- a/xfsprogs.spec
+++ b/xfsprogs.spec
@@ -1,48 +1,36 @@
 #
 # Conditional build:
-%bcond_without	initrd		# don't build initrd version
-%bcond_without	dietlibc	# link initrd version with static glibc instead of dietlibc
+%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.7
-Release:	1
+Version:	3.2.0
+Release:	3
 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:	049cf9873794ea49d0bb3f12d45748a4
+# Source0-md5:	400047b2f6af87c0345b8f0cc00c13db
 Source1:	xfs_lsprojid
+Patch100:	%{name}-git.patch
 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:		xfsprogs-repair-mem.patch
-Patch7:		xfsprogs-repair-nofutexhang.patch
-Patch8:		xfsprogs-repair-tcmalloc.patch
+Patch1:		%{name}-pl.po-update.patch
+Patch2:		%{name}-repair-tcmalloc.patch
+Patch3:		%{name}-noquotasync.patch
 URL:		http://www.xfs.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	bash
-%if %{with initrd}
-	%if %{with dietlibc}
-BuildRequires:	dietlibc-static >= 2:0.31-6
-BuildRequires:	libuuid-dietlibc
-	%else
-BuildRequires:	glibc-static
-BuildRequires:	libuuid-static
-	%endif
-%endif
 BuildRequires:	gettext-devel
-BuildRequires:	google-perftools-devel
 BuildRequires:	libblkid-devel
+%{?with_tcmalloc:BuildRequires:	libtcmalloc-devel}
 BuildRequires:	libtool
 BuildRequires:	libuuid-devel
 BuildRequires:	readline-devel
 BuildRequires:	rpm >= 4.4.9-56
 BuildRequires:	rpmbuild(macros) >= 1.402
-Requires:	google-perftools >= 1.8.3-2
+%{?with_tcmalloc:Requires:	libtcmalloc >= 1.8.3-3}
+Obsoletes:	xfsprogs-initrd
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %if "%{pld_release}" == "ac"
@@ -50,17 +38,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.
@@ -111,80 +92,17 @@ Static XFS software libraries.
 %description static -l pl.UTF-8
 Biblioteki statyczne do XFS.
 
-%package initrd
-Summary:	Tools for the XFS filesystem - initrd version
-Summary(pl.UTF-8):	Narzędzia do systemu plików XFS - wersja dla initrd
-Group:		Base
-
-%description initrd
-A set of commands to use the XFS filesystem, including mkfs.xfs
- - initrd version.
-
-%description initrd -l pl.UTF-8
-Zbiór komend do użytku z systemem plików XFS, włączając w to mkfs.xfs
- - wersja dla initrd.
-
 %prep
 %setup -q
+%patch100 -p1
 %patch0 -p1
-%patch2 -p1
-#%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%patch1 -p1
+
+%{?with_tcmalloc:%patch2 -p1}
+%patch3 -p1
 
 %build
 %{__aclocal} -I m4
-
-%if %{with initrd}
-%if %{with dietlibc}
-# dietlibc doesn't have aio.h (and xfsprogs does not need it really)
-# dietlibc has needed librt stuff in libc/libpthread
-sed -i -e 's|^AC_PACKAGE_NEED_AIO_H|dnl AC_PACKAGE_NEED_AIO_H|' \
-	-e 's|^AC_PACKAGE_NEED_LIO_LISTIO|dnl AC_PACKAGE_NEED_LIO_LISTIO|' \
-	configure.in
-sed -i -e 's|\(^LIBRT.*=.*\)|# \1|' include/builddefs.in
-sed -i -e 's|\(^LLDLIBS.*=.*\)|\1 -lcompat|' db/Makefile mkfs/Makefile
-%endif
-
-%{__autoconf}
-%configure \
-	%{?with_dietlibc:CC="diet %{__cc} -static"} \
-	--sbindir=%{_bindir} \
-	--disable-gettext \
-	--disable-readline \
-	DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
-	OPTIMIZER="%{rpmcflags} -Wno-deprecated-declarations -Os -D_BSD_SOURCE -D__USE_XOPEN_EXTENDED"
-
-%{__make} -j1 include libxfs libxlog libxcmd libhandle libdisk \
-	LIBUUID="%{dietlibdir}/libuuid.a" \
-	V=1
-%{__make} -j1 db growfs logprint mkfs mdrestore repair \
-	LDFLAGS="%{rpmldflags} -all-static" \
-	LIBUUID="%{dietlibdir}/libuuid.a" \
-	V=1
-
-mkdir -p initrd
-mv -f db/xfs_db initrd/xfs_db
-mv -f growfs/xfs_growfs initrd/xfs_growfs
-mv -f logprint/xfs_logprint initrd/xfs_logprint
-mv -f mkfs/mkfs.xfs initrd/mkfs.xfs
-mv -f mdrestore/xfs_mdrestore initrd/xfs_mdrestore
-mv -f repair/xfs_repair initrd/xfs_repair
-
-%if %{with dietlibc}
-sed -i -e 's|^dnl AC_PACKAGE_NEED_AIO_H|AC_PACKAGE_NEED_AIO_H|' \
-	-e 's|^dnl AC_PACKAGE_NEED_LIO_LISTIO|AC_PACKAGE_NEED_LIO_LISTIO|' \
-	configure.in
-sed -i -e 's|^# \(LIBRT.*=.*\)|\1|' include/builddefs.in
-sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile
-%endif
-
-%{__make} clean
-%endif
-
 %{__autoconf}
 %configure \
 	--sbindir=%{_bindir}\
@@ -215,25 +133,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}
 
 %{__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
-
-%if %{with initrd}
-install -d $RPM_BUILD_ROOT%{_libexecdir}/initrd
-install initrd/* $RPM_BUILD_ROOT%{_libexecdir}/initrd
-%endif
+	$RPM_BUILD_ROOT%{_libexecdir}/libhandle.la
 
 echo "#10:/mnt/ftp/roman"  >> $RPM_BUILD_ROOT/etc/projects
 echo "#ftproman:10" >> $RPM_BUILD_ROOT/etc/projid
@@ -243,7 +148,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
@@ -261,13 +166,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*
@@ -278,13 +177,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*
@@ -292,17 +185,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
-
-%if %{with initrd}
-%files initrd
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libexecdir}/initrd/mkfs.xfs
-%attr(755,root,root) %{_libexecdir}/initrd/xfs_db
-%attr(755,root,root) %{_libexecdir}/initrd/xfs_growfs
-%attr(755,root,root) %{_libexecdir}/initrd/xfs_logprint
-%attr(755,root,root) %{_libexecdir}/initrd/xfs_mdrestore
-%attr(755,root,root) %{_libexecdir}/initrd/xfs_repair
-%endif