Forráskód Böngészése

upgrading package: urpmi 4.10.14 -> 4.10.17

Ralf S. Engelschall 18 éve
szülő
commit
a9cebd273d
2 módosított fájl, 40 hozzáadás és 27 törlés
  1. 33 20
      urpmi/urpmi.patch
  2. 7 7
      urpmi/urpmi.spec

+ 33 - 20
urpmi/urpmi.patch

@@ -1,7 +1,7 @@
-Index: URPM-2.07/Makefile.PL
---- URPM-2.07/Makefile.PL.orig	2007-06-19 16:24:46 +0200
-+++ URPM-2.07/Makefile.PL	2007-06-22 19:56:56 +0200
-@@ -1,58 +1,7 @@
+Index: URPM-2.10/Makefile.PL
+--- URPM-2.10/Makefile.PL.orig	2007-11-09 09:42:36 +0100
++++ URPM-2.10/Makefile.PL	2007-12-10 21:37:43 +0100
+@@ -1,61 +1,7 @@
  use strict;
  use ExtUtils::MakeMaker;
  
@@ -57,11 +57,14 @@ Index: URPM-2.07/Makefile.PL
 -if ($version =~ /^4\.4/ && (split(/\./, $version))[2] >= 8) {
 -    $ccflags .= ' -DRPM_448';
 -}
+-if ($version =~ /^4\.5/ && (split(/\./, $version))[2] >= 0) {
+-   $ccflags .= ' -DRPM_CALLBACK_LONGLONG -DRPM_446 -DRPM_448 -DRPM_450';
+-}
 +my $ccflags = '-fno-strict-aliasing';
  
  WriteMakefile(
      NAME	=> 'URPM',
-@@ -61,8 +10,8 @@
+@@ -64,8 +10,8 @@
      },
      CCFLAGS	=> $ccflags,
      VERSION_FROM	=> 'URPM.pm',
@@ -72,9 +75,9 @@ Index: URPM-2.07/Makefile.PL
      dist	=> { COMPRESS => "bzip2", SUFFIX => ".bz2" },
      realclean	=> { FILES => "t/RPMS/noarch/*" },
  );
-Index: URPM-2.07/URPM.xs
---- URPM-2.07/URPM.xs.orig	2007-06-19 16:44:27 +0200
-+++ URPM-2.07/URPM.xs	2007-06-22 19:43:44 +0200
+Index: URPM-2.10/URPM.xs
+--- URPM-2.10/URPM.xs.orig	2007-11-09 09:44:12 +0100
++++ URPM-2.10/URPM.xs	2007-12-10 21:39:13 +0100
 @@ -22,7 +22,7 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -84,9 +87,19 @@ Index: URPM-2.07/URPM.xs
  
  #undef Fflush
  #undef Mkdir
