rpms/gparted/FC-5 gparted-parted-check.patch, 1.1, 1.2 gparted.spec, 1.13, 1.14

[Deji Akingunola (deji)]

Author: deji

Update of /cvs/extras/rpms/gparted/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22498

Modified Files:
	gparted-parted-check.patch gparted.spec 
Log Message:
* Thu Nov 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.3.1-2
- Patch the generated configure to allow rebuild


gparted-parted-check.patch:

Index: gparted-parted-check.patch
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted-parted-check.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gparted-parted-check.patch	30 Nov 2006 13:49:17 -0000	1.1
+++ gparted-parted-check.patch	30 Nov 2006 15:02:40 -0000	1.2
@@ -43,3 +43,50 @@
  
  
  dnl GTKMM
+--- configure.keep	2006-09-11 05:39:49.000000000 -0400
++++ configure	2006-11-22 02:46:15.000000000 -0500
+@@ -22160,9 +22160,11 @@
+ fi
+ 
+ 
+-{ echo "$as_me:$LINENO: checking for libparted >= 1.7.1" >&5
+-echo $ECHO_N "checking for libparted >= 1.7.1... $ECHO_C" >&6; }
+-LDFLAGS=-lparted
++LIBPARTED_VERSION=1.7.1
++{ echo "$as_me:$LINENO: checking for libparted >= $LIBPARTED_VERSION" >&5
++echo $ECHO_N "checking for libparted >= $LIBPARTED_VERSION... $ECHO_C" >&6; }
++LIBS_save="$LIBS"
++LIBS="-lparted"
+ if test "$cross_compiling" = yes; then
+   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
+ See \`config.log' for more details." >&5
+@@ -22181,14 +22183,26 @@
+ 
+ int main ()
+ {
++	int min_major ;
++	int min_minor ;
++	int min_micro ;
+ 	int major ;
+ 	int minor ;
+ 	int micro ;
+ 
+-	if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro ) == 3 )
+-		printf( "Found libparted %s\t", ped_get_version() ) ;
++	if ( sscanf( "$LIBPARTED_VERSION", "%d.%d.%d", &min_major, &min_minor, &min_micro ) == 3 )
++	{
++		if ( sscanf( ped_get_version(), "%d.%d.%d", &major, &minor, &micro ) == 3 )
++		{
++			printf( "Found libparted %s\t", ped_get_version() ) ;
++
++			return ! ((major > min_major) ||
++           			 ((major == min_major) && (minor > min_minor)) ||
++           			 ((major == min_major) && (minor == min_minor) && (micro >= min_micro))) ;
++		}
++	}
+ 
+-        return ! ( major == 1 && minor == 7 && micro >= 1 ) ;
++	return 1 ;
+ }
+ 
+ _ACEOF


Index: gparted.spec
===================================================================
RCS file: /cvs/extras/rpms/gparted/FC-5/gparted.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- gparted.spec	30 Nov 2006 13:49:17 -0000	1.13
+++ gparted.spec	30 Nov 2006 15:02:40 -0000	1.14
@@ -1,18 +1,16 @@
 Summary: Gnome Partition Editor
 Name:    gparted
 Version: 0.3.1
-Release: 2%{?dist}
+Release: 2%{?dist}.1
 Group:   Applications/System
 License: GPL
 URL:     http://gparted.sourceforge.net
 Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0: gparted-parted-check.patch
+Patch0: gparted-parted-check2.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gtkmm24-devel parted-devel 
 BuildRequires: e2fsprogs-devel gettext perl(XML::Parser)
 BuildRequires: desktop-file-utils
-#Temporarily
-BuildRequires: automake autoconf libtool intltool
 
 %description
 GParted stands for Gnome Partition Editor and is a graphical frontend to
@@ -26,9 +24,6 @@
 %patch0 -p0 -b .parted
 
 %build
-aclocal
-automake
-autoconf
 %configure
 make %{?_smp_mflags} 
 
@@ -84,6 +79,9 @@
 %config(noreplace) %{_sysconfdir}/security/console.apps/gparted
 
 %changelog
+* Thu Nov 30 2006 Deji Akingunola <dakingun at gmail.com> - 0.3.1-2
+- Patch the generated configure to allow rebuild
+
 * Mon Nov 21 2006 Deji Akingunola <dakingun at gmail.com> - 0.3.1-2
 - Rebuild for new parted