Mon Jan 11 14:03:08 UTC 2010

Author: jwrdegoede

Update of /cvs/pkgs/rpms/parted/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8236

Modified Files:
	.cvsignore parted.spec sources 
Added Files:
	parted-2.1-blkid_topology_get_physical_sector_size.patch 
Removed Files:
	parted-1.9.0-appletv-support.patch 
	parted-1.9.0-commit-without-close.patch 
	parted-1.9.0-dasd-533808.patch parted-1.9.0-dasd-fixes.patch 
	parted-1.9.0-diskflags.patch 
	parted-1.9.0-dont-touch-part-nodes.patch 
	parted-1.9.0-entiredisk-rh533328.patch 
	parted-1.9.0-export-alignment-info.patch 
	parted-1.9.0-extended-mbr.patch 
	parted-1.9.0-gpt-big-endian.patch 
	parted-1.9.0-handle-dup-error.patch 
	parted-1.9.0-lo-as-file-rh546622.patch 
	parted-1.9.0-move-function-declarations.patch 
	parted-1.9.0-new-lvm-rh525095.patch 
	parted-1.9.0-no-BLKPG.patch 
	parted-1.9.0-no-cylinder-align.patch 
	parted-1.9.0-noheaders.patch 
	parted-1.9.0-partition-limits-rh533417.patch 
	parted-1.9.0-ped_partition_is_busy-no-exception.patch 
	parted-1.9.0-pop-push-error.patch 
	parted-1.9.0-preserve-pmbr.patch 
	parted-1.9.0-remove-struct-elem.patch 
	parted-1.9.0-ru-rh543029.patch parted-1.9.0-swap-flag.patch 
	parted-1.9.0-ui-align-rh361951.patch 
	parted-1.9.0-volkeysize.patch 
Log Message:
* Mon Jan 11 2010 Hans de Goede <hdegoede at redhat.com> 2.1-1
- New upstream release 2.1
- Drop all our patches (all merged upstream)


parted-2.1-blkid_topology_get_physical_sector_size.patch:
 linux.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE parted-2.1-blkid_topology_get_physical_sector_size.patch ---
>From 503c54ef274a923dcac337361936062b37a0ac1a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Mon, 11 Jan 2010 11:46:36 +0100
Subject: [PATCH parted 1/3] linux: use blkid_topology_get_physical_sector_size

The official 2.17 release of util-linux-ng, has added a function to
get the physical sector size, use that instead of getting the
minimum io size.
* libparted/arch/linux.c(_device_set_sector_size): use
blkid_topology_get_physical_sector_size.
---
 libparted/arch/linux.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
