OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 25-Feb-2008 21:42:51
Branch: HEAD Handle: 2008022520425000
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
modifying package: urpmi-5.5 20080224 -> 20080225
Summary:
Revision Changes Path
1.91 +22 -17 openpkg-src/urpmi/urpmi.patch
1.116 +3 -3 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.90 -r1.91 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 24 Feb 2008 08:39:30 -0000 1.90
+++ openpkg-src/urpmi/urpmi.patch 25 Feb 2008 20:42:50 -0000 1.91
@@ -1,7 +1,7 @@
-Index: URPM-3.07/Makefile.PL
---- URPM-3.07/Makefile.PL.orig 2007-12-10 12:15:00 +0100
-+++ URPM-3.07/Makefile.PL 2008-01-12 10:38:25 +0100
-@@ -1,69 +1,7 @@
+Index: URPM-3.08/Makefile.PL
+--- URPM-3.08/Makefile.PL.orig 2008-02-08 18:00:24 +0100
++++ URPM-3.08/Makefile.PL 2008-02-25 21:31:56 +0100
+@@ -1,74 +1,7 @@
use strict;
use ExtUtils::MakeMaker;
@@ -21,8 +21,10 @@
-defined $rpm_path or die "Can't find rpm on this system\n";
-
-my $version = `LC_ALL=C $rpm_path --version`;
+-# fix compiling with RCs:
+-$version =~ s/-.*//;
-chomp $version;
--$version =~ s/RPM version //;
+-$version =~ s/(RPM version )|(rpm \(RPM\) )//;
-my $pversion = eval "v$version";
-$pversion ge v4.2 or die "Unable to build URPM with too old (or undetected)
rpm version $version\n";
-
@@ -62,7 +64,10 @@
- push @rpmflags, '-DRPM_448';
- }
- if ($pversion ge v4.5) {
-- push @rpmflags, '-DRPM_450';
+- push @rpmflags, '-DRPM_450';
+- }
+- if ($pversion ge v5.0.0) {
+- push @rpmflags, '-DRPM_500 -DWITH_DB';
- }
-}
-my $ccflags = join(' ', '-Wall -fno-strict-aliasing', @rpmflags);
@@ -72,7 +77,7 @@
WriteMakefile(
NAME => 'URPM',
-@@ -72,8 +10,8 @@
+@@ -77,8 +10,8 @@
},
CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
@@ -83,9 +88,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-3.07/URPM.xs
---- URPM-3.07/URPM.xs.orig 2008-01-08 12:13:16 +0100
-+++ URPM-3.07/URPM.xs 2008-01-12 10:38:25 +0100
+Index: URPM-3.08/URPM.xs
+--- URPM-3.08/URPM.xs.orig 2008-01-25 16:50:01 +0100
++++ URPM-3.08/URPM.xs 2008-02-25 21:27:12 +0100
@@ -22,7 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ -95,7 +100,7 @@
#undef Fflush
#undef Mkdir
-@@ -65,6 +65,10 @@
+@@ -80,6 +80,10 @@
#include <rpm/rpmbuild.h>
#include <rpm/rpmlog.h>
@@ -107,8 +112,8 @@
char *info;
char *requires;
Index: rpmtools-5.3.6/Makefile.PL
---- rpmtools-5.3.6/Makefile.PL.orig 2007-12-18 15:17:25 +0100
-+++ rpmtools-5.3.6/Makefile.PL 2008-01-12 10:38:25 +0100
+--- rpmtools-5.3.6/Makefile.PL.orig 2008-02-05 09:52:26 +0100
++++ rpmtools-5.3.6/Makefile.PL 2008-02-25 21:27:12 +0100
@@ -35,8 +35,8 @@
RPMTOOLSVERSION => $rpmtools_version,
FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -131,7 +136,7 @@
INSTALLDIRS => 'vendor',
Index: rpmtools-5.3.6/parsehdlist.c
--- rpmtools-5.3.6/parsehdlist.c.orig 2007-06-22 13:46:09 +0200
-+++ rpmtools-5.3.6/parsehdlist.c 2008-01-12 10:38:25 +0100
++++ rpmtools-5.3.6/parsehdlist.c 2008-02-25 21:27:12 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <signal.h>
@@ -142,7 +147,7 @@
#include <stdio.h>
Index: rpmtools-5.3.6/rpm2header.c
--- rpmtools-5.3.6/rpm2header.c.orig 2007-12-17 13:50:16 +0100
-+++ rpmtools-5.3.6/rpm2header.c 2008-01-12 10:38:25 +0100
++++ rpmtools-5.3.6/rpm2header.c 2008-02-25 21:27:12 +0100
@@ -5,7 +5,8 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -155,7 +160,7 @@
#define FILENAME_TAG 1000000
Index: urpmi-5.5/Makefile.PL
--- urpmi-5.5/Makefile.PL.orig 2007-12-04 14:50:05 +0100
-+++ urpmi-5.5/Makefile.PL 2008-01-12 10:38:25 +0100
++++ urpmi-5.5/Makefile.PL 2008-02-25 21:27:12 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -192,7 +197,7 @@
PMLIBDIRS => [ qw(urpm) ],
Index: urpmi-5.5/urpm/sys.pm
--- urpmi-5.5/urpm/sys.pm.orig 2007-10-02 14:01:03 +0200
-+++ urpmi-5.5/urpm/sys.pm 2008-01-12 10:38:25 +0100
++++ urpmi-5.5/urpm/sys.pm 2008-02-25 21:27:12 +0100
@@ -114,7 +114,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.115 -r1.116 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 24 Feb 2008 08:39:30 -0000 1.115
+++ openpkg-src/urpmi/urpmi.spec 25 Feb 2008 20:42:50 -0000 1.116
@@ -24,8 +24,8 @@
# package version
%define V_urpmi 5.5
%define V_urpmi_rpm 5.5-1mdv2008.1
-%define V_urpm 3.07
-%define V_urpm_rpm 3.07-3mdv2008.1
+%define V_urpm 3.08
+%define V_urpm_rpm 3.08-1mdv2008.1
%define V_mdv_distribconf 4.00
%define V_mdv_distribconf_rpm 4.00-1mdv2008.1
%define V_mdv_packdrakeng 1.13
@@ -44,7 +44,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20080224
+Release: 20080225
# package options
%option with_wget no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
