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: 15-Mar-2006 22:16:12
Branch: HEAD Handle: 2006031521161100
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
modifying package: urpmi-4.8.13 20060312 -> 20060315
Summary:
Revision Changes Path
1.5 +20 -11 openpkg-src/urpmi/urpmi.patch
1.7 +2 -2 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.4 -r1.5 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 8 Mar 2006 20:11:54 -0000 1.4
+++ openpkg-src/urpmi/urpmi.patch 15 Mar 2006 21:16:11 -0000 1.5
@@ -1,6 +1,6 @@
-Index: URPM-1.39/Makefile.PL
---- URPM-1.39/Makefile.PL.orig 2006-03-07 11:29:12 +0100
-+++ URPM-1.39/Makefile.PL 2006-03-08 21:09:58 +0100
+Index: URPM-1.40/Makefile.PL
+--- URPM-1.40/Makefile.PL.orig 2006-03-13 17:53:51 +0100
++++ URPM-1.40/Makefile.PL 2006-03-15 22:07:24 +0100
@@ -3,28 +3,8 @@
# where to find the rpm utility
@@ -32,12 +32,21 @@
sub MY::postamble {
<<"**MM**";
-@@ -51,10 +31,10 @@
- PREREQ_PM => {
- 'MDV::Packdrakeng' => '1.00',
+@@ -46,10 +26,7 @@
+ **MM**
+ }
+
+-my $ccflags = '-Wall -fno-strict-aliasing';
+-if ($version =~ /^4\.(4\.[5-9]$|4\.\d\d|[5-9]\.|\d\d)/) {
+- $ccflags .= ' -DRPM_CALLBACK_LONGLONG';
+-}
++my $ccflags = '-fno-strict-aliasing';
+
+ WriteMakefile(
+ NAME => 'URPM',
+@@ -58,8 +35,8 @@
},
-- CCFLAGS => '-Wall -fno-strict-aliasing',
-+ CCFLAGS => '-fno-strict-aliasing',
+ CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
- LIBS => [ '-lrpm -lrpmio -lrpmdb -lrpmbuild -lpopt -lz' ],
- INC => '-I/usr/include/rpm',
@@ -46,9 +55,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-1.39/URPM.xs
---- URPM-1.39/URPM.xs.orig 2006-03-07 11:21:12 +0100
-+++ URPM-1.39/URPM.xs 2006-03-08 20:52:29 +0100
+Index: URPM-1.40/URPM.xs
+--- URPM-1.40/URPM.xs.orig 2006-03-13 17:37:43 +0100
++++ URPM-1.40/URPM.xs 2006-03-15 22:07:16 +0100
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.6 -r1.7 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 12 Mar 2006 08:57:42 -0000 1.6
+++ openpkg-src/urpmi/urpmi.spec 15 Mar 2006 21:16:11 -0000 1.7
@@ -26,7 +26,7 @@
# package version
%define V_urpmi 4.8.13
-%define V_urpm 1.39
+%define V_urpm 1.40
%define V_mdv_packdrakeng 1.01
%define V_mdv_distribconf 1.01
@@ -41,7 +41,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20060312
+Release: 20060315
# list of sources
Source0:
http://www.cpan.org/authors/id/R/RG/RGARCIA/urpmi-%{V_urpmi}.tar.gz
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