index aefe788..bf33059 100644
--- a/libparted/arch/linux.c
+++ b/libparted/arch/linux.c
@@ -668,7 +668,7 @@ _device_set_sector_size (PedDevice* dev)
                         dev->path, strerror (errno), PED_SECTOR_SIZE_DEFAULT);
         } else {
                 dev->phys_sector_size =
-                        blkid_topology_get_minimum_io_size(
+                        blkid_topology_get_physical_sector_size(
                                 arch_specific->topology);
         }
 #endif
-- 
1.6.5.2



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- .cvsignore	12 Aug 2009 15:47:38 -0000	1.34
+++ .cvsignore	11 Jan 2010 14:03:06 -0000	1.35
@@ -1 +1 @@
-parted-1.9.0.tar.xz
+parted-2.1.tar.xz


Index: parted.spec
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/parted.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -p -r1.159 -r1.160
--- parted.spec	20 Dec 2009 10:19:49 -0000	1.159
+++ parted.spec	11 Jan 2010 14:03:07 -0000	1.160
@@ -3,44 +3,20 @@
 
 Summary: The GNU disk partition manipulation program
 Name:    parted
-Version: 1.9.0
-Release: 25%{?dist}
+Version: 2.1
+Release: 1%{?dist}
 License: GPLv3+
 Group:   Applications/System
 URL:     http://www.gnu.org/software/parted
 
 Source0: ftp://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.xz
-Patch1:  %{name}-1.9.0-appletv-support.patch
-Patch2:  %{name}-1.9.0-extended-mbr.patch
-Patch3:  %{name}-1.9.0-noheaders.patch
-Patch4:  %{name}-1.9.0-pop-push-error.patch
-Patch6:  %{name}-1.9.0-remove-struct-elem.patch
-Patch7:  %{name}-1.9.0-move-function-declarations.patch
-Patch10:  %{name}-1.9.0-handle-dup-error.patch
-Patch11:  %{name}-1.9.0-swap-flag.patch
-Patch12:  %{name}-1.9.0-volkeysize.patch
-Patch13:  %{name}-1.9.0-no-BLKPG.patch
-Patch14:  %{name}-1.9.0-commit-without-close.patch
-Patch15:  %{name}-1.9.0-dont-touch-part-nodes.patch
-Patch16:  %{name}-1.9.0-ped_partition_is_busy-no-exception.patch
-Patch17:  %{name}-1.9.0-gpt-big-endian.patch
-Patch18:  %{name}-1.9.0-export-alignment-info.patch
-Patch19:  %{name}-1.9.0-dasd-fixes.patch
-Patch20:  %{name}-1.9.0-dasd-533808.patch
-Patch21:  %{name}-1.9.0-lo-as-file-rh546622.patch
-Patch22:  %{name}-1.9.0-partition-limits-rh533417.patch
-Patch23:  %{name}-1.9.0-diskflags.patch
-Patch24:  %{name}-1.9.0-ui-align-rh361951.patch
-Patch25:  %{name}-1.9.0-align-default-rh361951.patch
-Patch26:  %{name}-1.9.0-entiredisk-rh533328.patch
-Patch27:  %{name}-1.9.0-ru-rh543029.patch
-Patch28:  %{name}-1.9.0-new-lvm-rh525095.patch
+Patch0:  parted-1.9.0-align-default-rh361951.patch
+Patch1:  parted-2.1-blkid_topology_get_physical_sector_size.patch
 
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: e2fsprogs-devel
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
-BuildRequires: libtool
 BuildRequires: gettext-devel
 BuildRequires: texinfo
 BuildRequires: device-mapper-devel
@@ -59,6 +35,7 @@ and copy hard disk partitions. Parted ca
 for new operating systems, reorganizing disk usage, and copying data
 to new hard disks.
 
+
 %package devel
 Summary:  Files for developing apps which will manipulate disk partitions
 Group:    Development/Libraries
@@ -71,43 +48,22 @@ manipulation. If you want to develop pro
 partitions and filesystems using the routines provided by the GNU
 Parted library, you need to install this package.
 
+
 %prep
-%setup -q -n %{name}-%{version}
-%patch1 -p1 -b .appletv
-%patch2 -p1 -b .extended-mbr
-%patch3 -p1 -b .noheaders
-%patch4 -p1 -b .pop-push-error
-%patch6 -p1 -b .remove-struct-elem
-%patch7 -p1 -b .move-function-declarations
-%patch10 -p1 -b .handle-dup-error
-%patch11 -p1 -b .swap-flag
-%patch12 -p1 -b .volkeysize
-%patch13 -p1 -b .no-BLKPG
-%patch14 -p1 -b .commit-without-close
-%patch15 -p1 -b .dont-touch-part-nodes
-%patch16 -p1 -b .ped_partition_is_busy
-%patch17 -p1 -b .gpt-big-endian
-%patch18 -p1 -b .export-align
-%patch19 -p1 -b .dasd
-%patch20 -p1 -b .dasd2
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-aclocal --force -I m4
-autoconf --force
-autoheader --force
-automake --add-missing --copy --force-missing
+%setup -q
+%patch0 -p1
+%patch1 -p1
+iconv -f ISO-8859-1 -t UTF8 AUTHORS > tmp; touch -r AUTHORS tmp; mv tmp AUTHORS
 
 
 %build
 %configure --enable-selinux --disable-static
+# Don't use rpath!
+%{__sed} -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+%{__sed} -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} install DESTDIR=%{buildroot}
@@ -130,9 +86,11 @@ popd
 
 %find_lang %{name}
 
