rpms/xfsprogs/devel xfsprogs-3.0.3-libblkid.patch, 1.1, 1.2 xfsprogs.spec, 1.68, 1.69

[Eric Sandeen]

Author: sandeen

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

Modified Files:
	xfsprogs-3.0.3-libblkid.patch xfsprogs.spec 
Log Message:
* Mon Dec 07 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-4
- Actually patch & run configure script w/ blkid bits...
- Kill rpath in xfs_fsr


xfsprogs-3.0.3-libblkid.patch:
 configure                           |   13 ++
 xfsprogs-3.0.3/Makefile             |   12 ++
 xfsprogs-3.0.3/configure.in         |    6 +
 xfsprogs-3.0.3/include/builddefs.in |    2 
 xfsprogs-3.0.3/mkfs/Makefile        |   19 +++-
 xfsprogs-3.0.3/mkfs/xfs_mkfs.c      |  170 +++++++++++++++++++++++++++++++-----
 6 files changed, 196 insertions(+), 26 deletions(-)

Index: xfsprogs-3.0.3-libblkid.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs-3.0.3-libblkid.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xfsprogs-3.0.3-libblkid.patch	10 Nov 2009 23:45:50 -0000	1.1
+++ xfsprogs-3.0.3-libblkid.patch	7 Dec 2009 23:17:57 -0000	1.2
@@ -386,3 +386,46 @@ Index: xfsprogs-3.0.3/mkfs/xfs_mkfs.c
  			nodsflag = 1;
  		}
  	} /* else dsunit & dswidth can't be set if nodsflag is set */
+--- xfsprogs-3.0.3.orig/configure	2009-12-07 17:06:42.472972680 -0600
++++ xfsprogs-3.0.3/configure	2009-12-07 17:08:30.663973127 -0600
+@@ -839,6 +839,8 @@
+ LOCALIZED_FILES
+ enable_lib64
+ libtermcap
++enable_blkid
++libblkid
+ enable_editline
+ libeditline
+ enable_readline
+@@ -931,6 +933,7 @@
+ enable_readline
+ enable_editline
+ enable_termcap
++enable_blkid
+ enable_lib64
+ '
+       ac_precious_vars='build_alias
+@@ -1574,6 +1577,7 @@
+  --enable-gettext=yes/no Enable alternate language support default=yes
+  --enable-readline=yes/no Enable readline command editing default=no
+  --enable-editline=yes/no Enable editline command editing default=no
++ --enable-blkid=yes/no Enable block device id library default=no
+  --enable-termcap=yes/no Enable terminal capabilities library default=no
+  --enable-lib64=yes/no Enable lib64 support default=no
+ 
+@@ -10441,6 +10445,15 @@
+ 
+ 
+ 
++
++# Check whether --enable-blkid was given.
++if test "${enable_blkid+set}" = set; then
++  enableval=$enable_blkid; test $enable_blkid = yes && libblkid="-lblkid"
++fi
++
++
++
++
+ # Check whether --enable-lib64 was given.
+ if test "${enable_lib64+set}" = set; then
+   enableval=$enable_lib64;


Index: xfsprogs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfsprogs/devel/xfsprogs.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xfsprogs.spec	20 Nov 2009 21:28:45 -0000	1.68
+++ xfsprogs.spec	7 Dec 2009 23:17:57 -0000	1.69
@@ -1,7 +1,7 @@
 Summary:	Utilities for managing the XFS filesystem
 Name:		xfsprogs
 Version:	3.0.3
-Release:	3%{?dist}
+Release:	4%{?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
@@ -80,7 +80,12 @@ export tagname=CC DEBUG=-DNDEBUG
         --libdir=/%{_lib}       \
         --libexecdir=%{_libdir} \
         --bindir=%{_sbindir}	\
-        --enable-readline=yes
+        --enable-readline=yes	\
+	--enable-blkid=yes
+
+# Kill rpaths
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
 make %{?_smp_mflags}
 
@@ -197,6 +202,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/xfs/xfs_types.h
 
 %changelog
+* Mon Dec 07 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-4
+- Actually patch & run configure script w/ blkid bits...
+- Kill rpath in xfs_fsr
+
 * Fri Nov 20 2009 Eric Sandeen <sandeen at redhat.com> 3.0.3-3
 - Fix up build issues w.r.t. off64_t