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: 20-Jan-2007 09:46:19
Branch: HEAD Handle: 2007012008461801
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
upgrading package: urpmi 4.9.12 -> 4.9.13
Summary:
Revision Changes Path
1.27 +22 -29 openpkg-src/urpmi/urpmi.patch
1.36 +5 -5 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 11 Jan 2007 17:46:38 -0000 1.26
+++ openpkg-src/urpmi/urpmi.patch 20 Jan 2007 08:46:18 -0000 1.27
@@ -1,7 +1,7 @@
-Index: URPM-1.55/Makefile.PL
---- URPM-1.55/Makefile.PL.orig 2006-11-03 16:03:35 +0100
-+++ URPM-1.55/Makefile.PL 2006-11-25 20:25:08 +0100
-@@ -3,46 +3,15 @@
+Index: URPM-1.56/Makefile.PL
+--- URPM-1.56/Makefile.PL.orig 2007-01-15 08:40:29 +0100
++++ URPM-1.56/Makefile.PL 2007-01-20 09:43:37 +0100
+@@ -3,53 +3,20 @@
# where to find the rpm utility
@@ -25,10 +25,6 @@
- or die "Unable to build URPM with too old (or undetected) rpm version
$version\n";
-print "Found RPM version $version\n";
-
--# directory where to build an rpm of this
--my $rpmtopdir = `$rpm_path --eval '%{_topdir}'`;
--chomp $rpmtopdir;
--
-# to generate the ChangeLog depending on the checkout layout
-my $commonusername = "../common/";
--d $commonusername or do {
@@ -43,15 +39,12 @@
sub MY::postamble {
<<"**MM**";
- .PHONY: ChangeLog rpmdist srpm rpm
+ .PHONY: ChangeLog
ChangeLog:
- LC_ALL=C svn2cl --accum --strip-prefix=soft/rpm/perl-URPM/trunk
--authors ${commonusername}username.xml
-+ LC_ALL=C svn2cl --accum --strip-prefix=soft/rpm/perl-URPM/trunk
--authors username.xml
++ LC_ALL=C svn2cl --accum --strip-prefix=soft/rpm/perl-URPM/trunk
--authors username.xml
rm -f *.bak
-
- rpmdist: dist
-@@ -57,13 +26,7 @@
**MM**
}
@@ -66,7 +59,7 @@
WriteMakefile(
NAME => 'URPM',
-@@ -72,8 +35,8 @@
+@@ -58,8 +25,8 @@
},
CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
@@ -77,20 +70,20 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-1.55/URPM.xs
---- URPM-1.55/URPM.xs.orig 2006-11-17 17:43:04 +0100
-+++ URPM-1.55/URPM.xs 2006-11-25 20:25:08 +0100
-@@ -22,6 +22,7 @@
- #include <fcntl.h>
+Index: URPM-1.56/URPM.xs
+--- URPM-1.56/URPM.xs.orig 2007-01-19 09:39:36 +0100
++++ URPM-1.56/URPM.xs 2007-01-20 09:43:56 +0100
+@@ -23,6 +23,7 @@
#include <unistd.h>
#include <zlib.h>
+ #include <libintl.h>
+#include <glob.h>
#undef Fflush
#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-25 20:25:08 +0100
++++ rpmtools-5.1.0/Makefile.PL 2007-01-20 09:41:56 +0100
@@ -45,8 +45,8 @@
RPMTOOLSVERSION => $rpmtools_version,
FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -113,7 +106,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-25 20:25:08 +0100
++++ rpmtools-5.1.0/parsehdlist.c 2007-01-20 09:41:56 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <signal.h>
@@ -124,7 +117,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-25 20:25:08 +0100
++++ rpmtools-5.1.0/rpm2header.c 2007-01-20 09:41:56 +0100
@@ -5,7 +5,8 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -135,9 +128,9 @@
#include <rpm/rpmts.h>
#define FILENAME_TAG 1000000
-Index: urpmi-4.9.12/Makefile.PL
---- urpmi-4.9.12/Makefile.PL.orig 2006-11-17 18:51:28 +0100
-+++ urpmi-4.9.12/Makefile.PL 2006-11-25 20:25:08 +0100
+Index: urpmi-4.9.13/Makefile.PL
+--- urpmi-4.9.13/Makefile.PL.orig 2006-11-30 16:44:49 +0100
++++ urpmi-4.9.13/Makefile.PL 2007-01-20 09:41:56 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -161,7 +154,7 @@
installgurpmi2: pure_install
ln -s -f consolehelper \$(DESTINSTALLSCRIPT)/gurpmi2
-@@ -147,8 +148,8 @@
+@@ -155,8 +156,8 @@
INST_MAN5DIR => 'blib/man5',
INST_MAN8DIR => 'blib/man8',
# We could read those values from rpm macros.
@@ -172,9 +165,9 @@
},
EXE_FILES => [ @bin_scripts, @sbin_scripts ],
PMLIBDIRS => [ qw(urpm) ],
-Index: urpmi-4.9.12/urpm/sys.pm
---- urpmi-4.9.12/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
-+++ urpmi-4.9.12/urpm/sys.pm 2006-11-25 20:26:24 +0100
+Index: urpmi-4.9.13/urpm/sys.pm
+--- urpmi-4.9.13/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
++++ urpmi-4.9.13/urpm/sys.pm 2007-01-20 09:41:56 +0100
@@ -94,7 +94,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 11 Jan 2007 17:46:39 -0000 1.35
+++ openpkg-src/urpmi/urpmi.spec 20 Jan 2007 08:46:19 -0000 1.36
@@ -23,10 +23,10 @@
##
# package version
-%define V_urpmi 4.9.12
-%define V_urpmi_rpm 4.9.12-1mdv2007.1
-%define V_urpm 1.55
-%define V_urpm_rpm 1.55-1mdv2007.1
+%define V_urpmi 4.9.13
+%define V_urpmi_rpm 4.9.13-1mdv2007.1
+%define V_urpm 1.56
+%define V_urpm_rpm 1.56-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: 20070111
+Release: 20070120
# package options
%option with_wget no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
