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: 02-Mar-2007 07:57:57
Branch: HEAD Handle: 2007030206575700
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
modifying package: urpmi-4.9.15 20070227 -> 20070302
Summary:
Revision Changes Path
1.34 +29 -30 openpkg-src/urpmi/urpmi.patch
1.44 +3 -3 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.33 -r1.34 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 27 Feb 2007 18:31:07 -0000 1.33
+++ openpkg-src/urpmi/urpmi.patch 2 Mar 2007 06:57:57 -0000 1.34
@@ -1,10 +1,12 @@
-Index: URPM-1.58/Makefile.PL
---- URPM-1.58/Makefile.PL.orig 2007-01-15 08:40:29 +0100
-+++ URPM-1.58/Makefile.PL 2007-02-11 19:57:23 +0100
-@@ -3,53 +3,20 @@
-
- # where to find the rpm utility
+Index: URPM-1.59/Makefile.PL
+--- URPM-1.59/Makefile.PL.orig 2007-03-01 18:42:53 +0100
++++ URPM-1.59/Makefile.PL 2007-03-02 07:56:34 +0100
+@@ -1,55 +1,7 @@
+ use strict;
+ use ExtUtils::MakeMaker;
+-# where to find the rpm utility
+-
-my $rpm_path = $ENV{RPM_PATH}; # this overrides
-
-unless (defined $rpm_path) {
@@ -34,32 +36,29 @@
- -d $commonusername or $commonusername = "";
- };
-};
-+my $rpm_path = "";
-+my $rpmtopdir = "";
-
- sub MY::postamble {
- <<"**MM**";
- .PHONY: ChangeLog
-
- ChangeLog:
+-
+-sub MY::postamble {
+- <<"**MM**";
+-.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
- rm -f *.bak
- **MM**
- }
-
+- rm -f *.bak
+-**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 eq '4.4.6') {
+-if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 6) {
- $ccflags .= ' -DRPM_446';
-}
+my $ccflags = '-fno-strict-aliasing';
WriteMakefile(
NAME => 'URPM',
-@@ -58,8 +25,8 @@
+@@ -58,8 +10,8 @@
},
CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
@@ -70,9 +69,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-1.58/URPM.xs
---- URPM-1.58/URPM.xs.orig 2007-01-19 09:39:36 +0100
-+++ URPM-1.58/URPM.xs 2007-02-11 19:57:31 +0100
+Index: URPM-1.59/URPM.xs
+--- URPM-1.59/URPM.xs.orig 2007-03-01 17:17:05 +0100
++++ URPM-1.59/URPM.xs 2007-03-02 07:51:55 +0100
@@ -22,7 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ -84,7 +83,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 2007-02-11 19:57:23 +0100
++++ rpmtools-5.1.0/Makefile.PL 2007-03-02 07:51:55 +0100
@@ -45,8 +45,8 @@
RPMTOOLSVERSION => $rpmtools_version,
FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -107,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 2007-02-11 19:57:23 +0100
++++ rpmtools-5.1.0/parsehdlist.c 2007-03-02 07:51:55 +0100
@@ -7,6 +7,7 @@
#include <unistd.h>
#include <signal.h>
@@ -118,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 2007-02-11 19:57:23 +0100
++++ rpmtools-5.1.0/rpm2header.c 2007-03-02 07:51:55 +0100
@@ -5,7 +5,8 @@
#include <sys/stat.h>
#include <fcntl.h>
@@ -131,7 +130,7 @@
#define FILENAME_TAG 1000000
Index: urpmi-4.9.15/Makefile.PL
--- urpmi-4.9.15/Makefile.PL.orig 2006-11-30 16:44:49 +0100
-+++ urpmi-4.9.15/Makefile.PL 2007-02-11 19:57:23 +0100
++++ urpmi-4.9.15/Makefile.PL 2007-03-02 07:51:55 +0100
@@ -60,6 +60,7 @@
my $po = $with_po ? ' installpo' : '';
my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -167,8 +166,8 @@
EXE_FILES => [ @bin_scripts, @sbin_scripts ],
PMLIBDIRS => [ qw(urpm) ],
Index: urpmi-4.9.15/urpm/sys.pm
---- urpmi-4.9.15/urpm/sys.pm.orig 2006-11-23 11:51:16 +0100
-+++ urpmi-4.9.15/urpm/sys.pm 2007-02-11 19:57:23 +0100
+--- urpmi-4.9.15/urpm/sys.pm.orig 2007-02-01 09:37:41 +0100
++++ urpmi-4.9.15/urpm/sys.pm 2007-03-02 07:51:55 +0100
@@ -94,7 +94,7 @@
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 27 Feb 2007 18:31:07 -0000 1.43
+++ openpkg-src/urpmi/urpmi.spec 2 Mar 2007 06:57:57 -0000 1.44
@@ -25,8 +25,8 @@
# package version
%define V_urpmi 4.9.15
%define V_urpmi_rpm 4.9.15-2mdv2007.1
-%define V_urpm 1.58
-%define V_urpm_rpm 1.58-1mdv2007.1
+%define V_urpm 1.59
+%define V_urpm_rpm 1.59-1mdv2007.1
%define V_mdv_distribconf 3.07
%define V_mdv_distribconf_rpm 3.07-1mdv2007.1
%define V_mdv_packdrakeng 1.01
@@ -45,7 +45,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20070227
+Release: 20070302
# package options
%option with_wget no
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