+@@ -271,6 +271,9 @@
+ 
+ static int has_suggests;
+ int is_suggests(int_32 flags) { 
++#ifndef RPMSENSE_MISSINGOK
++#define RPMSENSE_MISSINGOK 0
++#endif
+   int is = flags & RPMSENSE_MISSINGOK;
+   if (is) has_suggests = is;
+   return is;
 Index: rpmtools-5.3.2/Makefile.PL
---- rpmtools-5.3.2/Makefile.PL.orig	2007-06-15 22:53:22 +0200
-+++ rpmtools-5.3.2/Makefile.PL	2007-06-22 19:43:44 +0200
+--- rpmtools-5.3.2/Makefile.PL.orig	2007-06-22 16:31:50 +0200
++++ rpmtools-5.3.2/Makefile.PL	2007-12-10 21:36:57 +0100
 @@ -35,8 +35,8 @@
          RPMTOOLSVERSION => $rpmtools_version,
          FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -108,8 +121,8 @@ Index: rpmtools-5.3.2/Makefile.PL
      LIBS	    => [ '' ],
      INSTALLDIRS	    => 'vendor',
 Index: rpmtools-5.3.2/parsehdlist.c
---- rpmtools-5.3.2/parsehdlist.c.orig	2007-06-15 09:24:49 +0200
-+++ rpmtools-5.3.2/parsehdlist.c	2007-06-22 19:43:44 +0200
+--- rpmtools-5.3.2/parsehdlist.c.orig	2007-06-22 13:46:09 +0200
++++ rpmtools-5.3.2/parsehdlist.c	2007-12-10 21:36:57 +0100
 @@ -7,6 +7,7 @@
  #include <unistd.h>
  #include <signal.h>
@@ -120,7 +133,7 @@ Index: rpmtools-5.3.2/parsehdlist.c
  #include <stdio.h>
 Index: rpmtools-5.3.2/rpm2header.c
 --- rpmtools-5.3.2/rpm2header.c.orig	2007-06-15 09:24:49 +0200
-+++ rpmtools-5.3.2/rpm2header.c	2007-06-22 19:43:44 +0200
++++ rpmtools-5.3.2/rpm2header.c	2007-12-10 21:36:57 +0100
 @@ -5,7 +5,8 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -131,9 +144,9 @@ Index: rpmtools-5.3.2/rpm2header.c
  #include <rpm/rpmts.h>
  
  #define FILENAME_TAG 1000000
-Index: urpmi-4.10.14/Makefile.PL
---- urpmi-4.10.14/Makefile.PL.orig	2007-04-24 21:34:36 +0200
-+++ urpmi-4.10.14/Makefile.PL	2007-06-22 19:43:44 +0200
+Index: urpmi-4.10.17/Makefile.PL
+--- urpmi-4.10.17/Makefile.PL.orig	2007-08-28 12:26:16 +0200
++++ urpmi-4.10.17/Makefile.PL	2007-12-10 21:36:57 +0100
 @@ -60,6 +60,7 @@
      my $po = $with_po ? ' installpo' : '';
      my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -168,10 +181,10 @@ Index: urpmi-4.10.14/Makefile.PL
      },
      EXE_FILES		=> [ @bin_scripts, @sbin_scripts ],
      PMLIBDIRS		=> [ qw(urpm) ],
-Index: urpmi-4.10.14/urpm/sys.pm
---- urpmi-4.10.14/urpm/sys.pm.orig	2007-04-24 21:22:25 +0200
-+++ urpmi-4.10.14/urpm/sys.pm	2007-06-22 19:43:44 +0200
-@@ -94,7 +94,7 @@
+Index: urpmi-4.10.17/urpm/sys.pm
+--- urpmi-4.10.17/urpm/sys.pm.orig	2007-10-02 14:01:03 +0200
++++ urpmi-4.10.17/urpm/sys.pm	2007-12-10 21:36:57 +0100
+@@ -114,7 +114,7 @@
  }
  
  sub proc_mounts() {

+ 7 - 7
urpmi/urpmi.spec

@@ -23,12 +23,12 @@
 ##
 
 #   package version
-%define       V_urpmi               4.10.14
-%define       V_urpmi_rpm           4.10.14-1mdv2008.0
-%define       V_urpm                2.07
-%define       V_urpm_rpm            2.07-1mdv2008.0
-%define       V_mdv_distribconf     3.10
-%define       V_mdv_distribconf_rpm 3.10-1mdv2008.0
+%define       V_urpmi               4.10.17
+%define       V_urpmi_rpm           4.10.17-1mdv2008.1
+%define       V_urpm                2.10
+%define       V_urpm_rpm            2.10-1mdv2008.1
+%define       V_mdv_distribconf     3.13
+%define       V_mdv_distribconf_rpm 3.13-1mdv2008.1
 %define       V_mdv_packdrakeng     1.13
 %define       V_mdv_packdrakeng_rpm 1.13-1mdv2008.0
 %define       V_rpmtools            5.3.2
@@ -45,7 +45,7 @@ Class:        EVAL
 Group:        Bootstrapping
 License:      GPL
 Version:      %{V_urpmi}
-Release:      20071005
+Release:      20071210
 
 #   package options
 %option       with_wget      no