diff --git a/fix-function-def.patch b/fix-function-def.patch new file mode 100644 index 0000000..8ddf5aa --- /dev/null +++ b/fix-function-def.patch @@ -0,0 +1,11 @@ +--- libparted/fs/reiserfs/reiserfs.c ++++ libparted/fs/reiserfs/reiserfs.c +@@ -85,7 +85,7 @@ + FCLASS int (FPTR libreiserfs_exception_option) (reiserfs_exception_t *); + FCLASS char *(FPTR libreiserfs_exception_message) (reiserfs_exception_t *); + FCLASS void (FPTR libreiserfs_exception_set_handler) +- (int(FPTR)(reiserfs_exception_t *)); ++ (int(*)(reiserfs_exception_t *)); + + FCLASS void (FPTR dal_realize) (dal_t *); + FCLASS size_t (FPTR dal_block_size) (dal_t *); diff --git a/parted.changes b/parted.changes index 93835e7..2dbd350 100644 --- a/parted.changes +++ b/parted.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Mar 20 15:46:12 CET 2008 - meissner@suse.de + +- fix buildrequires +- change from loading libreiserfs dynamically to just link it + (avoids adding libreiserfs-devel + deps to the system) + FATE#303510 +- enable device mapper linking (I very much doubt it was intended to + be disabled) + ------------------------------------------------------------------- Sun Mar 16 06:53:23 CET 2008 - crrodriguez@suse.de diff --git a/parted.spec b/parted.spec index 176e7c0..bff52a7 100644 --- a/parted.spec +++ b/parted.spec @@ -12,13 +12,13 @@ Name: parted -BuildRequires: device-mapper device-mapper-devel e2fsprogs-devel libreiserfs readline-devel reiserfs +BuildRequires: device-mapper-devel e2fsprogs-devel libreiserfs-devel readline-devel %define aclocaldir /usr/share/aclocal License: GPL v2 or later Group: System/Filesystems Summary: GNU partitioner Version: 1.8.8 -Release: 24 +Release: 27 Source0: %{name}-%{version}.tar.bz2 Patch: always-resize-part.dif Patch1: parted-type.patch @@ -30,6 +30,7 @@ Patch7: parted-1.8.3.dif Patch8: fat16_hfs_fix.dif Patch9: always_print_geom.diff Patch10: 2TB_size_overflow.diff +Patch11: fix-function-def.patch Patch51: parted.tty.patch Patch52: parted.no-O_DIRECT.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -49,7 +50,7 @@ Authors: %package devel Summary: Include Files and Libraries mandatory for Development. Group: System/Filesystems -Requires: e2fsprogs-devel +Requires: e2fsprogs-devel parted=%version device-mapper-devel libreiserfs-devel %description devel This package contains all necessary include files and libraries needed @@ -78,14 +79,17 @@ Authors: %patch8 -p1 %patch9 %patch10 -p1 +%patch11 %patch51 -p1 %patch52 -p1 %build #autoreconf --force --install test -f po/Makevars || mv po/Makevars.template po/Makevars -CFLAGS="$RPM_OPT_FLAGS" \ -%configure \ +CFLAGS="$RPM_OPT_FLAGS" \ +%configure \ + --enable-device-mapper=yes \ + --enable-dynamic-loading=no \ --disable-Werror make %{?jobs:-j%jobs} @@ -122,6 +126,13 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/*.so %changelog +* Thu Mar 20 2008 meissner@suse.de +- fix buildrequires +- change from loading libreiserfs dynamically to just link it + (avoids adding libreiserfs-devel + deps to the system) + FATE#303510 +- enable device mapper linking (I very much doubt it was intended to + be disabled) * Sun Mar 16 2008 crrodriguez@suse.de - fix file-not-in-lang rpmlint warnings * Tue Jan 15 2008 fehr@suse.de