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: 11-Dec-2007 20:07:52
Branch: HEAD Handle: 2007121119075100
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
upgrading package: urpmi 4.10.17 -> 4.10.18
Summary:
Revision Changes Path
1.77 +43 -35 openpkg-src/urpmi/urpmi.patch
1.97 +5 -5 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.76 -r1.77 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 10 Dec 2007 20:48:11 -0000 1.76
+++ openpkg-src/urpmi/urpmi.patch 11 Dec 2007 19:07:51 -0000 1.77
@@ -1,7 +1,7 @@
-Index: URPM-2.10/Makefile.PL
---- URPM-2.10/Makefile.PL.orig 2007-11-09 09:42:36 +0100
-+++ URPM-2.10/Makefile.PL 2007-12-10 21:37:43 +0100
-@@ -1,61 +1,7 @@
+Index: URPM-3.00/Makefile.PL
+--- URPM-3.00/Makefile.PL.orig 2007-12-10 12:15:00 +0100
++++ URPM-3.00/Makefile.PL 2007-12-11 19:39:03 +0100
+@@ -1,69 +1,7 @@
use strict;
use ExtUtils::MakeMaker;
@@ -23,9 +23,8 @@
-my $version = `LC_ALL=C $rpm_path --version`;
-chomp $version;
-$version =~ s/RPM version //;
--$version =~ /^(?:4\.[2-9]|[5-9]|\d{2})/
-- or die "Unable to build URPM with too old (or undetected) rpm version
$version\n";
--print "Found RPM version $version\n";
+-my $pversion = eval "v$version";
+-$pversion ge v4.2 or die "Unable to build URPM with too old (or undetected)
rpm version $version\n";
-
-# to generate the ChangeLog depending on the checkout layout
-my $commonusername = "../common/";
@@ -47,24 +46,33 @@
-**MM**
-}
-
--my $ccflags = '-Wall -fno-strict-aliasing';
--if ($version =~ /^4\.(4\.[5-9]$|4\.\d\d|[5-9]\.|\d\d)/) {
-- $ccflags .= ' -DRPM_CALLBACK_LONGLONG';
--}
--if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 6) {
-- $ccflags .= ' -DRPM_446';
--}
--if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 8) {
-- $ccflags .= ' -DRPM_448';
--}
--if ($version =~ /^4\.5/ && (split(/\./, $version))[2] >= 0) {
-- $ccflags .= ' -DRPM_CALLBACK_LONGLONG -DRPM_446 -DRPM_448 -DRPM_450';
+-my @rpmflags;
+-if ($pversion ge v4.4.90 && $pversion lt v4.5) {
+- # rpm.org version
+- push @rpmflags, '-DRPM_ORG';
+-} else {
+- # rpm5.org version
+- if ($pversion ge v4.4.5) {
+- push @rpmflags, '-DRPM_CALLBACK_LONGLONG';
+- }
+- if ($pversion ge v4.4.6) {
+- push @rpmflags, '-DRPM_446';
+- }
+- if ($pversion ge v4.4.8) {
+- push @rpmflags, '-DRPM_448';
+- }
+- if ($pversion ge v4.5) {
+- push @rpmflags, '-DRPM_450';
+- }
-}
+-my $ccflags = join(' ', '-Wall -fno-strict-aliasing', @rpmflags);
+-
+-print "Found RPM version $version (compiling with flags: $ccflags)\n";
+my $ccflags = '-fno-strict-aliasing';
WriteMakefile(
NAME => 'URPM',
-@@ -64,8 +10,8 @@
+@@ -72,8 +10,8 @@
},
CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
@@ -75,9 +83,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-2.10/URPM.xs
---- URPM-2.10/URPM.xs.orig 2007-11-09 09:44:12 +0100
-+++ URPM-2.10/URPM.xs 2007-12-10 21:39:13 +0100
+Index: URPM-3.00/URPM.xs
+--- URPM-3.00/URPM.xs.orig 2007-12-11 11:01:06 +0100
++++ URPM-3.00/URPM.xs 2007-12-11 19:38:21 +0100
@@ -22,7 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ -87,7 +95,7 @@
#undef Fflush
#undef Mkdir
-@@ -271,6 +271,9 @@
+@@ -297,6 +297,9 @@
static int has_suggests;
int is_suggests(int_32 flags) {
@@ -99,7 +107,7 @@
return is;
Index: rpmtools-5.3.2/Makefile.PL
--- rpmtools-5.3.2/Makefile.PL.orig 2007-06-22 16:31:50 +0200
-+++ rpmtools-5.3.2/Makefile.PL 2007-12-10 21:36:57 +0100
++++ rpmtools-5.3.2/Makefile.PL 2007-12-11 19:38:21 +0100
@@ -35,8 +35,8 @@
RPMTOOLSVERSION => $rpmtools_version,
FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -122,7 +130,7 @@
INSTALLDIRS => 'vendor',
Index: rpmtools-5.3.2/parsehdlist.c
--- rpmtools-5.3.2/parsehdlist.c.orig 2007-06-22 13:46:09 +0200
-+++ rpmtools-5.3.2/parsehdlist.c 2007-12-10 21:36:57 +0100
++++ rpmtools-5.3.2/parsehdlist.c 2007-12-11 19:38:21 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <signal.h>
@@ -133,7 +141,7 @@
#include <stdio.h>
Index: rpmtools-5.3.2/rpm2header.c
--- rpmtools-5.3.2/rpm2header.c.orig 2007-06-15 09:24:49 +0200
-+++ rpmtools-5.3.2/rpm2header.c 2007-12-10 21:36:57 +0100
++++ rpmtools-5.3.2/rpm2header.c 2007-12-11 19:38:21 +0100
@@ -5,7 +5,8 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -144,9 +152,9 @@
#include <rpm/rpmts.h>
#define FILENAME_TAG 1000000
-Index: urpmi-4.10.17/Makefile.PL
---- urpmi-4.10.17/Makefile.PL.orig 2007-08-28 12:26:16 +0200
-+++ urpmi-4.10.17/Makefile.PL 2007-12-10 21:36:57 +0100
+Index: urpmi-4.10.18/Makefile.PL
+--- urpmi-4.10.18/Makefile.PL.orig 2007-12-04 14:50:05 +0100
++++ urpmi-4.10.18/Makefile.PL 2007-12-11 19:38:21 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -155,7 +163,7 @@
$inherited;
}
-@@ -110,10 +111,10 @@
+@@ -101,10 +102,10 @@
install -m 644 inst.list skip.list \$(SYSCONFDIR)/urpmi
installstatedir:
@@ -170,7 +178,7 @@
installgurpmi2: pure_install
ln -s -f consolehelper \$(DESTINSTALLSCRIPT)/gurpmi2
-@@ -155,8 +156,8 @@
+@@ -146,8 +147,8 @@
INST_MAN5DIR => 'blib/man5',
INST_MAN8DIR => 'blib/man8',
# We could read those values from rpm macros.
@@ -181,9 +189,9 @@
},
EXE_FILES => [ @bin_scripts, @sbin_scripts ],
PMLIBDIRS => [ qw(urpm) ],
-Index: urpmi-4.10.17/urpm/sys.pm
---- urpmi-4.10.17/urpm/sys.pm.orig 2007-10-02 14:01:03 +0200
-+++ urpmi-4.10.17/urpm/sys.pm 2007-12-10 21:36:57 +0100
+Index: urpmi-4.10.18/urpm/sys.pm
+--- urpmi-4.10.18/urpm/sys.pm.orig 2007-10-02 14:01:03 +0200
++++ urpmi-4.10.18/urpm/sys.pm 2007-12-11 19:38:21 +0100
@@ -114,7 +114,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.96 -r1.97 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 10 Dec 2007 20:48:11 -0000 1.96
+++ openpkg-src/urpmi/urpmi.spec 11 Dec 2007 19:07:51 -0000 1.97
@@ -23,10 +23,10 @@
##
# package version
-%define V_urpmi 4.10.17
-%define V_urpmi_rpm 4.10.17-1mdv2008.1
-%define V_urpm 2.10
-%define V_urpm_rpm 2.10-1mdv2008.1
+%define V_urpmi 4.10.18
+%define V_urpmi_rpm 4.10.18-1mdv2008.1
+%define V_urpm 3.00
+%define V_urpm_rpm 3.00-1mdv2008.1
%define V_mdv_distribconf 3.13
%define V_mdv_distribconf_rpm 3.13-1mdv2008.1
%define V_mdv_packdrakeng 1.13
@@ -45,7 +45,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20071210
+Release: 20071211
# package options
%option with_wget no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
