From e5b43477682cc0ed7734ae6c75ec57db5628ac9f Mon Sep 17 00:00:00 2001 From: Deji Akingunola Date: Tue, 5 Dec 2006 21:07:37 +0000 Subject: [PATCH] - New release --- .cvsignore | 2 +- gparted-configure.patch | 47 -------------------------------------- gparted-parted-check.patch | 45 ------------------------------------ gparted.spec | 14 ++++-------- sources | 2 +- 5 files changed, 7 insertions(+), 103 deletions(-) delete mode 100644 gparted-configure.patch delete mode 100644 gparted-parted-check.patch diff --git a/.cvsignore b/.cvsignore index a616ae8..ece1be4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -gparted-0.3.1.tar.bz2 +gparted-0.3.2.tar.bz2 diff --git a/gparted-configure.patch b/gparted-configure.patch deleted file mode 100644 index 4761a7f..0000000 --- a/gparted-configure.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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-parted-check.patch b/gparted-parted-check.patch deleted file mode 100644 index 2141e2b..0000000 --- a/gparted-parted-check.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- configure.in 2006/09/11 09:46:42 1.62 -+++ configure.in 2006/09/14 20:34:49 1.63 -@@ -33,7 +33,8 @@ - AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found])) - - dnl libparted --AC_MSG_CHECKING(for libparted >= 1.7.1) -+LIBPARTED_VERSION=1.7.1 -+AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION) - LDFLAGS=-lparted - AC_TRY_RUN( - #include -@@ -41,16 +42,28 @@ - - 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 ; - } --,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= 1.7.1) ) -+,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION) ) - - - dnl GTKMM diff --git a/gparted.spec b/gparted.spec index ce013e9..6b2f1bf 100644 --- a/gparted.spec +++ b/gparted.spec @@ -1,18 +1,15 @@ Summary: Gnome Partition Editor Name: gparted -Version: 0.3.1 -Release: 5%{?dist} +Version: 0.3.2 +Release: 1%{?dist} 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 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 @@ -23,12 +20,8 @@ will be detected at runtime and don't require a rebuild of GParted %prep %setup -q -%patch0 -p0 -b .parted %build -aclocal -automake -autoconf %configure make %{?_smp_mflags} @@ -84,6 +77,9 @@ rm -rf %{buildroot} %config(noreplace) %{_sysconfdir}/security/console.apps/gparted %changelog +* Tue Dec 05 2006 Deji Akingunola - 0.3.2-1 +- New release + * Mon Nov 27 2006 Deji Akingunola - 0.3.1-5 - Add more BRs diff --git a/sources b/sources index 018a83d..4c34202 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9368011905657fb58c470bee861e5ce5 gparted-0.3.1.tar.bz2 +8a25eaa8e319f06229a65bc4f7db459d gparted-0.3.2.tar.bz2