Accepting request 109005 from home:adra:branches:Base:System
Update to version 1.25, Spec file updates, Removed dd_rhelp from the package (a SR will follow for making dd_rhelp a separate package), Updated License to GPL-2.0 or GPL-3.0 OBS-URL: https://build.opensuse.org/request/show/109005 OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=7
This commit is contained in:
Git OBS Bridge
parent
b1a03eaf29
commit
e2463bea75
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d11e33841d225cdb0596253948c14c9f6f12b33e00a1814217ec74ffa5e524b0
|
||||
size 21344
|
||||
3
dd_rescue-1.25.tar.gz
Normal file
3
dd_rescue-1.25.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:22a2b030868c6e0639240df590a0c8483fda9ad1c01c5e6a0f7f188271c02585
|
||||
size 21794
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Mar 12 17:42:25 UTC 2012 - asterios.dramis@gmail.com
|
||||
|
||||
- Update to version 1.25:
|
||||
* Fix for spurious "Success" messages that resulted from overwritten
|
||||
(cleared) errno. Bad blocks are formatted in a way that they are not
|
||||
overwritten on screen and block numbers are output as unsigned.
|
||||
- Removed dd_rhelp from the package (dd_rhelp will become a separate package. A
|
||||
recommended entry for dd_rhelp was added in dd_rescue).
|
||||
- Spec file updates:
|
||||
* Updated License: to "GPL-2.0 or GPL-3.0".
|
||||
* Removed bc from BuildRequires: (not needed since dd_rhelp was removed).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 7 21:51:22 UTC 2012 - rschweikert@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package dd_rescue
|
||||
#
|
||||
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2012 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
|
||||
@ -15,33 +15,21 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%define ddrescuever 1.24
|
||||
%define ddrhelpver 0.1.2
|
||||
|
||||
Name: dd_rescue
|
||||
Version: %{ddrescuever}_%{ddrhelpver}
|
||||
Release: 1
|
||||
Version: 1.25
|
||||
Release: 0
|
||||
Summary: Data Copying in the Presence of I/O Errors
|
||||
|
||||
License: GPL-2.0
|
||||
License: GPL-2.0 or GPL-3.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
|
||||
# PATCH-FIX-OPENSUSE dd_rhelp.test.diff garloff@suse.de -- Fix dd_rhelp.test script (basic regression test)
|
||||
Patch3: dd_rhelp.test.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
BuildRequires: libfallocate-devel-static bc
|
||||
Source0: http://www.garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.gz
|
||||
BuildRequires: libfallocate-devel-static
|
||||
Requires: bc
|
||||
Provides: ddrescue = %{ddrescuever}
|
||||
Obsoletes: ddrescue < %{ddrescuever}
|
||||
Recommends: dd_rhelp
|
||||
# ddrescue was last used in openSUSE 11.4 (version 1.14_0.0.6)
|
||||
Provides: ddrescue = %{version}
|
||||
Obsoletes: ddrescue < %{version}
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
dd_rescue helps when nothing else can: your disk has crashed and you
|
||||
@ -49,16 +37,7 @@ 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.
|
||||
|
||||
%prep
|
||||
%setup -q -n dd_rescue -a1
|
||||
cd dd_rhelp-%{ddrhelpver}
|
||||
%patch0
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
for name in AUTHORS COPYING ChangeLog FAQ NEWS README THANKS TODO; do
|
||||
cp -p $name ${name}.dd_rhelp
|
||||
done
|
||||
cd ..
|
||||
%setup -q -n dd_rescue
|
||||
|
||||
# Remove build time references so build-compare can do its work
|
||||
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
|
||||
@ -72,31 +51,18 @@ make RPM_OPT_FLAGS="%{optflags}" libfalloc-static LIBDIR=%{_libdir} %{?_smp_mfla
|
||||
%install
|
||||
make install DESTDIR=%{buildroot} INSTALLDIR=%{buildroot}/%{_bindir} \
|
||||
INSTASROOT= INSTALLFLAGS=
|
||||
cd dd_rhelp-%{ddrhelpver}
|
||||
install -Dpm 0755 dd_rhelp %{buildroot}/%{_bindir}
|
||||
|
||||
#UsrMerge
|
||||
mkdir %{buildroot}/bin
|
||||
ln -sf %{_bindir}/dd_rescue %{buildroot}/bin
|
||||
ln -sf %{_bindir}/dd_rhelp %{buildroot}/bin
|
||||
#EndUsrMerge
|
||||
cd ..
|
||||
|
||||
%check
|
||||
cd dd_rhelp-%{ddrhelpver}
|
||||
export PATH=..:$PATH
|
||||
./dd_rhelp.test
|
||||
cd ..
|
||||
|
||||
%files
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING README.dd_rescue
|
||||
%doc dd_rhelp-%{ddrhelpver}/*.dd_rhelp
|
||||
%doc dd_rhelp-%{ddrhelpver}/doc
|
||||
%{_bindir}/dd_rescue
|
||||
%{_bindir}/dd_rhelp
|
||||
#UsrMerge
|
||||
/bin/dd_rescue
|
||||
/bin/dd_rhelp
|
||||
#EndUsrMerge
|
||||
|
||||
%changelog
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:7b4fba7b76c937b532afec52eeb47c749bd3482a6e01058b54f1f9f0a89b1f3a
|
||||
size 34614
|
||||
@ -1,31 +0,0 @@
|
||||
--- dd_rhelp-0.1.2/dd_rhelp.test.orig 2009-04-21 23:49:27.000000000 +0200
|
||||
+++ dd_rhelp-0.1.2/dd_rhelp.test 2011-10-05 11:18:41.000000000 +0200
|
||||
@@ -1188,9 +1188,9 @@ function test_gnu_standards() {
|
||||
assert "$tprog --help sends errorlevel 0" $tprog --help
|
||||
assert "$tprog --version sends errorlevel 0" $tprog --version
|
||||
|
||||
- assert "$tprog --version sends version info" matches \"$($tprog --version)\" \"$tprog ver\. [0-9]\+\.[0-9]\+\.[0-9]\+\"
|
||||
+ assert "$tprog --version sends version info" matches \"$($tprog --version)\" \"$tprog ver\\. [0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\"
|
||||
|
||||
- assert "$tprog --help output contains info in first line" matches \"$($tprog --help | "$head" -n 1)\" \"$tprog ver\. [0-9]\+\.[0-9]\+\.[0-9]\+\"
|
||||
+ assert "$tprog --help output contains info in first line" matches \"$($tprog --help | "$head" -n 1)\" \"$tprog ver\\. [0-9]\\+\\.[0-9]\\+\\.[0-9]\\+\"
|
||||
|
||||
assert "$tprog --help info are the same than $tprog --help" [ \"$($tprog --help | "$head" -n 1)\" == \"$($tprog --version)\" ]
|
||||
}
|
||||
@@ -1305,6 +1305,7 @@ esac
|
||||
|
||||
#!-
|
||||
|
||||
+include parse
|
||||
include pretty
|
||||
include common
|
||||
include shunit
|
||||
@@ -1318,7 +1319,7 @@ tmp=/tmp
|
||||
|
||||
export PATH=".:$PATH"
|
||||
|
||||
-gnu_standards
|
||||
+test_gnu_standards
|
||||
|
||||
#
|
||||
# Checking bad arguments
|
||||
@ -1,22 +0,0 @@
|
||||
Index: dd_rhelp-0.1.2/dd_rhelp
|
||||
===================================================================
|
||||
--- dd_rhelp-0.1.2.orig/dd_rhelp
|
||||
+++ dd_rhelp-0.1.2/dd_rhelp
|
||||
@@ -906,7 +906,7 @@ fi
|
||||
|
||||
string="^Summary for $infile -> $outfile:"
|
||||
infoline="^dd_rescue: (info):"
|
||||
-eofstring="$infoline $infile ([0-9]\+\.[0-9]k): EOF\$"
|
||||
+eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
|
||||
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
||||
|
||||
#
|
||||
@@ -991,7 +991,7 @@ function get_valid_dd_rescue() {
|
||||
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')"
|
||||
|
||||
eof="nothing"
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
Index: dd_rhelp-0.1.2/dd_rhelp
|
||||
===================================================================
|
||||
--- dd_rhelp-0.1.2.orig/dd_rhelp
|
||||
+++ dd_rhelp-0.1.2/dd_rhelp
|
||||
@@ -904,7 +904,7 @@ fi
|
||||
|
||||
# regexp for parsing the log file.
|
||||
|
||||
-string="^Summary for $infile -> $outfile:"
|
||||
+string="^dd_rescue: (info): Summary for $infile -> $outfile:"
|
||||
infoline="^dd_rescue: (info):"
|
||||
eofstring="$infoline .* ([0-9]\+\.[0-9]k): EOF.*\$"
|
||||
nb_stars=$[ $bar_lines * $COLUMNS ] # nb of char to display progress bar...
|
||||
@@ -1472,7 +1472,7 @@ function process_log() {
|
||||
|
||||
[ "$DEBUG" == "on" ] && echo -n "- cleaning data ["
|
||||
# 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-)
|
||||
[ "$DEBUG" == "on" ] && echo -n "."
|
||||
@ -1,15 +0,0 @@
|
||||
--- 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
|
||||
[ "$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
|
||||
else
|
||||
[ "$DEBUG" == "on" ] && echo "BAD !" >&2
|
||||
Loading…
x
Reference in New Issue
Block a user