summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2011-06-11 18:28:38 (GMT)
committercvs2git2012-06-24 12:13:13 (GMT)
commit80740a925a8d10882e3cfb729385dc2dd18f2985 (patch)
treeeba36499d94f2f7a895105243d9704f6593eefcd
parent2cfdd6e9ae72b185a188ed0d69f662b5df17b623 (diff)
downloaddump-80740a925a8d10882e3cfb729385dc2dd18f2985.zip
dump-80740a925a8d10882e3cfb729385dc2dd18f2985.tar.gz
- updated as_needed-fix patch to link explicitly with libcom_err (error_message used by dump itself) Changed files: dump-as_needed-fix.patch -> 1.3 dump.spec -> 1.84
-rw-r--r--dump-as_needed-fix.patch12
-rw-r--r--dump.spec9
2 files changed, 18 insertions, 3 deletions
diff --git a/dump-as_needed-fix.patch b/dump-as_needed-fix.patch
index f1b5bac..5f49af1 100644
--- a/dump-as_needed-fix.patch
+++ b/dump-as_needed-fix.patch
@@ -1,5 +1,17 @@
--- dump-0.4b43/configure.in.orig 2011-02-03 19:33:01.000000000 +0100
+++ dump-0.4b43/configure.in 2011-02-03 19:37:25.852692227 +0100
+@@ -407,9 +407,9 @@
+ dnl Check for Ext2fs headers and libraries
+ dnl
+ AC_CHECK_HEADER(ext2fs/ext2fs.h, [ext2fs_h=yes], [ext2fs_h=no], [-])
+-PKG_CHECK_MODULES(EXT2FS, [ext2fs])
++PKG_CHECK_MODULES(EXT2FS, [ext2fs com_err])
+ if test -n "$STATIC" ; then
+- EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs`
++ EXT2FS_LIBS=`$PKG_CONFIG --libs --static ext2fs com_err`
+ fi
+ if test "$ext2fs_h" = no -o "x$EXT2FS_LIBS" = "x"; then
+ AC_MSG_ERROR(You need to install the Ext2fs libraries from the E2fsprogs distribution first - hint: make install-libs)
@@ -510,7 +510,7 @@
dnl
dnl Check for rl_completion_matches
diff --git a/dump.spec b/dump.spec
index a77dd8e..f1d04da 100644
--- a/dump.spec
+++ b/dump.spec
@@ -8,22 +8,24 @@ Summary(ru.UTF-8): Программы для резервного копиров
Summary(tr.UTF-8): dump/restore yedekleme sistemi
Summary(uk.UTF-8): Програми для резервного копіювання та відновлення файлових систем
Name: dump
-Version: 0.4b43
+Version: 0.4b44
Release: 1
License: BSD
Group: Applications/System
Source0: http://downloads.sourceforge.net/dump/%{name}-%{version}.tar.gz
-# Source0-md5: a708cbac8a0f69dd55aecbb80bb290ca
+# Source0-md5: daec97b1ad905c904eba926221f4be6d
Patch0: %{name}-autoconf.patch
Patch1: %{name}-llh.patch
Patch2: %{name}-as_needed-fix.patch
URL: http://dump.sourceforge.net/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.57
+BuildRequires: automake
BuildRequires: bzip2-devel
BuildRequires: e2fsprogs-devel
BuildRequires: libselinux-devel
BuildRequires: ncurses-devel >= 5.2
BuildRequires: openssl-devel >= 0.9.7a
+BuildRequires: pkgconfig
BuildRequires: readline-devel >= 4.2
Requires: rmt
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -156,6 +158,7 @@ ermt to wersja programu rmt z szyfrowaniem.
%patch2 -p1
%build
+%{__aclocal}
%{__autoconf}
MYNAME=`id -ru`
MYGRP=`id -rg`