This commit is contained in:
parent
df42ee69dd
commit
9a8b5d31c1
@ -42,14 +42,14 @@
|
|||||||
if (!ped_disk_set_partition_geom (disk, part, constraint,
|
if (!ped_disk_set_partition_geom (disk, part, constraint,
|
||||||
new_geom.start, new_geom.end))
|
new_geom.start, new_geom.end))
|
||||||
goto error_close_fs;
|
goto error_close_fs;
|
||||||
- if (!ped_file_system_resize (fs, &part->geom, timer))
|
- if (!ped_file_system_resize (fs, &part->geom, g_timer))
|
||||||
- goto error_close_fs;
|
- goto error_close_fs;
|
||||||
- /* may have changed... eg fat16 -> fat32 */
|
- /* may have changed... eg fat16 -> fat32 */
|
||||||
- ped_partition_set_system (part, fs->type);
|
- ped_partition_set_system (part, fs->type);
|
||||||
- ped_file_system_close (fs);
|
- ped_file_system_close (fs);
|
||||||
+ if(fs)
|
+ if(fs)
|
||||||
+ {
|
+ {
|
||||||
+ if (!ped_file_system_resize (fs, &part->geom, timer) && !always_resize )
|
+ if (!ped_file_system_resize (fs, &part->geom, g_timer) && !always_resize )
|
||||||
+ goto error_close_fs;
|
+ goto error_close_fs;
|
||||||
+ /* may have changed... eg fat16 -> fat32 */
|
+ /* may have changed... eg fat16 -> fat32 */
|
||||||
+ ped_partition_set_system (part, fs->type);
|
+ ped_partition_set_system (part, fs->type);
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
--- parted/Makefile.am
|
|
||||||
+++ parted/Makefile.am 2006/12/04 12:19:17
|
|
||||||
@@ -16,7 +16,7 @@
|
|
||||||
parted_CFLAGS = -DBUILDINFO=
|
|
||||||
|
|
||||||
parted_LDADD = @INTLLIBS@ @LIBS@ $(top_builddir)/libparted/libparted.la \
|
|
||||||
- @PARTED_LIBS@
|
|
||||||
+ @PARTED_LIBS@ -ldevmapper
|
|
||||||
|
|
||||||
parted_LDFLAGS = @PARTEDLDFLAGS@
|
|
||||||
|
|
||||||
--- config.h.in
|
|
||||||
+++ config.h.in 2006/12/04 12:20:25
|
|
||||||
@@ -10,7 +10,7 @@
|
|
||||||
#undef DYNAMIC_LOADING
|
|
||||||
|
|
||||||
/* device mapper (libdevmapper) support */
|
|
||||||
-#undef ENABLE_DEVICE_MAPPER
|
|
||||||
+#define ENABLE_DEVICE_MAPPER 1
|
|
||||||
|
|
||||||
/* Include file system support. i.e. libparted/fs_... */
|
|
||||||
#undef ENABLE_FS
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:9db477bf4e8b48bd3f0ad5dc9a10fde45298ed996b9b27ceaff2759d3fc7d6c4
|
|
||||||
size 1117372
|
|
14
parted-1.8.3.dif
Normal file
14
parted-1.8.3.dif
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
--- configure.ac
|
||||||
|
+++ configure.ac 2007/03/19 14:24:09
|
||||||
|
@@ -442,11 +442,6 @@
|
||||||
|
AC_EGREP_CPP([__s390x__], , compile_for_s390=yes)
|
||||||
|
AM_CONDITIONAL([COMPILE_FOR_S390], [test "$compile_for_s390" = yes])
|
||||||
|
|
||||||
|
-dnl check for "check", unit testing library/header
|
||||||
|
-PKG_CHECK_MODULES([CHECK], [check >= 0.9.3], have_check=yes, have_check=no)
|
||||||
|
-if test "$have_scintilla" != "yes"; then
|
||||||
|
- AC_MSG_RESULT([Unable to locate check version 0.9.3 or higher: not building])
|
||||||
|
-fi
|
||||||
|
AM_CONDITIONAL([HAVE_CHECK], [test "$have_check" = yes])
|
||||||
|
|
||||||
|
dnl Checks for typedefs, structures and compiler characteristics.
|
3
parted-1.8.6.tar.bz2
Normal file
3
parted-1.8.6.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:82d94c9bb58cccd1eacfc5ff3a9331d179cc26d8fbe00c451e2c84feb6d23408
|
||||||
|
size 1433969
|
@ -108,7 +108,7 @@
|
|||||||
- PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */
|
- PED_DISK_TYPE_PARTITION_NAME=2 /**< supports partition names */
|
||||||
+ PED_DISK_TYPE_PARTITION_NAME=2, /**< supports partition names */
|
+ PED_DISK_TYPE_PARTITION_NAME=2, /**< supports partition names */
|
||||||
+ PED_DISK_TYPE_SYSTEM_NAME=4 /**< supports system names */
|
+ PED_DISK_TYPE_SYSTEM_NAME=4 /**< supports system names */
|
||||||
} PedDiskTypeFeature;
|
};
|
||||||
#define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED
|
#define PED_DISK_TYPE_FIRST_FEATURE PED_DISK_TYPE_EXTENDED
|
||||||
-#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME
|
-#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_PARTITION_NAME
|
||||||
+#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_SYSTEM_NAME
|
+#define PED_DISK_TYPE_LAST_FEATURE PED_DISK_TYPE_SYSTEM_NAME
|
||||||
|
@ -42,7 +42,7 @@
|
|||||||
|
|
||||||
--- parted-1.6.2/parted/ui.c.type Wed Jul 3 02:59:11 2002
|
--- parted-1.6.2/parted/ui.c.type Wed Jul 3 02:59:11 2002
|
||||||
+++ parted-1.6.2/parted/ui.c Wed Jul 24 13:47:58 2002
|
+++ parted-1.6.2/parted/ui.c Wed Jul 24 13:47:58 2002
|
||||||
@@ -519,7 +519,10 @@
|
@@ -891,7 +891,10 @@
|
||||||
NULL, 1);
|
NULL, 1);
|
||||||
if (!input)
|
if (!input)
|
||||||
return 0;
|
return 0;
|
||||||
@ -65,7 +65,7 @@
|
|||||||
+ PED_PARTITION_TYPE=10,
|
+ PED_PARTITION_TYPE=10,
|
||||||
+ PED_PARTITION_PREP=11,
|
+ PED_PARTITION_PREP=11,
|
||||||
+ PED_PARTITION_MSFT_RESERVED=12
|
+ PED_PARTITION_MSFT_RESERVED=12
|
||||||
} PedPartitionFlag;
|
};
|
||||||
#define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT
|
#define PED_PARTITION_FIRST_FLAG PED_PARTITION_BOOT
|
||||||
#define PED_PARTITION_LAST_FLAG PED_PARTITION_MSFT_RESERVED
|
#define PED_PARTITION_LAST_FLAG PED_PARTITION_MSFT_RESERVED
|
||||||
--- parted-1.6.2/parted/parted.c.type Wed Jul 24 13:47:58 2002
|
--- parted-1.6.2/parted/parted.c.type Wed Jul 24 13:47:58 2002
|
||||||
|
@ -1,3 +1,34 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 22 13:56:10 CET 2007 - fehr@suse.de
|
||||||
|
|
||||||
|
- Update to new version 1.8.6
|
||||||
|
Revert the implementation of the linux-swap(new) and linux-swap(old) types.
|
||||||
|
|
||||||
|
- Update to new version 1.8.5
|
||||||
|
Add po translations
|
||||||
|
|
||||||
|
- Update to new version 1.8.4
|
||||||
|
Minor bug fix release for 1.8.3 to fix build issues on various platforms
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Mar 19 14:12:12 CET 2007 - fehr@suse.de
|
||||||
|
|
||||||
|
- Update to new version 1.8.3
|
||||||
|
libparted:
|
||||||
|
- Sync the linux-swap header according to the Linux kernel sources.
|
||||||
|
- Enable support for swsusp partitions and the ability to differentiate
|
||||||
|
between old and new versions of linux-swap partitions.
|
||||||
|
- Preserve starting sector for primary NTFS 3.1 partitions on DOS disklabel.
|
||||||
|
- Handle 2048-byte logical sectors in linux_read().
|
||||||
|
- Don't assume logical sector size is <= 512B on AIX.
|
||||||
|
- Detect HFS write failure.
|
||||||
|
- Added HFS+ resize support.
|
||||||
|
parted/partprobe:
|
||||||
|
- Use fputs() and putchar() in place for printf(), when possible.
|
||||||
|
- Detect/report stdout write errors.
|
||||||
|
- Accept the --version and --help options.
|
||||||
|
- Fix memory leaks in parted(8).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Mar 7 15:47:21 CET 2007 - fehr@suse.de
|
Wed Mar 7 15:47:21 CET 2007 - fehr@suse.de
|
||||||
|
|
||||||
|
39
parted.spec
39
parted.spec
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package parted (Version 1.8.2)
|
# spec file for package parted (Version 1.8.6)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
# This file and all modifications and additions to the pristine
|
# This file and all modifications and additions to the pristine
|
||||||
@ -11,13 +11,13 @@
|
|||||||
# norootforbuild
|
# norootforbuild
|
||||||
|
|
||||||
Name: parted
|
Name: parted
|
||||||
BuildRequires: device-mapper device-mapper-devel e2fsprogs-devel libreiserfs readline-devel reiserfs
|
BuildRequires: check device-mapper device-mapper-devel e2fsprogs-devel libreiserfs readline-devel reiserfs
|
||||||
%define aclocaldir /usr/share/aclocal
|
%define aclocaldir /usr/share/aclocal
|
||||||
License: GNU General Public License (GPL)
|
License: GNU General Public License (GPL)
|
||||||
Group: System/Filesystems
|
Group: System/Filesystems
|
||||||
Summary: GNU partitioner
|
Summary: GNU partitioner
|
||||||
Version: 1.8.2
|
Version: 1.8.6
|
||||||
Release: 7
|
Release: 1
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.bz2
|
||||||
Patch: always-resize-part.dif
|
Patch: always-resize-part.dif
|
||||||
Patch1: parted-type.patch
|
Patch1: parted-type.patch
|
||||||
@ -26,7 +26,7 @@ Patch3: parted-wipeaix.patch
|
|||||||
Patch4: disable_FAT_check.diff
|
Patch4: disable_FAT_check.diff
|
||||||
Patch5: no-mklabel-warn-script-mode.patch
|
Patch5: no-mklabel-warn-script-mode.patch
|
||||||
Patch6: etherd_support.diff
|
Patch6: etherd_support.diff
|
||||||
Patch7: device_map_support.diff
|
Patch7: parted-1.8.3.dif
|
||||||
Patch8: fat16_hfs_fix.dif
|
Patch8: fat16_hfs_fix.dif
|
||||||
Patch9: always_print_geom.diff
|
Patch9: always_print_geom.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
@ -72,12 +72,12 @@ Authors:
|
|||||||
%patch4
|
%patch4
|
||||||
%patch5
|
%patch5
|
||||||
%patch6 -p0
|
%patch6 -p0
|
||||||
%patch7 -p0
|
%patch7
|
||||||
%patch8 -p1
|
%patch8 -p1
|
||||||
%patch9
|
%patch9
|
||||||
|
|
||||||
%build
|
%build
|
||||||
autoreconf --force --install
|
#autoreconf --force --install
|
||||||
test -f po/Makevars || mv po/Makevars.template po/Makevars
|
test -f po/Makevars || mv po/Makevars.template po/Makevars
|
||||||
CFLAGS="$RPM_OPT_FLAGS" \
|
CFLAGS="$RPM_OPT_FLAGS" \
|
||||||
./configure \
|
./configure \
|
||||||
@ -116,12 +116,35 @@ rm -rf "$RPM_BUILD_ROOT"
|
|||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%doc doc/API doc/FAT
|
%doc doc/API doc/FAT
|
||||||
%{_prefix}/include/*
|
%{_prefix}/include/*
|
||||||
%{aclocaldir}/*
|
%{_libdir}/pkgconfig/libparted.pc
|
||||||
%{_libdir}/*.a*
|
%{_libdir}/*.a*
|
||||||
%{_libdir}/*.la*
|
%{_libdir}/*.la*
|
||||||
%{_libdir}/*.so
|
%{_libdir}/*.so
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Mar 22 2007 - fehr@suse.de
|
||||||
|
- Update to new version 1.8.6
|
||||||
|
Revert the implementation of the linux-swap(new) and linux-swap(old) types.
|
||||||
|
- Update to new version 1.8.5
|
||||||
|
Add po translations
|
||||||
|
- Update to new version 1.8.4
|
||||||
|
Minor bug fix release for 1.8.3 to fix build issues on various platforms
|
||||||
|
* Mon Mar 19 2007 - fehr@suse.de
|
||||||
|
- Update to new version 1.8.3
|
||||||
|
libparted:
|
||||||
|
- Sync the linux-swap header according to the Linux kernel sources.
|
||||||
|
- Enable support for swsusp partitions and the ability to differentiate
|
||||||
|
between old and new versions of linux-swap partitions.
|
||||||
|
- Preserve starting sector for primary NTFS 3.1 partitions on DOS disklabel.
|
||||||
|
- Handle 2048-byte logical sectors in linux_read().
|
||||||
|
- Don't assume logical sector size is <= 512B on AIX.
|
||||||
|
- Detect HFS write failure.
|
||||||
|
- Added HFS+ resize support.
|
||||||
|
parted/partprobe:
|
||||||
|
- Use fputs() and putchar() in place for printf(), when possible.
|
||||||
|
- Detect/report stdout write errors.
|
||||||
|
- Accept the --version and --help options.
|
||||||
|
- Fix memory leaks in parted(8).
|
||||||
* Wed Mar 07 2007 - fehr@suse.de
|
* Wed Mar 07 2007 - fehr@suse.de
|
||||||
- make resize of ext2/3 under YaST2 work again (#249674)
|
- make resize of ext2/3 under YaST2 work again (#249674)
|
||||||
* Tue Feb 20 2007 - fehr@suse.de
|
* Tue Feb 20 2007 - fehr@suse.de
|
||||||
|
Loading…
x
Reference in New Issue
Block a user