+
 %clean
 %{__rm} -rf %{buildroot}
 
+
 %post
 /sbin/ldconfig
 if [ -f %{_infodir}/parted.info.gz ]; then
@@ -146,6 +104,7 @@ fi
 
 %postun -p /sbin/ldconfig
 
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO doc/API doc/FAT
@@ -164,6 +123,10 @@ fi
 
 
 %changelog
+* Mon Jan 11 2010 Hans de Goede <hdegoede at redhat.com> 2.1-1
+- New upstream release 2.1
+- Drop all our patches (all merged upstream)
+
 * Sun Dec 20 2009 Hans de Goede <hdegoede at redhat.com> 1.9.0-25
 - Fix crash when partitioning loopback devices (#546622)
 - Drop no-cylinder-align patch:
@@ -807,7 +770,7 @@ fi
 * Thu Oct 25 2001 Jeremy Katz <katzj at redhat.com> 1.4.20-2
 - build both python1.5 and python2 modules
 
-* Fri Oct 19 2001 Matt Wilson <msw at redhat.com> 1.4.20-1	
+* Fri Oct 19 2001 Matt Wilson <msw at redhat.com> 1.4.20-1
 - 1.4.20 final
 
 * Thu Oct 11 2001 Matt Wilson <msw at redhat.com> 1.4.20-0.1pre3


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/parted/devel/sources,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- sources	12 Aug 2009 15:47:38 -0000	1.40
+++ sources	11 Jan 2010 14:03:07 -0000	1.41
@@ -1 +1 @@
-a9ffa9b69f0b6099b75c32a03bb12f7f  parted-1.9.0.tar.xz
+0799f65bde8ebb63e9ffd49be1d0df3b  parted-2.1.tar.xz


--- parted-1.9.0-appletv-support.patch DELETED ---


--- parted-1.9.0-commit-without-close.patch DELETED ---


--- parted-1.9.0-dasd-533808.patch DELETED ---


--- parted-1.9.0-dasd-fixes.patch DELETED ---


--- parted-1.9.0-diskflags.patch DELETED ---


--- parted-1.9.0-dont-touch-part-nodes.patch DELETED ---


--- parted-1.9.0-entiredisk-rh533328.patch DELETED ---


--- parted-1.9.0-export-alignment-info.patch DELETED ---


--- parted-1.9.0-extended-mbr.patch DELETED ---


--- parted-1.9.0-gpt-big-endian.patch DELETED ---


--- parted-1.9.0-handle-dup-error.patch DELETED ---


--- parted-1.9.0-lo-as-file-rh546622.patch DELETED ---


--- parted-1.9.0-move-function-declarations.patch DELETED ---


--- parted-1.9.0-new-lvm-rh525095.patch DELETED ---


--- parted-1.9.0-no-BLKPG.patch DELETED ---


--- parted-1.9.0-no-cylinder-align.patch DELETED ---


--- parted-1.9.0-noheaders.patch DELETED ---


--- parted-1.9.0-partition-limits-rh533417.patch DELETED ---


--- parted-1.9.0-ped_partition_is_busy-no-exception.patch DELETED ---


--- parted-1.9.0-pop-push-error.patch DELETED ---


--- parted-1.9.0-preserve-pmbr.patch DELETED ---


--- parted-1.9.0-remove-struct-elem.patch DELETED ---


--- parted-1.9.0-ru-rh543029.patch DELETED ---


--- parted-1.9.0-swap-flag.patch DELETED ---


--- parted-1.9.0-ui-align-rh361951.patch DELETED ---


--- parted-1.9.0-volkeysize.patch DELETED ---

