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-Nov-2006 20:29:44
Branch: HEAD Handle: 2006112519294300
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
upgrading package: urpmi 4.8.29 -> 4.9.4
Summary:
Revision Changes Path
1.15 +24 -41 openpkg-src/urpmi/urpmi.patch
1.22 +6 -6 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 14 Nov 2006 09:31:14 -0000 1.14
+++ openpkg-src/urpmi/urpmi.patch 25 Nov 2006 19:29:43 -0000 1.15
@@ -1,6 +1,6 @@
-Index: URPM-1.47/Makefile.PL
---- URPM-1.47/Makefile.PL.orig 2006-06-12 12:20:55 +0200
-+++ URPM-1.47/Makefile.PL 2006-11-14 10:28:22 +0100
+Index: URPM-1.49/Makefile.PL
+--- URPM-1.49/Makefile.PL.orig 2006-11-03 16:03:35 +0100
++++ URPM-1.49/Makefile.PL 2006-11-25 20:25:08 +0100
@@ -3,46 +3,15 @@
# where to find the rpm utility
@@ -77,9 +77,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-1.47/URPM.xs
---- URPM-1.47/URPM.xs.orig 2006-09-19 10:57:31 +0200
-+++ URPM-1.47/URPM.xs 2006-11-14 10:28:22 +0100
+Index: URPM-1.49/URPM.xs
+--- URPM-1.49/URPM.xs.orig 2006-11-17 17:43:04 +0100
++++ URPM-1.49/URPM.xs 2006-11-25 20:25:08 +0100
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ -90,7 +90,7 @@
#undef Mkdir
Index: rpmtools-5.1.0/Makefile.PL
--- rpmtools-5.1.0/Makefile.PL.orig 2006-08-22 15:46:50 +0200
-+++ rpmtools-5.1.0/Makefile.PL 2006-11-14 10:28:22 +0100
++++ rpmtools-5.1.0/Makefile.PL 2006-11-25 20:25:08 +0100
@@ -45,8 +45,8 @@
RPMTOOLSVERSION => $rpmtools_version,
FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -113,7 +113,7 @@
INSTALLDIRS => 'vendor',
Index: rpmtools-5.1.0/parsehdlist.c
--- rpmtools-5.1.0/parsehdlist.c.orig 2006-06-13 13:19:09 +0200
-+++ rpmtools-5.1.0/parsehdlist.c 2006-11-14 10:28:22 +0100
++++ rpmtools-5.1.0/parsehdlist.c 2006-11-25 20:25:08 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <signal.h>
@@ -124,7 +124,7 @@
#include <stdio.h>
Index: rpmtools-5.1.0/rpm2header.c
--- rpmtools-5.1.0/rpm2header.c.orig 2006-06-12 11:10:34 +0200
-+++ rpmtools-5.1.0/rpm2header.c 2006-11-14 10:28:22 +0100
++++ rpmtools-5.1.0/rpm2header.c 2006-11-25 20:25:08 +0100
@@ -5,7 +5,8 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -135,9 +135,9 @@
#include <rpm/rpmts.h>
#define FILENAME_TAG 1000000
-Index: urpmi-4.8.29/Makefile.PL
---- urpmi-4.8.29/Makefile.PL.orig 2006-11-02 11:33:59 +0100
-+++ urpmi-4.8.29/Makefile.PL 2006-11-14 10:28:22 +0100
+Index: urpmi-4.9.4/Makefile.PL
+--- urpmi-4.9.4/Makefile.PL.orig 2006-11-17 18:51:28 +0100
++++ urpmi-4.9.4/Makefile.PL 2006-11-25 20:25:08 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -172,32 +172,15 @@
},
EXE_FILES => [ @bin_scripts, @sbin_scripts ],
PMLIBDIRS => [ qw(urpm) ],
-Index: urpmi-4.8.29/urpm/sys.pm
---- urpmi-4.8.29/urpm/sys.pm.orig 2006-11-03 14:34:40 +0100
-+++ urpmi-4.8.29/urpm/sys.pm 2006-11-14 10:30:10 +0100
-@@ -95,7 +95,8 @@
-
- #- returns the first unused loop device, or an empty string if none is
found.
- sub first_free_loopdev () {
-- open my $mounts, '/proc/mounts' or do { warn "Can't read /proc/mounts:
$!\n"; return 1 };
-+ return '' if (not -f '/proc/mounts');
-+ open my $mounts, '/proc/mounts' or do { warn "Can't read /proc/mounts:
$!\n"; return '' };
- my %loopdevs = map { $_ => 1 } grep { ! -d $_ } glob('/dev/loop*');
- local *_;
- while (<$mounts>) {
-@@ -109,6 +110,7 @@
-
- sub trim_until_d {
- my ($dir) = @_;
-+ return $dir if (not -f '/proc/mounts');
- open my $mounts, '/proc/mounts' or do { warn "Can't read /proc/mounts:
$!\n"; return $dir };
- local $_;
- while (<$mounts>) {
-@@ -121,6 +123,7 @@
-
- #- checks if the main filesystems are writeable for urpmi to install files
in
- sub check_fs_writable () {
-+ return 1 if (not -f '/proc/mounts');
- open my $mounts, '/proc/mounts' or do { warn "Can't read /proc/mounts:
$!\n"; return 1 };
- local *_;
- while (<$mounts>) {
+Index: urpmi-4.9.4/urpm/sys.pm
+--- urpmi-4.9.4/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
++++ urpmi-4.9.4/urpm/sys.pm 2006-11-25 20:26:24 +0100
+@@ -94,7 +94,7 @@
+ }
+
+ sub proc_mounts() {
+- my @l = cat_('/proc/mounts') or warn "Can't read /proc/mounts: $!\n";
++ my @l = (-f '/proc/mounts' ? cat_('/proc/mounts') : ());
+ @l;
+ }
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.21 -r1.22 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 14 Nov 2006 09:24:05 -0000 1.21
+++ openpkg-src/urpmi/urpmi.spec 25 Nov 2006 19:29:43 -0000 1.22
@@ -23,10 +23,10 @@
##
# package version
-%define V_urpmi 4.8.29
-%define V_urpmi_rpm 4.8.29-1mdv2007.1
-%define V_urpm 1.47
-%define V_urpm_rpm 1.47-1mdv2007.1
+%define V_urpmi 4.9.4
+%define V_urpmi_rpm 4.9.4-1mdv2007.1
+%define V_urpm 1.49
+%define V_urpm_rpm 1.49-1mdv2007.1
%define V_mdv_distribconf 3.06
%define V_mdv_distribconf_rpm 3.06-1mdv2007.0
%define V_mdv_packdrakeng 1.01
@@ -45,7 +45,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20061114
+Release: 20061125
# package options
%option with_wget no
@@ -86,7 +86,7 @@
prog urpmi:urpmi = {
version = %{V_urpmi}
url =
ftp://ftp.free.fr/pub/Distributions_Linux/MandrivaLinux/devel/cooker/SRPMS/main/release/
- regex = urpmi-(__VER__)\.src\.gmz
+ regex = urpmi-(__VER__)\.src\.rpm
}
prog urpmi:URPM = {
version = %{V_urpm}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
