Accepting request 500352 from home:scarabeus_iv:branches:Base:System

- Cleanup a bit the dependencies
  * Run %configure as separate comand properly in build phase
- Remove support for < 12.0
- Add condition for openSSL to build with verison 1.0.0 on Factory

OBS-URL: https://build.opensuse.org/request/show/500352
OBS-URL: https://build.opensuse.org/package/show/Base:System/dd_rescue?expand=0&rev=32
This commit is contained in:
Dirk Mueller 2017-06-07 10:35:11 +00:00 committed by Git OBS Bridge
parent d714d912a3
commit 8f229e54bf
2 changed files with 29 additions and 28 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 30 13:52:48 UTC 2017 - tchvatal@suse.com
- Cleanup a bit the dependencies
* Run %configure as separate comand properly in build phase
- Remove support for < 12.0
- Add condition for openSSL to build with verison 1.0.0 on Factory
-------------------------------------------------------------------
Thu Dec 29 22:27:17 CET 2016 - kurt@garloff.de

View File

@ -1,7 +1,7 @@
#
# spec file for package dd_rescue
#
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -19,7 +19,7 @@
Name: dd_rescue
Version: 1.99.5
Release: 0
Summary: Data Copying in the Presence of I/O Errors
Summary: Data copying in the presence of I/O Errors
License: GPL-2.0 or GPL-3.0
Group: System/Base
Url: http://www.garloff.de/kurt/linux/ddrescue/
@ -27,27 +27,27 @@ Source0: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2
Source1: http://garloff.de/kurt/linux/ddrescue/%{name}-%{version}.tar.bz2.asc
Source2: %{name}.keyring
Source99: %{name}.changes
BuildRequires: autoconf
BuildRequires: libattr-devel
BuildRequires: libfallocate-devel
BuildRequires: lzo-devel
BuildRequires: lzop
BuildRequires: pkgconfig
BuildRequires: python
Requires: bc
Recommends: dd_rescue-lzo
Recommends: dd_rescue-crypt
Recommends: dd_rescue-lzo
Recommends: dd_rhelp
Recommends: libfallocate0
# 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
%if 0%{?suse_version} >= 1200
BuildRequires: libfallocate-devel
BuildRequires: lzop
%if 0%{?suse_version} >= 1330
BuildRequires: libopenssl-1_0_0-devel
%else
BuildRequires: pkgconfig(libcrypto)
%endif
BuildRequires: libopenssl-devel
BuildRequires: openssl
#BuildRequires: openssl-devel
%description
dd_rescue helps when nothing else can: your disk has crashed and you
@ -68,7 +68,7 @@ de/compression and de/encryption. The lzo plugin is packaged in the
dd_rescue-lzo, the crypt plugin in the dd_rescue-crypt subpackage.
%package crypt
Summary: crypt plugin for dd_rescue
Summary: Crypt plugin for dd_rescue
Group: System/Base
Requires: dd_rescue = %{version}
@ -84,10 +84,6 @@ and IVs including the generating keys from password and salt.
The plugin is new as of 1.98 and it despite diligent testing it
might be careful to expect some bugs and future changes.
Authors:
--------
Kurt Garloff <kurt@garloff.de>
%package lzo
Summary: LZO plugin for dd_rescue
Group: System/Base
@ -116,7 +112,6 @@ data to the decompressor; the plugin is still young and might expose bugs.
%prep
%setup -q
./autogen.sh
# Remove build time references so build-compare can do its work
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE99} '+%%H:%%M')
@ -125,17 +120,17 @@ sed -i "s/__TIME__/\"$FAKE_BUILDTIME\"/g" dd_rescue.c
sed -i "s/__DATE__/\"$FAKE_BUILDDATE\"/g" dd_rescue.c
%build
flags="%{optflags}"
make RPM_OPT_FLAGS="$flags" LIBDIR=%{_libdir} LIB=%{_lib} %{?_smp_mflags}
autoheader
autoconf
%configure
make RPM_OPT_FLAGS="%{optflags}" LIBDIR=%{_libdir} LIB=%{_lib} %{?_smp_mflags}
%install
make install DESTDIR=%{buildroot} INSTALLDIR=%{buildroot}/%{_bindir} LIB=%{_lib} LIBDIR=%{_libdir} \
%make_install RPM_OPT_FLAGS="%{optflags}" INSTALLDIR=%{buildroot}/%{_bindir} LIB=%{_lib} LIBDIR=%{_libdir} \
INSTASROOT= INSTALLFLAGS=
#UsrMerge
mkdir %{buildroot}/bin
ln -sf %{_bindir}/dd_rescue %{buildroot}/bin
#EndUsrMerge
%check
make %{?_smp_mflags} check
@ -144,9 +139,7 @@ make %{?_smp_mflags} check
%defattr(-,root,root,-)
%doc COPYING README.dd_rescue TODO
%{_bindir}/dd_rescue
#UsrMerge
/bin/dd_rescue
#EndUsrMerge
%{_libdir}/libddr_hash.so
%{_libdir}/libddr_MD5.so
%{_libdir}/libddr_null.so