- up to 0.2.88

- remove unnecessary automake.patch file
- include partclone.imager according to upstream
- include example mbr according to upstream
- change README -> README.md according to upstream

diff --git a/automake.patch b/automake.patch
deleted file mode 100644 (file)
index c156f80..0000000
--- a/automake.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- partclone-0.2.48/configure.ac.wiget        2013-02-10 21:59:03.925355329 +0100
-+++ partclone-0.2.48/configure.ac      2013-02-10 22:07:35.071790552 +0100
-@@ -1,13 +1,14 @@
- AC_INIT([Partclone], [0.2.48], [thomas@nchc.org.tw])
- #AC_CONFIG_AUX_DIR([build-aux])
- #AC CONFIG SRCDIR([src/main.c])
--AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-+AM_INIT_AUTOMAKE([-Wall foreign])
- AM_GNU_GETTEXT_VERSION([0.16.1])
- AM_GNU_GETTEXT([external])
- AC_PROG_CC
- AC_PROG_INSTALL
- AC_PATH_PROG(RM, rm, rm)
- AC_PROG_LN_S
-+AM_PROG_CC_C_O
- 
- # Enable large file support.
- AC_SYS_LARGEFILE
---- partclone-0.2.48/src/Makefile.am.wiget     2013-02-10 22:02:38.249268004 +0100
-+++ partclone-0.2.48/src/Makefile.am   2013-02-10 22:06:41.313749533 +0100
-@@ -5,8 +5,11 @@ TOOLBOX = srcdir=$(top_srcdir) builddir=
- 
- BTRFS_SOURCE= btrfs/crc32c.c btrfs/disk-io.c btrfs/extent-tree.c btrfs/inode-map.c btrfs/rbtree.c btrfs/volumes.c btrfs/ctree.c btrfs/extent-cache.c btrfs/file-item.c btrfs/print-tree.c btrfs/root-tree.c btrfs/dir-item.c btrfs/extent_io.c btrfs/inode-item.c btrfs/radix-tree.c btrfs/utils.c btrfs/crc32c.h btrfs/extent-cache.h btrfs/ioctl.h btrfs/print-tree.h btrfs/transaction.h btrfs/volumes.h btrfs/ctree.h btrfs/extent_io.h btrfs/kerncompat.h btrfs/radix-tree.h btrfs/utils.h btrfs/disk-io.h btrfs/hash.h btrfs/list.h btrfs/rbtree.h btrfs/version.h
- 
-+AM_LDFLAGS = 
-+AM_CFLAGS = 
-+
- if ENABLE_STATIC
--LDFLAGS+=-static 
-+AM_LDFLAGS+=-static 
- endif
- 
- if ENABLE_TINFO
-@@ -14,11 +17,11 @@ LIBS+=-ltinfo
- endif
- 
- if ENABLE_MEMTRACE
--CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
-+AM_CFLAGS+=-DMEMTRACE -DMEMWATCH -DMW_STDIO
- endif
- 
- if ENABLE_NCURSESW
--CFLAGS+=-I/usr/include/ncursesw
-+AM_CFLAGS+=-I/usr/include/ncursesw
- endif
- 
- version.h: FORCE

diff --git a/partclone.spec b/partclone.spec
index ba8d711fe1eca79219b71991dcf24abfc7802914..33c8046d9ea1763b0b89638275d5e1430d82b28c 100644 (file)
--- a/partclone.spec
+++ b/partclone.spec
@@ -1,12 +1,11 @@
 Summary:       Utility to clone and restore partitions
 Name:          partclone
-Version:       0.2.58
-Release:       4
+Version:       0.2.88
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/partclone/%{name}-%{version}.tar.gz
-# Source0-md5: 8d8edeab8a0ce430d2e00efcc25f4ce7
-Patch0:                automake.patch
+# Source0-md5: fdf2b91ae0470c4a4463edd97b39357a
 URL:           http://partclone.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -31,7 +30,6 @@ e2fslibs.
 
 %prep
 %setup -q
-%patch0 -p1
 
 #sed -e 's|libxfs.h|xfs.h|' -i configure.ac -i src/xfsclone.[ch]
 sed -e 's|ncurses.h|ncurses/ncurses.h|' -i configure.ac -i src/{partclone,progress}.c
@@ -68,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README TODO
+%doc AUTHORS ChangeLog README.md TODO
 %attr(755,root,root) %{_sbindir}/partclone.btrfs
 %attr(755,root,root) %{_sbindir}/partclone.chkimg
 %attr(755,root,root) %{_sbindir}/partclone.dd
@@ -84,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sbindir}/partclone.hfs+
 %attr(755,root,root) %{_sbindir}/partclone.hfsp
 %attr(755,root,root) %{_sbindir}/partclone.hfsplus
+%attr(755,root,root) %{_sbindir}/partclone.imager
 %attr(755,root,root) %{_sbindir}/partclone.info
 %attr(755,root,root) %{_sbindir}/partclone.ntfs
 %attr(755,root,root) %{_sbindir}/partclone.ntfsfixboot
@@ -103,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/partclone.fat32.8*
 %{_mandir}/man8/partclone.hfs+.8*
 %{_mandir}/man8/partclone.hfsplus.8*
+%{_mandir}/man8/partclone.imager.8*
 %{_mandir}/man8/partclone.info.8*
 %{_mandir}/man8/partclone.ntfs.8*
 %{_mandir}/man8/partclone.restore.8*
@@ -112,3 +112,4 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/partclone.hfsp.8*
 %{_mandir}/man8/partclone.ntfsfixboot.8*
 %{_mandir}/man8/partclone.ntfsreloc.8*
+%{_datadir}/%{name}