aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile4
-rw-r--r--Makefile.PL2
-rw-r--r--rpmtools.spec13
3 files changed, 13 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1e812ad..6075c16 100644
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ FROMCC_STATIC = $(FROMCC:%=%_static)
ALL = $(FROMC) $(FROMCC)
ALL_STATIC = $(FROMC_STATIC) $(FROMCC_STATIC)
CFLAGS = -Wall -g
-LIBRPM = -lrpm -lrpmio -lz -lbz2 -I/usr/include/rpm -lpopt
-LIBRPM_STATIC = -ldb1 -ldb-3.1
+LIBRPM = -lrpm -lrpmio -lrpmdb -lz -lbz2 -I/usr/include/rpm -lpopt
+LIBRPM_STATIC =
all: $(ALL)
diff --git a/Makefile.PL b/Makefile.PL
index 274ab90..be12efe 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
-my $libs = ' -lrpm -lrpmio -lpopt -lz -lbz2';
+my $libs = ' -lrpm -lrpmio -lrpmdb -lpopt -lz -lbz2';
WriteMakefile(
'NAME' => 'rpmtools',
diff --git a/rpmtools.spec b/rpmtools.spec
index 7251d94..e8654bd 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 23mdk
+%define release 25mdk
# do not modify here, see Makefile in the CVS
%define version 2.3
@@ -17,8 +17,8 @@ License: GPL
Group: System/Configuration/Packaging
BuildRoot: %{_tmppath}/%{name}-buildroot
Prefix: %{_prefix}
-BuildRequires: rpm-devel >= 4.0 bzip2 popt-devel zlib-devel libbzip2-devel db1-devel db2-devel db3-devel perl-devel
-Requires: perl-base = %{perlbase_version} rpm >= 4.0 bzip2 >= 1.0
+BuildRequires: rpm-devel >= 4.0.3 bzip2 popt-devel zlib-devel libbzip2-devel perl-devel
+Requires: perl-base = %{perlbase_version} rpm >= 4.0.3 bzip2 >= 1.0
Obsoletes: rpmtools-compat <= 2.0 rpmtools-devel <= 2.0
%description
@@ -53,6 +53,13 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Wed Jun 13 2001 François Pons <fpons@mandrakesoft.com> 2.3-25mdk
+- really fix with newer rpm (rpmtools.so was missing).
+- update distribution tag.
+
+* Wed Jun 13 2001 François Pons <fpons@mandrakesoft.com> 2.3-24mdk
+- fix with newer rpm (added -lrpmdb).
+
* Wed Jun 6 2001 François Pons <fpons@mandrakesoft.com> 2.3-23mdk
- added require on perl-base version used for build.
- fix ordering package to choose libXXX before XXX.