aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--Makefile.PL3
-rw-r--r--rpmtools.spec9
3 files changed, 10 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 5b5f831..23b30b5 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ FROMCC_STATIC = $(FROMCC:%=%_static)
ALL = $(FROMC) $(FROMCC)
ALL_STATIC = $(FROMC_STATIC) $(FROMCC_STATIC)
CFLAGS = -Wall -g
-LIBRPM = -lrpm -lrpmio `perl -e 'use rpmtools; rpmtools::version_compare(qx(rpm -q --qf %{VERSION} rpm), "4.0.3") >= 0 and print "-lrpmdb"'` -lz -lbz2 -I/usr/include/rpm -lpopt
+LIBRPM = -lrpm -lrpmio `perl -e 'eval {require "./rpmtools.pm" }; rpmtools::version_compare(qx(rpm -q --qf %{VERSION} rpm), "4.0.3") >= 0 and print "-lrpmdb"'` -lz -lbz2 -I/usr/include/rpm -lpopt
LIBRPM_STATIC =
all: $(ALL)
diff --git a/Makefile.PL b/Makefile.PL
index 2bd224b..2052fd1 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -2,7 +2,8 @@ use ExtUtils::MakeMaker;
# See lib/ExtUtils/MakeMaker.pm for details of how to influence
# the contents of the Makefile that is written.
-use rpmtools;
+# needed as it bootstrap itself...
+eval { require "./rpmtools.pm" };
my $libs = ' -lrpm -lrpmio ' . (rpmtools::version_compare(qx(rpm -q --qf %{VERSION} rpm), "4.0.3") >= 0 && "-lrpmdb ") . '-lpopt -lz -lbz2';
diff --git a/rpmtools.spec b/rpmtools.spec
index 171d94f..180bcb8 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,11 +1,11 @@
%define name rpmtools
-%define release 8mdk
+%define release 9mdk
# do not modify here, see Makefile in the CVS
%define version 3.0
%{expand:%%define perlbase_version %(rpm -q --queryformat '%{VERSION}' perl-base)}
-%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}' rpm)}
+%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
Summary: Contains various rpm command-line tools
Name: %{name}
@@ -54,6 +54,11 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Wed Jul 18 2001 François Pons <fpons@mandrakesoft.com> 3.0-9mdk
+- changed rpm requires by including release with test.
+- allow bootstrap with current version and not installed one.
+- build release for new rpm.
+
* Thu Jul 5 2001 François Pons <fpons@mandrakesoft.com> 3.0-8mdk
- added compute_id function.