Hello community,
here is the log from the commit of package dd_rescue for openSUSE:Factory
checked in at Mon Sep 5 16:26:43 CEST 2011.
--------
--- dd_rescue/dd_rescue.changes 2010-11-02 23:56:03.000000000 +0100
+++ dd_rescue/dd_rescue.changes 2011-09-03 22:34:04.000000000 +0200
@@ -1,0 +2,32 @@
+Sat Sep 3 20:31:45 UTC 2011 - asterios.dramis@gmail.com
+
+- Spec file updates:
+ * Changed License: to GPL-2.0 (bnc#714914).
+ * Minor other updates.
+
+-------------------------------------------------------------------
+Sat May 14 19:15:25 UTC 2011 - asterios.dramis@gmail.com
+
+- Update to dd_rhelp-0.1.2:
+ * IMPROVEMENT : will check the log file destination for sane conditions and
+ will try some other locations if not.
+ * IMPROVEMENT : will manage max_err parameter to avoid creating to much
+ chunks.
+ * More and better information displayed at 'info' time.
+ From dd_rhelp-0.1.0:
+ * INSTALL : No more ./configure && make && make install ... all detection
+ were done at runtime anyway
+ * UPDATE : updated libs provided in dd_rhelp
+ * UPDATE : finally compatible with recent tail/head "-n" arguments
+ * Added some sanity tests.
+ * TEST : Started to create dd_rhelp.test which unit tests dd_rhelp.
+- Spec file updates:
+ * Changes based on rpmdevtools templates and spec-cleaner run.
+ * Added description for the patches based on openSUSE Patches Guidelines.
+ * Added a fix inside the spec file to remove build time references
+ * dd_rhelp no longer needs auto* tools.
+ * Minor other updates.
+- Removed dd_rhelp_src.diff patch (fixed upstream).
+- Rebased the other patches to apply cleanly.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
dd_rhelp-0.0.6.tar.gz
dd_rhelp_src.diff
New:
----
dd_rhelp-0.1.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dd_rescue.spec ++++++
--- /var/tmp/diff_new_pack.MRq76x/_old 2011-09-05 16:25:41.000000000 +0200
+++ /var/tmp/diff_new_pack.MRq76x/_new 2011-09-05 16:25:41.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package dd_rescue (Version 1.23_0.0.6)
+# spec file for package dd_rescue
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,78 +17,72 @@
# norootforbuild
+%define ddrescuever 1.23
+%define ddrhelpver 0.1.2
Name: dd_rescue
-%define ddrescuever 1.23
-%define ddrhelpver 0.0.6
-Version: 1.23_0.0.6
+Version: %{ddrescuever}_%{ddrhelpver}
Release: 1
-License: GNU General Public License (GPL) v2 or v3
-Group: System/Base
-#Provides: ddrescue = 1.23
-#Obsoletes: ddrescue < 1.15
-AutoReqProv: on
-Requires: bc
-BuildRequires: libfallocate-devel-static
Summary: Data Copying in the Presence of I/O Errors
-Source: http://www.garloff.de/kurt/linux/ddrescue/dd_rescue-%{ddrescuever}.tar.gz
-Source1: dd_rhelp-%{ddrhelpver}.tar.gz
-#Patch: dd_rescue-%{version}.diff
-Patch2: dd_rhelp_src.diff
-Patch3: ddresc-112.diff
-Patch4: dd_rhelp_EOF.diff
-Patch5: dd_rhelp_Summary.diff
+
+License: GPL-2.0
+Url: http://www.garloff.de/kurt/linux/ddrescue/
+Group: System/Base
+Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{ddrescuever}.tar.gz
+Source1: http://www.kalysto.org/pkg/dd_rhelp-%{ddrhelpver}.tar.gz
+# PATCH-FIX-OPENSUSE ddresc-112.diff garloff@suse.de -- Use -y0 if ddrescue is 1.12 or newer
+Patch0: ddresc-112.diff
+# PATCH-FIX-OPENSUSE dd_rhelp_EOF.diff garloff@suse.de -- Adjust dd_rhelp to changes in dd_rescue
+Patch1: dd_rhelp_EOF.diff
+# PATCH-FIX-OPENSUSE dd_rhelp_Summary.diff garloff@suse.de -- dd_rhelp adjusted for Summary change
+Patch2: dd_rhelp_Summary.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: libfallocate-devel-static
+Requires: bc
+Provides: ddrescue = %{ddrescuever}
+Obsoletes: ddrescue < %{ddrescuever}
+
%description
dd_rescue helps when nothing else can: your disk has crashed and you
try to copy it over to another one. While standard Unix tools like cp,
cat, and dd wail "abort" on every I/O error, dd_rescue does not.
-
-
-Authors:
---------
- Kurt Garloff
-
%prep
-%setup -n dd_rescue -b1
-#%patch -p1
-cd ../dd_rhelp-%{ddrhelpver}
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-for name in FAQ NEWS README THANKS TODO; do
+%setup -q -n dd_rescue -a1
+cd dd_rhelp-%{ddrhelpver}
+%patch0
+%patch1
+%patch2
+for name in AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO; do
cp -p $name ${name}.dd_rhelp
done
+cd ..
+
+# Remove build time references so build-compare can do its work
+FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
+FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
+sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" dd_rescue.c
+sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" dd_rescue.c
%build
-make RPM_OPT_FLAGS="$RPM_OPT_FLAGS" libfalloc-static LIBDIR=%{_libdir}
-cd ../dd_rhelp-%{ddrhelpver}
-# Ubuntu needs this
-%if 0%{?xubuntu_version} != 0
- automake --add-missing
-%endif
-autoreconf
-./configure
-make
+make RPM_OPT_FLAGS="%{optflags}" libfalloc-static LIBDIR=%{_libdir} %{?_smp_mflags}
%install
-make install DESTDIR=$RPM_BUILD_ROOT INSTASROOT= INSTALLFLAGS=
-cd ../dd_rhelp-%{ddrhelpver}
-make install DESTDIR=$RPM_BUILD_ROOT bindir=/bin
+make install DESTDIR=%{buildroot} INSTASROOT= INSTALLFLAGS=
+cd dd_rhelp-%{ddrhelpver}
+install -Dpm 0755 dd_rhelp %{buildroot}/bin
+cd ..
+
+%clean
+rm -rf %{buildroot}
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
+%doc COPYING README.dd_rescue
+%doc dd_rhelp-%{ddrhelpver}/*.dd_rhelp
+%doc dd_rhelp-%{ddrhelpver}/doc
/bin/dd_rescue
/bin/dd_rhelp
-%doc README.dd_rescue
-%doc ../dd_rhelp-%{ddrhelpver}/*.dd_rhelp
-%doc ../dd_rhelp-%{ddrhelpver}/doc
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-rm -rf $RPM_BUILD_DIR/dd_rescue
%changelog
++++++ dd_rhelp-0.0.6.tar.gz -> dd_rhelp-0.1.2.tar.gz ++++++
++++ 9676 lines of diff (skipped)
++++++ dd_rhelp_EOF.diff ++++++
--- /var/tmp/diff_new_pack.MRq76x/_old 2011-09-05 16:25:42.000000000 +0200
+++ /var/tmp/diff_new_pack.MRq76x/_new 2011-09-05 16:25:42.000000000 +0200
@@ -1,9 +1,6 @@
-Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
-===================================================================
---- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
-+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
-@@ -191,9 +191,9 @@ fi
- # regexp for parsing the log file.
+--- dd_rhelp.orig 2011-05-14 20:17:10.782000079 +0300
++++ dd_rhelp 2011-05-14 20:18:26.578000081 +0300
+@@ -906,7 +906,7 @@
string="^Summary for $infile -> $outfile:"
infoline="^dd_rescue: (info):"
@@ -12,15 +9,12 @@
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
#
- # === Functions
-@@ -314,9 +314,9 @@ function bc_calc ()
- # or 'nb' where nb is best EOF found
+@@ -990,7 +990,7 @@
function get_eof()
{
-- eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')"
-+ eoflines="$("${CAT}" "$logfile" | "$tr" -d "\\r" | "$GREP" "$eofstring" | "$SED" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF.*$/\1/g')"
+- eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF$/\1/g')"
++ eoflines="$("${cat}" "$logfile" | "${tr}" -d "\\r" | "${grep}" "$eofstring" | "${sed}" 's/^dd_rescue: (info): .* (\([0-9\.]\+\)k): EOF.*$/\1/g')"
eof="nothing"
- for i in $eoflines
++++++ dd_rhelp_Summary.diff ++++++
--- /var/tmp/diff_new_pack.MRq76x/_old 2011-09-05 16:25:42.000000000 +0200
+++ /var/tmp/diff_new_pack.MRq76x/_new 2011-09-05 16:25:42.000000000 +0200
@@ -1,8 +1,6 @@
-Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
-===================================================================
---- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
-+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
-@@ -190,7 +190,7 @@ fi
+--- dd_rhelp.orig 2011-05-14 20:18:26.578000081 +0300
++++ dd_rhelp 2011-05-14 20:20:47.411000081 +0300
+@@ -904,7 +904,7 @@
# regexp for parsing the log file.
@@ -11,12 +9,12 @@
infoline="^dd_rescue: (info):"
eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
-@@ -753,7 +753,7 @@ function process_log()
- test -z data && return 0
+@@ -1471,7 +1471,7 @@
[ "$DEBUG" == "on" ] && echo -n "- cleaning data ["
-- data=$(echo "$data" | "$GREP" -v "xferd: \+0.0k$")
-+ data=$(echo "$data" | "$GREP" -v "xferd: \+0.0k$" | "$GREP" -v "$string")
+ # XXXVaab : bad if file is less that 0.1Ko length
+- data=$(echo "$data" | "${grep}" -v "xferd: \+0.0k$")
++ data=$(echo "$data" | "${grep}" -v "xferd: \+0.0k$" | "${grep}" -v "$string")
[ "$DEBUG" == "on" ] && echo -n "."
- data=$(echo "$data" | "$GREP" "$infoline" -A 1 | "${CUT}" -c 12-)
+ data=$(echo "$data" | "${grep}" "$infoline" -A 1 | "${cut}" -c 12-)
[ "$DEBUG" == "on" ] && echo -n "."
++++++ ddresc-112.diff ++++++
--- /var/tmp/diff_new_pack.MRq76x/_old 2011-09-05 16:25:42.000000000 +0200
+++ /var/tmp/diff_new_pack.MRq76x/_new 2011-09-05 16:25:42.000000000 +0200
@@ -1,20 +1,15 @@
-Index: dd_rhelp-0.0.6/src/dd_rhelp-sh
-===================================================================
---- dd_rhelp-0.0.6.orig/src/dd_rhelp-sh
-+++ dd_rhelp-0.0.6/src/dd_rhelp-sh
-@@ -219,9 +219,14 @@ function get_valid_dd_rescue
+--- dd_rhelp.orig 2009-04-22 00:49:27.000000000 +0300
++++ dd_rhelp 2011-05-14 20:14:08.592000080 +0300
+@@ -945,7 +945,11 @@
- if is_num "$version" && [ "$(bc_calc 2 "$version < 1.03")" == "0" ]
- then
+ if is_num "$version" && [ "$(bc_calc 2 "$version < 1.03")" == "0" ]; then
[ "$DEBUG" == "on" ] && echo "OK !" >&2
-- echo "$path"
-+ if [ "$(bc_calc 2 "$version < 1.12")" == "0" ]
-+ then
-+ echo "$path -y0"
-+ else
-+ echo "$path"
-+ fi
- return 0
+- echo "$path"
++ if [ "$(bc_calc 2 "$version < 1.12")" == "0" ];then
++ echo "$path -y0"
++ else
++ echo "$path"
++ fi
+ return 0
else
- [ "$DEBUG" == "on" ] && echo "BAD !" >&2
- fi
+ [ "$DEBUG" == "on" ] && echo "BAD !" >&2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org