Browse Source

modifying package: urpmi-4.10.19 20071213 -> 20071217

Ralf S. Engelschall 18 years ago
parent
commit
6626b7f6a6
2 changed files with 21 additions and 20 deletions
  1. 18 17
      urpmi/urpmi.patch
  2. 3 3
      urpmi/urpmi.spec

+ 18 - 17
urpmi/urpmi.patch

@@ -1,6 +1,6 @@
-Index: URPM-3.01/Makefile.PL
---- URPM-3.01/Makefile.PL.orig	2007-12-10 12:15:00 +0100
-+++ URPM-3.01/Makefile.PL	2007-12-11 19:39:03 +0100
+Index: URPM-3.03/Makefile.PL
+--- URPM-3.03/Makefile.PL.orig	2007-12-10 12:15:00 +0100
++++ URPM-3.03/Makefile.PL	2007-12-17 10:57:01 +0100
 @@ -1,69 +1,7 @@
  use strict;
  use ExtUtils::MakeMaker;
@@ -83,9 +83,9 @@ Index: URPM-3.01/Makefile.PL
      dist	=> { COMPRESS => "bzip2", SUFFIX => ".bz2" },
      realclean	=> { FILES => "t/RPMS/noarch/*" },
  );
-Index: URPM-3.01/URPM.xs
---- URPM-3.01/URPM.xs.orig	2007-12-11 11:01:06 +0100
-+++ URPM-3.01/URPM.xs	2007-12-11 19:38:21 +0100
+Index: URPM-3.03/URPM.xs
+--- URPM-3.03/URPM.xs.orig	2007-12-14 15:50:31 +0100
++++ URPM-3.03/URPM.xs	2007-12-17 10:57:41 +0100
 @@ -22,7 +22,7 @@
  #include <fcntl.h>
  #include <unistd.h>
@@ -95,19 +95,20 @@ Index: URPM-3.01/URPM.xs
  
  #undef Fflush
  #undef Mkdir
-@@ -297,6 +297,9 @@
+@@ -65,6 +65,10 @@
+ #include <rpm/rpmbuild.h>
+ #include <rpm/rpmlog.h>
  
- 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;
++
+ struct s_Package {
+   char *info;
+   char *requires;
 Index: rpmtools-5.3.2/Makefile.PL
 --- rpmtools-5.3.2/Makefile.PL.orig	2007-06-22 16:31:50 +0200
-+++ rpmtools-5.3.2/Makefile.PL	2007-12-11 19:38:21 +0100
++++ rpmtools-5.3.2/Makefile.PL	2007-12-17 10:57:01 +0100
 @@ -35,8 +35,8 @@
          RPMTOOLSVERSION => $rpmtools_version,
          FROMC => 'parsehdlist rpm2header #rpm-find-leaves',
@@ -130,7 +131,7 @@ Index: rpmtools-5.3.2/Makefile.PL
      INSTALLDIRS	    => 'vendor',
 Index: rpmtools-5.3.2/parsehdlist.c
 --- rpmtools-5.3.2/parsehdlist.c.orig	2007-06-22 13:46:09 +0200
-+++ rpmtools-5.3.2/parsehdlist.c	2007-12-11 19:38:21 +0100
++++ rpmtools-5.3.2/parsehdlist.c	2007-12-17 10:57:01 +0100
 @@ -7,6 +7,7 @@
  #include <unistd.h>
  #include <signal.h>
@@ -141,7 +142,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-12-11 19:38:21 +0100
++++ rpmtools-5.3.2/rpm2header.c	2007-12-17 10:57:01 +0100
 @@ -5,7 +5,8 @@
  #include <sys/stat.h>
  #include <fcntl.h>
@@ -154,7 +155,7 @@ Index: rpmtools-5.3.2/rpm2header.c
  #define FILENAME_TAG 1000000
 Index: urpmi-4.10.19/Makefile.PL
 --- urpmi-4.10.19/Makefile.PL.orig	2007-12-04 14:50:05 +0100
-+++ urpmi-4.10.19/Makefile.PL	2007-12-11 19:38:21 +0100
++++ urpmi-4.10.19/Makefile.PL	2007-12-17 10:57:01 +0100
 @@ -60,6 +60,7 @@
      my $po = $with_po ? ' installpo' : '';
      my $gui = $with_gui ? ' installgurpmi2' : '';
@@ -191,7 +192,7 @@ Index: urpmi-4.10.19/Makefile.PL
      PMLIBDIRS		=> [ qw(urpm) ],
 Index: urpmi-4.10.19/urpm/sys.pm
 --- urpmi-4.10.19/urpm/sys.pm.orig	2007-10-02 14:01:03 +0200
-+++ urpmi-4.10.19/urpm/sys.pm	2007-12-11 19:38:21 +0100
++++ urpmi-4.10.19/urpm/sys.pm	2007-12-17 10:57:01 +0100
 @@ -114,7 +114,7 @@
  }
  

+ 3 - 3
urpmi/urpmi.spec

@@ -25,8 +25,8 @@
 #   package version
 %define       V_urpmi               4.10.19
 %define       V_urpmi_rpm           4.10.19-1mdv2008.1
-%define       V_urpm                3.01
-%define       V_urpm_rpm            3.01-1mdv2008.1
+%define       V_urpm                3.03
+%define       V_urpm_rpm            3.03-1mdv2008.1
 %define       V_mdv_distribconf     3.13
 %define       V_mdv_distribconf_rpm 3.13-1mdv2008.1
 %define       V_mdv_packdrakeng     1.13
@@ -45,7 +45,7 @@ Class:        EVAL
 Group:        Bootstrapping
 License:      GPL
 Version:      %{V_urpmi}
-Release:      20071213
+Release:      20071217
 
 #   package options
 %option       with_wget      no