diff --git a/.cvsignore b/.cvsignore index 8f8305c..ee07fc6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ xfsprogs-2.6.13.src.tar.gz +xfsprogs-2.7.3.src.tar.gz diff --git a/sources b/sources index e887ed5..63f50b9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6c83524988838de0ab96a23db4b40412 xfsprogs-2.6.13.src.tar.gz +89728c0d84258c94e629bf39e4ba1509 xfsprogs-2.7.3.src.tar.gz diff --git a/xfsprogs.spec b/xfsprogs.spec index 0d82c00..ef9d498 100644 --- a/xfsprogs.spec +++ b/xfsprogs.spec @@ -1,19 +1,18 @@ Summary: Utilities for managing the XFS filesystem. Name: xfsprogs -Version: 2.6.13 -Release: 5 +Version: 2.7.3 +Release: 1 License: GPL Group: System Environment/Base URL: http://oss.sgi.com/projects/xfs/ -Source: http://oss.sgi.com/projects/xfs/download/cmd_tars/xfsprogs-%{version}.src.tar.gz +Source: ftp://oss.sgi.com/projects/xfs/download/cmd_tars/xfsprogs-%{version}.src.tar.gz BuildRoot: %{_tmppath}/%{name}-root BuildRequires: autoconf, libtool, gettext BuildRequires: readline-devel, libtermcap-devel BuildRequires: /usr/include/uuid/uuid.h -Provides: xfs-cmds = %{evr} +Provides: xfs-cmds Obsoletes: xfs-cmds <= %{version} Conflicts: xfsdump < 2.0.0 -Patch1: xfsprogs-gcc4.patch %description A set of commands to use the XFS filesystem, including mkfs.xfs. @@ -44,19 +43,18 @@ also want to install xfsprogs. %prep %setup -q -%patch1 -p1 %build # xfsprogs abuses libexecdir -export tagname=CC +export tagname=CC DEBUG=-DNDEBUG %configure --libdir=/%{_lib} --libexecdir=%{_libdir} \ --sbindir=/sbin --bindir=%{_sbindir} \ --enable-shared=yes \ --enable-gettext=yes \ --enable-readline=yes \ --enable-editline=no \ + --enable-termcap=yes \ --enable-shared-uuid=yes -export DEBUG=-DNDEBUG make %install @@ -65,8 +63,8 @@ make DIST_ROOT=$RPM_BUILD_ROOT install make DIST_ROOT=$RPM_BUILD_ROOT install-dev # nuke .la files, etc -rm -f $RPM_BUILD_ROOT/%{_lib}/*.{la,a,so} -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -f $RPM_BUILD_ROOT/%{_lib}/*.la $RPM_BUILD_ROOT/%{_lib}/*.a $RPM_BUILD_ROOT/%{_lib}/*.so +rm -rf $RPM_BUILD_ROOT%{_libdir}/*.la # fix up symlink to be correct rm -f $RPM_BUILD_ROOT/%{_libdir}/libhandle.so ln -s ../../%{_lib}/libhandle.so.1 $RPM_BUILD_ROOT/%{_libdir}/libhandle.so @@ -82,14 +80,14 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) -%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README doc/README.LVM doc/README.quota +%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README /sbin/fsck.xfs /sbin/mkfs.xfs /sbin/xfs_repair /%{_lib}/*.so.* %{_mandir}/man8/* %{_mandir}/man5/* -/usr/sbin/* +%{_sbindir}/* %files devel %defattr(-,root,root) @@ -100,6 +98,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/*.so %changelog +* Mon Oct 31 2005 Robert Scheck 2.7.3-1 +- Upgrade to 2.7.3 and enabled termcap support (#154323) + * Wed Sep 28 2005 Florian La Roche - fixup building with current rpm