diff --git a/gparted-configure.patch b/gparted-configure.patch new file mode 100644 index 0000000..4761a7f --- /dev/null +++ b/gparted-configure.patch @@ -0,0 +1,47 @@ +--- 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, µ ) == 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, µ ) == 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 diff --git a/gparted.spec b/gparted.spec index f4e3753..957b8c6 100644 --- a/gparted.spec +++ b/gparted.spec @@ -1,11 +1,12 @@ Summary: Gnome Partition Editor Name: gparted Version: 0.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/System License: GPL URL: http://gparted.sourceforge.net Source0: http://dl.sf.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2 +Patch0: gparted-configure.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gtkmm24-devel parted-devel BuildRequires: e2fsprogs-devel gettext perl(XML::Parser) @@ -20,6 +21,7 @@ will be detected at runtime and don't require a rebuild of GParted %prep %setup -q +%patch0 -p0 -b .config %build %configure @@ -77,6 +79,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Wed Nov 23 2006 Deji Akingunola - 0.3.1-3 +- Backport a fix from cvs to properly check for libparted version + * Mon Nov 21 2006 Deji Akingunola - 0.3.1-2 - Rebuild for new parted