rpms/xferstats/devel xferstats-glib2.patch, NONE, 1.1 xferstats.spec, 1.11, 1.12

[fedora-cvs-commits at redhat.com]

Author: notting

Update of /cvs/dist/rpms/xferstats/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29186

Modified Files:
	xferstats.spec 
Added Files:
	xferstats-glib2.patch 
Log Message:
build against glib-2.0


xferstats-glib2.patch:
 configure.in |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE xferstats-glib2.patch ---
--- xferstats-2.16/configure.in.moo	2006-04-04 11:52:55.000000000 -0400
+++ xferstats-2.16/configure.in	2006-04-04 11:53:55.000000000 -0400
@@ -157,9 +157,9 @@
 if test x$with_glib = x ; then
   # Look for separately installed glib
 
-  AM_PATH_GLIB(1.1.3,,
+  AM_PATH_GLIB_2_0(2.0.0,,
     AC_MSG_ERROR([
-*** GLIB 1.1.3 or better is required. The latest version of GLIB
+*** GLIB 2.0.0 or better is required. The latest version of GLIB
 *** is always available from ftp://ftp.gtk.org.]),
     gmodule)
 
@@ -168,17 +168,17 @@
 else
   # Use uninstalled glib (assume they got the version right)
 
-  if test -x $with_glib/glib-config ; then
+  if test -x $with_glib/pkg-config ; then
     :
   else
     AC_MSG_ERROR([GLIB directory ($with_glib) not present or not configured])
   fi
 
   # For use in gtk-config
-  glib_cflags=`$with_glib/glib-config --cflags`
-  glib_libs=`$with_glib/glib-config --libs`
+  glib_cflags=`$with_glib/pkg-config --cflags glib-2.0`
+  glib_libs=`$with_glib/pkg-config --libs glib-2.0`
 
-  glib_release=`$with_glib/glib-config --version | sed 's%\\.[[0-9]]*$%%'`
+  glib_release=`$with_glib/pkg-config --modversion glib-2.0 | sed 's%\\.[[0-9]]*$%%'`
 
   # canonicalize relative paths
   case $with_glib in


Index: xferstats.spec
===================================================================
RCS file: /cvs/dist/rpms/xferstats/devel/xferstats.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xferstats.spec	11 Feb 2006 06:11:00 -0000	1.11
+++ xferstats.spec	4 Apr 2006 15:57:30 -0000	1.12
@@ -1,16 +1,17 @@
 Summary: Compiles information about file transfers from logfiles
 Name: xferstats
 Version: 2.16
-Release: 13.2.1
+Release: 14
 URL: http://xferstats.off.net/
 Source0: ftp://xferstats.off.net/%{name}-%{version}.tar.gz
 Patch0: xferstats.patch
 Patch1: xferstats-2.16-config-loc.patch
 Patch2: xferstats-2.16-display.patch
+Patch3: xferstats-glib2.patch
 License: GPL
 Group: Applications/System
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildPrereq: glib-devel
+BuildPrereq: glib2-devel autoconf
 
 %description
 xferstats compiles information about file transfers from logfiles.
@@ -20,8 +21,11 @@
 %patch0 -p1
 %patch1 -p1 -b .config
 %patch2 -p1 -b .display
+%patch3 -p1 -b .glib2
 
 %build
+cp /usr/share/aclocal/glib-2.0.m4 ./aclocal.m4
+autoconf
 %configure
 make
 
@@ -44,6 +48,9 @@
 %{_datadir}/xferstats
 
 %changelog
+* TUe Apr 14 2006 Bill Nottingham <notting at redhat.com> - 2.16-14
+- build against glib2
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 2.16-13.2.1
 - bump again for double-long bug on ppc(64)