rpms/parted/devel parted-1.7.1-goto.patch, NONE, 1.1 parted.spec, 1.87, 1.88

[fedora-cvs-commits at redhat.com]

Author: dcantrel

Update of /cvs/dist/rpms/parted/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1826

Modified Files:
	parted.spec 
Added Files:
	parted-1.7.1-goto.patch 
Log Message:
Bump version.


parted-1.7.1-goto.patch:
 linux.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE parted-1.7.1-goto.patch ---
--- parted-1.7.1/libparted/arch/linux.c.goto	2006-10-26 16:31:34.000000000 -0400
+++ parted-1.7.1/libparted/arch/linux.c	2006-10-26 16:32:16.000000000 -0400
@@ -1116,7 +1116,7 @@
 
         case PED_DEVICE_UBD:
                 if (!init_generic (dev, _("User-Mode Linux UBD")))
-                        goto error_free_dev;
+                        goto error_free_arch_specific;
                 break;
 
         case PED_DEVICE_FILE:


Index: parted.spec
===================================================================
RCS file: /cvs/dist/rpms/parted/devel/parted.spec,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- parted.spec	4 Oct 2006 20:32:16 -0000	1.87
+++ parted.spec	26 Oct 2006 20:34:12 -0000	1.88
@@ -4,7 +4,7 @@
 Summary: The GNU disk partition manipulation program.
 Name:    parted
 Version: 1.7.1
-Release: 16%{?dist}
+Release: 17%{?dist}
 Source:  ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.bz2
 Patch0:  parted-1.7.0-fat.c.patch
 Patch1:  parted-1.7.0-sx8.patch
@@ -17,6 +17,7 @@
 Patch9:  parted-1.7.1-get_exception.patch
 Patch10: parted-1.7.1-gpt.patch
 Patch11: parted-1.7.1-ped_geometry_read.patch
+Patch12: parted-1.7.1-goto.patch
 
 Buildroot: %{_tmppath}/%{name}-root
 License: GPL
@@ -24,7 +25,6 @@
 BuildRequires: e2fsprogs-devel libtermcap-devel readline-devel ncurses-devel
 BuildRequires: automake libtool gettext-devel texinfo
 BuildRequires: device-mapper >= 1.02.02, libselinux-devel libsepol-devel
-BuildRequires: gettext-devel libtool
 
 Prereq: /sbin/install-info
 
@@ -57,6 +57,7 @@
 %patch9 -p1 -b .get_exception
 %patch10 -p1 -b .gpt
 %patch11 -p1 -b .geom
+%patch12 -p1 -b .goto
 
 iconv -f iso-8859-1 -t utf-8 < doc/pt_BR-parted.8 > doc/pt_BR-parted.8_
 mv doc/pt_BR-parted.8_ doc/pt_BR-parted.8
@@ -110,6 +111,10 @@
 %{_libdir}/*.so
 
 %changelog
+* Thu Oct 26 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-17
+- For init_generic() failures on user-mode Linux block devices, goto
+  error_free_arch_specific instead of error_free_dev.
+
 * Wed Oct 04 2006 David Cantrell <dcantrell at redhat.com> - 1.7.1-16
 - Don't throw PED_EXCEPTION_ERROR in ped_geometry_read() if accessing
   sectors outside of partition boundary, since returning false will