-#
-# Conditional build:
-%bcond_with static # link statically with \-luuid
-%bcond_with dynamic_exe # link executables dynamically with xfs libs
-#
Summary: Tools for the XFS filesystem
Summary(pl.UTF-8): Narzędzia do systemu plików XFS
Name: xfsprogs
-Version: 2.9.4
-Release: 2
+Version: 3.0.0
+Release: 3
License: LGPL v2.1 (libhandle), GPL v2 (the rest)
Group: Applications/System
-Source0: ftp://linux-xfs.sgi.com/projects/xfs/download/cmd_tars/%{name}_%{version}-1.tar.gz
-# Source0-md5: 174683e3b86b587ed59823fdbbb96ea4
+Source0: ftp://linux-xfs.sgi.com/projects/xfs/cmd_tars/%{name}-%{version}.tar.gz
+# Source0-md5: ec734f935ec87ebb8be890d29380a3e6
Patch0: %{name}-miscfix-v2.patch
Patch1: %{name}-install-sh.patch
Patch2: %{name}-sharedlibs.patch
Patch3: %{name}-pl.po-update.patch
Patch4: %{name}-dynamic_exe.patch
Patch5: %{name}-LDFLAGS.patch
-Patch6: %{name}-libtool.patch
-Patch7: %{name}-gettext.patch
URL: http://oss.sgi.com/projects/xfs/
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: libuuid-devel
-%{?with_static:BuildRequires: libuuid-static}
-%{?with_static:BuildRequires: sed >= 4.0}
+BuildRequires: rpmbuild(macros) >= 1.402
Obsoletes: libxfs1
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%patch0 -p1
%patch1 -p1
%patch2 -p1
-%patch3 -p1
-%{?with_dynamic_exe:%patch4 -p1}
+# currently obsolete until needed again
+# %patch3 -p1
+%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
+
+rm -f include/{builddefs,platform_defs}.h
%build
-DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}"
-OPTIMIZER="%{rpmcflags} -DENABLE_GETTEXT"
-export DEBUG OPTIMIZER
-rm -f aclocal.m4
%{__aclocal} -I m4
%{__autoconf}
%configure \
- %{!?with_static:--enable-shared-uuid=yes} \
- %{?with_static:--disable-shared --disable-shared-uuid}
-
-%{__make} \
- %{?with_static:LTLINK='$(LIBTOOL) --mode=link %{__cc} -all-static' LDFLAGS=-static}
+ --enable-gettext \
+ --enable-readline \
+ DEBUG="%{?debug:-DDEBUG}%{!?debug:-DNDEBUG}" \
+ OPTIMIZER="%{rpmcflags}"
+%{__make} -j1
%install
rm -rf $RPM_BUILD_ROOT
-DIST_ROOT="$RPM_BUILD_ROOT"
-DIST_INSTALL=`pwd`/install.manifest
-DIST_INSTALL_DEV=`pwd`/install-dev.manifest
+DIST_ROOT=$RPM_BUILD_ROOT
+DIST_INSTALL=$(pwd)/install.manifest
+DIST_INSTALL_DEV=$(pwd)/install-dev.manifest
export DIST_ROOT DIST_INSTALL DIST_INSTALL_DEV
-%{?with_static:sed -i -e 's/\.lai/.la/' include/buildmacros}
%{__make} install \
DIST_MANIFEST="$DIST_INSTALL"
%{__make} install-dev \
DIST_MANIFEST="$DIST_INSTALL_DEV"
-for man in attr_list_by_handle.3 attr_multi_by_handle.3 \
- fd_to_handle.3 free_handle.3 fssetdm_by_handle.3 \
- getparentpaths_by_handle.3 getparents_by_handle.3 \
- handle_to_fshandle.3 open_by_handle.3 path_to_fshandle.3 \
- readlink_by_handle.3; do
- rm -f $RPM_BUILD_ROOT%{_mandir}/man3/$man
- echo ".so path_to_handle.3" \
- > $RPM_BUILD_ROOT%{_mandir}/man3/$man
-done
-
-rm -f $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
-echo ".so xfs_growfs.8" > $RPM_BUILD_ROOT%{_mandir}/man8/xfs_info.8
-
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libhandle.so.*.*.*) \
+ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libhandle.so.*.*.*) \
$RPM_BUILD_ROOT%{_libexecdir}/libhandle.so
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libdisk.so.*.*.*) \
+ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libdisk.so.*.*.*) \
$RPM_BUILD_ROOT%{_libexecdir}/libdisk.so
-ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxfs.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}/$(cd $RPM_BUILD_ROOT%{_libdir}; echo libxlog.so.*.*.*) \
+ln -sf %{_libdir}/$(basename $RPM_BUILD_ROOT%{_libdir}/libxlog.so.*.*.*) \
$RPM_BUILD_ROOT%{_libexecdir}/libxlog.so
-%{__sed} -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
- $RPM_BUILD_ROOT%{_libexecdir}/lib{disk,handle,xfs,xlog}.la
+%{__sed} -i -e "s|libdir='%{_libdir}'|libdir='%{_libexecdir}'|" \
+ $RPM_BUILD_ROOT%{_libexecdir}/lib{disk,handle,xcmd,xfs,xlog}.la
+%{__sed} -i -e "s| %{_libdir}/libxfs.la | %{_libexecdir}/libxfs.la |" \
+ $RPM_BUILD_ROOT%{_libexecdir}/libxlog.la
%find_lang %{name}
rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}
+# already in /usr
+rm -f $RPM_BUILD_ROOT%{_libdir}/libdisk.{a,la,so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libhandle.{a,la,so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxcmd.{a,la,so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxfs.{a,la,so}
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxlog.{a,la,so}
+
%clean
rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(644,root,root,755)
%doc README doc/{CHANGES,CREDITS}
-%attr(755,root,root) %{_sbindir}/*
-%attr(755,root,root) %{_bindir}/*
-%{!?with_static:%attr(755,root,root) /%{_lib}/lib*.so.*.*}
-%{_mandir}/man[185]/*
+%attr(755,root,root) %{_sbindir}/fsck.xfs
+%attr(755,root,root) %{_sbindir}/mkfs.xfs
+%attr(755,root,root) %{_sbindir}/xfs_repair
+%attr(755,root,root) %{_bindir}/xfs_*
+%attr(755,root,root) %{_libdir}/libdisk.so.*.*
+%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}/libdisk.so.0
+%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/xfs.5*
+%{_mandir}/man8/fsck.xfs.8*
+%{_mandir}/man8/mkfs.xfs.8*
+%{_mandir}/man8/xfs_*.8*
%files devel
%defattr(644,root,root,755)
-%if !%{with static}
-%attr(755,root,root) %{_libexecdir}/lib*.so
-%{_libexecdir}/lib*.la
-%endif
-%{_includedir}/disk
+%attr(755,root,root) %{_libexecdir}/libdisk.so
+%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}/libdisk.la
+%{_libexecdir}/libhandle.la
+%{_libexecdir}/libxcmd.la
+%{_libexecdir}/libxfs.la
+%{_libexecdir}/libxlog.la
%{_includedir}/xfs
-%{_mandir}/man3/*
+%{_mandir}/man3/*handle.3*
+%{_mandir}/man3/xfsctl.3*
%files static
%defattr(644,root,root,755)
-%{_libexecdir}/lib*.a
+%{_libexecdir}/libdisk.a
+%{_libexecdir}/libhandle.a
+%{_libexecdir}/libxcmd.a
+%{_libexecdir}/libxfs.a
+%{_libexecdir}/libxlog.a