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: 12-Jun-2006 21:22:15
Branch: HEAD Handle: 2006061220221500
Modified files:
openpkg-src/urpmi urpmi.patch urpmi.spec
Log:
modifying package: urpmi-4.8.18 20060605 -> 20060612
Summary:
Revision Changes Path
1.9 +31 -9 openpkg-src/urpmi/urpmi.patch
1.15 +2 -2 openpkg-src/urpmi/urpmi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 urpmi.patch
--- openpkg-src/urpmi/urpmi.patch 5 Jun 2006 07:42:24 -0000 1.8
+++ openpkg-src/urpmi/urpmi.patch 12 Jun 2006 19:22:15 -0000 1.9
@@ -1,7 +1,7 @@
-Index: URPM-1.43/Makefile.PL
---- URPM-1.43/Makefile.PL.orig 2006-03-13 17:53:51 +0100
-+++ URPM-1.43/Makefile.PL 2006-03-15 22:07:24 +0100
-@@ -3,28 +3,8 @@
+Index: URPM-1.44/Makefile.PL
+--- URPM-1.44/Makefile.PL.orig 2006-06-12 12:20:55 +0200
++++ URPM-1.44/Makefile.PL 2006-06-12 21:21:37 +0200
+@@ -3,46 +3,15 @@
# where to find the rpm utility
@@ -19,6 +19,7 @@
-defined $rpm_path or die "Can't find rpm on this system\n";
-
-my $version = `LC_ALL=C $rpm_path --version`;
+-chomp $version;
-$version =~ s/RPM version //;
-$version =~ /^(?:4\.[2-9]|[5-9]|\d{2})/
- or die "Unable to build URPM with too old (or undetected) rpm version
$version\n";
@@ -27,12 +28,30 @@
-# 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 {
+- $commonusername = "../../common/";
+- -d $commonusername or do {
+- $commonusername = "../../../common/";
+- -d $commonusername or $commonusername = "";
+- };
+-};
+my $rpm_path = "";
+my $rpmtopdir = "";
sub MY::postamble {
<<"**MM**";
-@@ -46,10 +26,7 @@
+ .PHONY: ChangeLog rpmdist srpm rpm
+
+ 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
+
+ rpmdist: dist
+@@ -57,13 +26,7 @@
**MM**
}
@@ -40,11 +59,14 @@
-if ($version =~ /^4\.(4\.[5-9]$|4\.\d\d|[5-9]\.|\d\d)/) {
- $ccflags .= ' -DRPM_CALLBACK_LONGLONG';
-}
+-if ($version eq '4.4.6') {
+- $ccflags .= ' -DRPM_446';
+-}
+my $ccflags = '-fno-strict-aliasing';
WriteMakefile(
NAME => 'URPM',
-@@ -58,8 +35,8 @@
+@@ -72,8 +35,8 @@
},
CCFLAGS => $ccflags,
VERSION_FROM => 'URPM.pm',
@@ -55,9 +77,9 @@
dist => { COMPRESS => "bzip2", SUFFIX => ".bz2" },
realclean => { FILES => "t/RPMS/noarch/*" },
);
-Index: URPM-1.43/URPM.xs
---- URPM-1.43/URPM.xs.orig 2006-03-13 17:37:43 +0100
-+++ URPM-1.43/URPM.xs 2006-03-15 22:07:16 +0100
+Index: URPM-1.44/URPM.xs
+--- URPM-1.44/URPM.xs.orig 2006-06-12 12:42:25 +0200
++++ URPM-1.44/URPM.xs 2006-06-12 21:21:21 +0200
@@ -22,6 +22,7 @@
#include <fcntl.h>
#include <unistd.h>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/urpmi/urpmi.spec
============================================================================
$ cvs diff -u -r1.14 -r1.15 urpmi.spec
--- openpkg-src/urpmi/urpmi.spec 5 Jun 2006 07:42:25 -0000 1.14
+++ openpkg-src/urpmi/urpmi.spec 12 Jun 2006 19:22:15 -0000 1.15
@@ -26,7 +26,7 @@
# package version
%define V_urpmi 4.8.18
-%define V_urpm 1.43
+%define V_urpm 1.44
%define V_mdv_packdrakeng 1.01
%define V_mdv_distribconf 1.01
@@ -41,7 +41,7 @@
Group: Bootstrapping
License: GPL
Version: %{V_urpmi}
-Release: 20060605
+Release: 20060612
# 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 openpkg-cvs@openpkg.org
