Up to 3.1.18

diff --git a/clonezilla.spec b/clonezilla.spec
index ebb9a0dbe90084e4a6153ebc2b8e9eaebbec3de3..b779eadb4a950b0cba8160be85ce5401549d2a3c 100644 (file)
--- a/clonezilla.spec
+++ b/clonezilla.spec
@@ -1,14 +1,14 @@
 Summary:       Opensource Clone System (ocs), clonezilla
 Name:          clonezilla
-Version:       2.3.58
-Release:       1
+Version:       3.1.18
+Release:       0.1
 License:       GPL
 Group:         Networking/Utilities
-Source0:       http://free.nchc.org.tw/drbl-core/src/stable/%{name}-%{version}.tar.bz2
-# Source0-md5: 37b8e7563607c4e43050fd3b598f6672
+Source0:       http://free.nchc.org.tw/drbl-core/src/unstable/%{name}-%{version}.tar.bz2
+# Source0-md5: 9451285a0f6ec4c5446e4fd2191d4eb6
 URL:           http://www.clonezilla.org/
 Requires:      bash
-Requires:      drbl >= 1.9.9-19
+Requires:      drbl >= 2.1.33
 Requires:      ntfsprogs >= 1.13.1
 Requires:      partclone >= 0.2.22
 Requires:      partimage >= 0.6.9
@@ -17,8 +17,6 @@ Requires:     psmisc
 Requires:      udpcast
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                drbldir         %{_libdir}/drbl
-
 %description
 Clonezilla, based on DRBL, Partition Image, ntfsclone, partclone, and
 udpcast, allows you to do bare metal backup and recovery. Two types of
@@ -30,15 +28,12 @@ many (40 plus!) computers simultaneously.
 %prep
 %setup -q -n %{name}-%{version}
 
-grep -rl /opt/drbl/ . | xargs sed -i -e 's,/opt/drbl,%{drbldir},g'
-
 %build
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-       maindir=%{drbldir} \
        DESTDIR=$RPM_BUILD_ROOT
 
 %clean
@@ -46,10 +41,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS
+%doc doc/AUTHORS doc/ChangeLog.txt doc/VERSION
+%dir /etc/drbl
+/etc/drbl/*.conf
+%attr(755,root,root) /usr/sbin/*
+%attr(755,root,root) /usr/bin/*
 %defattr(-,root,root)
-%{drbldir}/bin/*
-%{drbldir}/sbin/*
-%{drbldir}/conf/*
-%{drbldir}/setup/*
-%{drbldir}/samples/*
+/usr/share/drbl