X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=xfsprogs.spec;h=c94052dd2f00b1a996c6096417c9ea8cab2e2d09;hb=f059db8a468020caefe4fded10541323f3688f6b;hp=a168cd91d8f9a3682e12b8bc523e07331f4eea68;hpb=6e781c103871d31d90abdb9fa84c0ea8b01211f5;p=packages%2Fxfsprogs.git diff --git a/xfsprogs.spec b/xfsprogs.spec index a168cd9..c94052d 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,43 +1,30 @@ -# -# Conditional build: -%bcond_without initrd # don't build initrd version -%bcond_without dietlibc # link initrd version with static glibc instead of dietlibc -# Summary: Tools for the XFS filesystem Summary(pl.UTF-8): Narzędzia do systemu plików XFS Name: xfsprogs -Version: 3.1.5 -Release: 3 +Version: 4.2.0 +Release: 1 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: b1db37749e2b4149a0dd178abff956be +# Source0-md5: e1b9438d3e6775b9df52cc9a13e9f9a6 +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}-notranslate.patch +Patch1: %{name}-pl.po-update.patch +Patch2: %{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: gettext-tools BuildRequires: glibc-static -BuildRequires: libuuid-static - %endif -%endif -BuildRequires: gettext-devel BuildRequires: libblkid-devel BuildRequires: libtool BuildRequires: libuuid-devel +BuildRequires: libuuid-static BuildRequires: readline-devel BuildRequires: rpm >= 4.4.9-56 BuildRequires: rpmbuild(macros) >= 1.402 +Obsoletes: xfsprogs-initrd BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %if "%{pld_release}" == "ac" @@ -45,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. @@ -106,78 +86,14 @@ 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 %patch0 -p1 +#%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -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}\ @@ -192,7 +108,7 @@ sed -i -e 's|\(^LLDLIBS.*=.*\) -lcompat|\1|' db/Makefile mkfs/Makefile %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_libexecdir},etc} +install -d $RPM_BUILD_ROOT{%{_libexecdir},/etc} DIST_ROOT=$RPM_BUILD_ROOT DIST_INSTALL=$(pwd)/install.manifest @@ -204,27 +120,16 @@ export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV %{__make} install-dev \ DIST_MANIFEST="$DIST_INSTALL_DEV" +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 @@ -234,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 @@ -252,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* @@ -269,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* @@ -283,17 +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 - -%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