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: 22-Jun-2007 19:58:47 Branch: HEAD Handle: 2007062218584600 Modified files: openpkg-src/urpmi urpmi.patch urpmi.spec Log: modifying package: urpmi-4.9.27 20070619 -> 20070622 Summary: Revision Changes Path 1.49 +23 -20 openpkg-src/urpmi/urpmi.patch 1.67 +3 -3 openpkg-src/urpmi/urpmi.spec ____________________________________________________________________________ patch -p0 <<'@@ .' Index: openpkg-src/urpmi/urpmi.patch ============================================================================ $ cvs diff -u -r1.48 -r1.49 urpmi.patch --- openpkg-src/urpmi/urpmi.patch 19 Jun 2007 16:03:46 -0000 1.48 +++ openpkg-src/urpmi/urpmi.patch 22 Jun 2007 17:58:46 -0000 1.49 @@ -1,7 +1,7 @@ -Index: URPM-1.64/Makefile.PL ---- URPM-1.64/Makefile.PL.orig 2007-03-01 18:42:53 +0100 -+++ URPM-1.64/Makefile.PL 2007-03-02 07:56:34 +0100 -@@ -1,55 +1,7 @@ +Index: URPM-1.65/Makefile.PL +--- URPM-1.65/Makefile.PL.orig 2007-06-19 16:24:46 +0200 ++++ URPM-1.65/Makefile.PL 2007-06-22 19:56:56 +0200 +@@ -1,58 +1,7 @@ use strict; use ExtUtils::MakeMaker; @@ -54,11 +54,14 @@ -if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 6) { - $ccflags .= ' -DRPM_446'; -} +-if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 8) { +- $ccflags .= ' -DRPM_448'; +-} +my $ccflags = '-fno-strict-aliasing'; WriteMakefile( NAME => 'URPM', -@@ -58,8 +10,8 @@ +@@ -61,8 +10,8 @@ }, CCFLAGS => $ccflags, VERSION_FROM => 'URPM.pm', @@ -69,9 +72,9 @@ dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" }, realclean => { FILES => "t/RPMS/noarch/*" }, ); -Index: URPM-1.64/URPM.xs ---- URPM-1.64/URPM.xs.orig 2007-03-01 17:17:05 +0100 -+++ URPM-1.64/URPM.xs 2007-03-02 07:51:55 +0100 +Index: URPM-1.65/URPM.xs +--- URPM-1.65/URPM.xs.orig 2007-06-19 16:44:27 +0200 ++++ URPM-1.65/URPM.xs 2007-06-22 19:43:44 +0200 @@ -22,7 +22,7 @@ #include <fcntl.h> #include <unistd.h> @@ -82,9 +85,9 @@ #undef Fflush #undef Mkdir Index: rpmtools-5.2.1/Makefile.PL ---- rpmtools-5.2.1/Makefile.PL.orig 2006-08-22 15:46:50 +0200 -+++ rpmtools-5.2.1/Makefile.PL 2007-03-02 07:51:55 +0100 -@@ -45,8 +45,8 @@ +--- rpmtools-5.2.1/Makefile.PL.orig 2007-06-15 22:53:22 +0200 ++++ rpmtools-5.2.1/Makefile.PL 2007-06-22 19:43:44 +0200 +@@ -35,8 +35,8 @@ RPMTOOLSVERSION => $rpmtools_version, FROMC => 'parsehdlist rpm2header #rpm-find-leaves', FROMCC => '#gendepslist2 hdlist2names hdlist2files hdlist2prereq hdlist2groups', @@ -95,7 +98,7 @@ }, depend => { clean_subdirs => 'cleanc', -@@ -63,7 +63,7 @@ +@@ -49,7 +49,7 @@ C => [], OBJECT => '', CCFLAGS => '-Wall', @@ -105,8 +108,8 @@ LIBS => [ '' ], INSTALLDIRS => 'vendor', Index: rpmtools-5.2.1/parsehdlist.c ---- rpmtools-5.2.1/parsehdlist.c.orig 2006-06-13 13:19:09 +0200 -+++ rpmtools-5.2.1/parsehdlist.c 2007-03-02 07:51:55 +0100 +--- rpmtools-5.2.1/parsehdlist.c.orig 2007-06-15 09:24:49 +0200 ++++ rpmtools-5.2.1/parsehdlist.c 2007-06-22 19:43:44 +0200 @@ -7,6 +7,7 @@ #include <unistd.h> #include <signal.h> @@ -116,8 +119,8 @@ #include <rpm/header.h> #include <stdio.h> Index: rpmtools-5.2.1/rpm2header.c ---- rpmtools-5.2.1/rpm2header.c.orig 2006-06-12 11:10:34 +0200 -+++ rpmtools-5.2.1/rpm2header.c 2007-03-02 07:51:55 +0100 +--- rpmtools-5.2.1/rpm2header.c.orig 2007-06-15 09:24:49 +0200 ++++ rpmtools-5.2.1/rpm2header.c 2007-06-22 19:43:44 +0200 @@ -5,7 +5,8 @@ #include <sys/stat.h> #include <fcntl.h> @@ -129,8 +132,8 @@ #define FILENAME_TAG 1000000 Index: urpmi-4.9.27/Makefile.PL ---- urpmi-4.9.27/Makefile.PL.orig 2006-11-30 16:44:49 +0100 -+++ urpmi-4.9.27/Makefile.PL 2007-03-02 07:51:55 +0100 +--- urpmi-4.9.27/Makefile.PL.orig 2007-04-24 21:34:36 +0200 ++++ urpmi-4.9.27/Makefile.PL 2007-06-22 19:43:44 +0200 @@ -60,6 +60,7 @@ my $po = $with_po ? ' installpo' : ''; my $gui = $with_gui ? ' installgurpmi2' : ''; @@ -166,8 +169,8 @@ EXE_FILES => [ @bin_scripts, @sbin_scripts ], PMLIBDIRS => [ qw(urpm) ], Index: urpmi-4.9.27/urpm/sys.pm ---- urpmi-4.9.27/urpm/sys.pm.orig 2007-02-01 09:37:41 +0100 -+++ urpmi-4.9.27/urpm/sys.pm 2007-03-02 07:51:55 +0100 +--- urpmi-4.9.27/urpm/sys.pm.orig 2007-04-24 21:22:25 +0200 ++++ urpmi-4.9.27/urpm/sys.pm 2007-06-22 19:43:44 +0200 @@ -94,7 +94,7 @@ } @@ . patch -p0 <<'@@ .' Index: openpkg-src/urpmi/urpmi.spec ============================================================================ $ cvs diff -u -r1.66 -r1.67 urpmi.spec --- openpkg-src/urpmi/urpmi.spec 19 Jun 2007 16:03:46 -0000 1.66 +++ openpkg-src/urpmi/urpmi.spec 22 Jun 2007 17:58:46 -0000 1.67 @@ -25,8 +25,8 @@ # package version %define V_urpmi 4.9.27 %define V_urpmi_rpm 4.9.27-1mdv2008.0 -%define V_urpm 1.64 -%define V_urpm_rpm 1.64-1mdv2008.0 +%define V_urpm 1.65 +%define V_urpm_rpm 1.65-1mdv2008.0 %define V_mdv_distribconf 3.07 %define V_mdv_distribconf_rpm 3.07-1mdv2007.1 %define V_mdv_packdrakeng 1.12 @@ -45,7 +45,7 @@ Group: Bootstrapping License: GPL Version: %{V_urpmi} -Release: 20070619 +Release: 20070622 # package options %option with_wget no @@ . ______________________________________________________________________ OpenPKG http://openpkg.org CVS Repository Commit List openpkg-cvs@openpkg.org