rpms/xfsprogs/devel xfsprogs-3.1.0-glibc-fixes.patch, NONE, 1.1 xfsprogs.spec, 1.70, 1.71 xfsprogs-3.0.1-mkfs-lazy-count-default.patch, 1.1, NONE xfsprogs-3.0.3-libblkid.patch, 1.2, NONE xfsprogs-3.0.3-trim.patch, 1.2, NONE

Eric Sandeen sandeen at fedoraproject.org
Wed Jan 13 21:21:11 UTC 2010


Author: sandeen

Update of /cvs/pkgs/rpms/xfsprogs/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17997

Modified Files:
	xfsprogs.spec 
Added Files:
	xfsprogs-3.1.0-glibc-fixes.patch 
Removed Files:
	xfsprogs-3.0.1-mkfs-lazy-count-default.patch 
	xfsprogs-3.0.3-libblkid.patch xfsprogs-3.0.3-trim.patch 
Log Message:
* Wed Jan 13 2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-1
- New upstream release
- Minor fixups for new glibc headers


xfsprogs-3.1.0-glibc-fixes.patch:
 builddefs.in |    2 +-
 linux.h      |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE xfsprogs-3.1.0-glibc-fixes.patch ---
diff --git a/include/builddefs.in b/include/builddefs.in
index ca8f172..cc75b5d 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -102,7 +102,7 @@ GCCFLAGS = -funsigned-char -fno-strict-aliasing -Wall
 #	   -Wbitwise -Wno-transparent-union -Wno-old-initializer -Wno-decl
 
 ifeq ($(PKG_PLATFORM),linux)
-PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
+PCFLAGS = -D_GNU_SOURCE -D_XOPEN_SOURCE=500 -D_FILE_OFFSET_BITS=64 $(GCCFLAGS)
 DEPENDFLAGS = -D__linux__
 endif
 ifeq ($(PKG_PLATFORM),darwin)
diff --git a/include/linux.h b/include/linux.h
index dbfb4cf..b342e55 100644
--- a/include/linux.h
+++ b/include/linux.h
@@ -22,6 +22,7 @@
 #include <sys/ioctl.h>
 #include <sys/param.h>
 #include <sys/sysmacros.h>
+#include <sys/stat.h>
 #include <malloc.h>
 #include <getopt.h>
 #include <endian.h>



Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- xfsprogs.spec	8 Dec 2009 17:01:04 -0000	1.70
+++ xfsprogs.spec	13 Jan 2010 21:21:11 -0000	1.71
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
-Version:	3.0.3
-Release:	5%{?dist}
+Version:	3.1.0
+Release:	1%{?dist}
 # Licensing based on generic "GNU GENERAL PUBLIC LICENSE"
 # in source, with no mention of version.
 # doc/COPYING file specifies what is GPL and what is LGPL
@@ -18,12 +18,8 @@ Provides:	xfs-cmds
 Obsoletes:	xfs-cmds <= %{version}
 Conflicts:	xfsdump < 3.0.1
 
-# Upstream patches:
-Patch1:		xfsprogs-3.0.3-trim.patch
-Patch2:		xfsprogs-3.0.3-libblkid.patch
-
-# Not-yet-upstream patches:
-Patch10:	xfsprogs-3.0.1-mkfs-lazy-count-default.patch
+# Fix-ups for very latest glibc header posix conformance changes
+Patch0:		xfsprogs-3.1.0-glibc-fixes.patch
 
 %description
 A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -68,19 +64,12 @@ in building or running the xfstests QA s
 %prep
 %setup -q
 
-%patch1 -p1
-%patch2 -p1
-
-%patch10 -p1
+%patch0 -p1
 
 %build
 export tagname=CC DEBUG=-DNDEBUG
 # xfsprogs abuses libexecdir
 %configure \
-        --sbindir=/sbin         \
-        --libdir=/%{_lib}       \
-        --libexecdir=%{_libdir} \
-        --bindir=%{_sbindir}	\
         --enable-readline=yes	\
 	--enable-blkid=yes
 
@@ -124,7 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc doc/CHANGES doc/COPYING doc/CREDITS doc/PORTING README
+%doc doc/CHANGES doc/COPYING doc/CREDITS README
 /sbin/fsck.xfs
 /sbin/mkfs.xfs
 /sbin/xfs_repair
@@ -203,6 +192,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Wed Jan 13 2010 Eric Sandeen <sandeen at redhat.com> 3.1.0-1
+- New upstream release
+- Minor fixups for new glibc headers
+
 * Tue Dec 08 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-5
 - And finally, BuildRequire libblkid-devel
 


--- xfsprogs-3.0.1-mkfs-lazy-count-default.patch DELETED ---


--- xfsprogs-3.0.3-libblkid.patch DELETED ---


--- xfsprogs-3.0.3-trim.patch DELETED ---



More information about the scm-commits mailing list