diff --git a/always-resize-part.dif b/always-resize-part.dif index 5ff9ac5..3125128 100644 --- a/always-resize-part.dif +++ b/always-resize-part.dif @@ -45,7 +45,7 @@ Index: parted/parted.c new_geom.start, new_geom.end)) goto error_close_fs; - if (!ped_file_system_resize (fs, &part->geom, g_timer)) -+ if(fs) ++ if(fs && (!always_resize || strncmp(fsname,"fat",3)==0)) + { + if (!ped_file_system_resize (fs, &part->geom, g_timer) && !always_resize ) goto error_close_fs; diff --git a/baselibs.conf b/baselibs.conf index 42227e5..c4bcf5c 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1 +1 @@ -parted +libparted0 diff --git a/parted.changes b/parted.changes index fb874e2..40079df 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Sep 17 14:47:04 UTC 2010 - puzel@novell.com + +- package according to shared library policy: split libparted0 +- add build dependencies on libblkid and libuuid + +------------------------------------------------------------------- +Fri Sep 17 13:47:05 UTC 2010 - puzel@novell.com + +- fix always-resize-part.dif (bnc#639579) + ------------------------------------------------------------------- Wed Aug 11 08:45:56 UTC 2010 - puzel@novell.com diff --git a/parted.spec b/parted.spec index 6e0c5cb..0438f66 100644 --- a/parted.spec +++ b/parted.spec @@ -19,7 +19,7 @@ Name: parted Version: 2.3 -Release: 2 +Release: 3 License: GPLv3+ Summary: GNU partitioner Url: http://www.gnu.org/software/parted/ @@ -43,9 +43,11 @@ Requires: /sbin/udevadm BuildRequires: check-devel BuildRequires: device-mapper-devel >= 1.02.33 BuildRequires: e2fsprogs-devel +BuildRequires: libblkid-devel >= 2.17 BuildRequires: libreiserfs-devel BuildRequires: libselinux-devel BuildRequires: libsepol-devel +BuildRequires: libuuid-devel BuildRequires: pkg-config BuildRequires: readline-devel PreReq: %install_info_prereq @@ -59,6 +61,16 @@ Obsoletes: parted-64bit GNU Parted is a program for creating, destroying, resizing, checking, and copying partitions, and the file systems on them. +%package -n libparted0 +License: GPLv3+ +Summary: Library for manipulating partitions +Group: System/Filesystems +AutoReqProv: on + +%description -n libparted0 +Libparted is a library for creating, destroying, resizing, checking +and copying partitions and the file systems on them. + %package devel License: GPLv3+ Summary: Parted Include Files and Libraries necessary for Development @@ -66,7 +78,7 @@ Group: Development/Libraries/C and C++ Requires: device-mapper-devel >= 1.02.33 Requires: e2fsprogs-devel Requires: libreiserfs-devel -Requires: parted = %version +Requires: libparted0 = %version # bug437293 %ifarch ppc64 Obsoletes: parted-devel-64bit @@ -109,19 +121,22 @@ rm %{buildroot}%{_libdir}/*.la rm -rf %{buildroot} %post -/sbin/ldconfig %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %postun -/sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz +%post -n libparted0 +/sbin/ldconfig + +%postun -n libparted0 +/sbin/ldconfig + %files %defattr(-,root,root) %doc AUTHORS BUGS COPYING ChangeLog NEWS README THANKS TODO %{_sbindir}/* %{_mandir}/man8/part*.8.gz -%{_libdir}/*.so.* %doc %{_infodir}/*.info* %files devel @@ -131,6 +146,10 @@ rm -rf %{buildroot} %{_libdir}/pkgconfig/libparted.pc %{_libdir}/*.so +%files -n libparted0 +%defattr(-,root,root) +%{_libdir}/*.so.* + %files lang -f %{name}.lang %changelog