浏览代码

RPM 5 does not support multiple patches to be applied with a single %patch macro

Ralf S. Engelschall 17 年之前
父节点
当前提交
00f65fffd3
共有 5 个文件被更改,包括 73 次插入11 次删除
  1. 40 2
      bash/bash.spec
  2. 3 2
      db/db.spec
  3. 4 2
      db45/db45.spec
  4. 13 2
      readline/readline.spec
  5. 13 3
      vile/vile.spec

+ 40 - 2
bash/bash.spec

@@ -38,7 +38,7 @@ Class:        CORE
 Group:        Shell
 License:      GPL
 Version:      %{V_base_real}.%{V_plvl_raw}
-Release:      20080430
+Release:      20080502
 
 #   list of sources
 Source0:      ftp://ftp.cwru.edu/pub/bash/bash-%{V_base_real}.tar.gz
@@ -115,7 +115,45 @@ AutoReqProv:  no
 %prep
     #   unpack and patch distribution
     %setup -q -n bash-%{V_base_real}
-    %patch -p0 -P 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39
+    %patch -p0 -P 1
+    %patch -p0 -P 2
+    %patch -p0 -P 3
+    %patch -p0 -P 4
+    %patch -p0 -P 5
+    %patch -p0 -P 6
+    %patch -p0 -P 7
+    %patch -p0 -P 8
+    %patch -p0 -P 9
+    %patch -p0 -P 10
+    %patch -p0 -P 11
+    %patch -p0 -P 12
+    %patch -p0 -P 13
+    %patch -p0 -P 14
+    %patch -p0 -P 15
+    %patch -p0 -P 16
+    %patch -p0 -P 17
+    %patch -p0 -P 18
+    %patch -p0 -P 19
+    %patch -p0 -P 20
+    %patch -p0 -P 21
+    %patch -p0 -P 22
+    %patch -p0 -P 23
+    %patch -p0 -P 24
+    %patch -p0 -P 25
+    %patch -p0 -P 26
+    %patch -p0 -P 27
+    %patch -p0 -P 28
+    %patch -p0 -P 29
+    %patch -p0 -P 30
+    %patch -p0 -P 31
+    %patch -p0 -P 32
+    %patch -p0 -P 33
+    %patch -p0 -P 34
+    %patch -p0 -P 35
+    %patch -p0 -P 36
+    %patch -p0 -P 37
+    %patch -p0 -P 38
+    %patch -p0 -P 39
     %patch -p0 -P 0
     sleep 1
     touch y.tab.[ch]

+ 3 - 2
db/db.spec

@@ -36,7 +36,7 @@ Class:        BASE
 Group:        Database
 License:      BSD
 Version:      %{V_version}.%{V_revision}
-Release:      20080405
+Release:      20080502
 
 #   package options
 %option       with_pthreads no
@@ -83,7 +83,8 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n db-%{V_version}
-    %patch -p0 -P 0 1
+    %patch -p0 -P 0
+    %patch -p0 -P 1
     %{l_shtool} subst \
         -e 's;\($(ar) cr .*\);\1 _udivdi3.o _muldi3.o _clz.o;' \
         -e 's;install_utilities install_docs;install_utilities;' \

+ 4 - 2
db45/db45.spec

@@ -36,7 +36,7 @@ Class:        EVAL
 Group:        Database
 License:      BSD
 Version:      %{V_version}.%{V_revision}
-Release:      20080101
+Release:      20080502
 
 #   list of sources
 Source0:      http://download-uk.oracle.com/berkeley-db/db-%{V_version}.tar.gz
@@ -76,7 +76,9 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n db-%{V_version}
-    %patch -p0 -P 0 1 2
+    %patch -p0 -P 0
+    %patch -p0 -P 1
+    %patch -p0 -P 2
     %{l_shtool} subst \
         -e 's;\($(ar) cr .*\);\1 _udivdi3.o _muldi3.o _clz.o;' \
         -e 's;install_utilities install_docs;install_utilities;' \

+ 13 - 2
readline/readline.spec

@@ -38,7 +38,7 @@ Class:        BASE
 Group:        Terminal
 License:      GPL
 Version:      %{V_base_real}.%{V_plvl_raw}
-Release:      20080101
+Release:      20080502
 
 #   list of sources
 Source0:      ftp://ftp.cwru.edu/pub/bash/readline-%{V_base_real}.tar.gz
@@ -81,7 +81,18 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n readline-%{V_base_real}
-    %patch -p0 -P 1 2 3 4 5 6 7 8 9 10 11 12
+    %patch -p0 -P 1
+    %patch -p0 -P 2
+    %patch -p0 -P 3
+    %patch -p0 -P 4
+    %patch -p0 -P 5
+    %patch -p0 -P 6
+    %patch -p0 -P 7
+    %patch -p0 -P 8
+    %patch -p0 -P 9
+    %patch -p0 -P 10
+    %patch -p0 -P 11
+    %patch -p0 -P 12
 
 %build
     #   configure package

+ 13 - 3
vile/vile.spec

@@ -48,7 +48,7 @@ Class:        PLUS
 Group:        Editor
 License:      GPL
 Version:      %{V_base}%{V_patchL}
-Release:      20080427
+Release:      20080502
 
 #   package options
 %option       with_x11   no
@@ -102,9 +102,19 @@ AutoReqProv:  no
 
 %prep
     %setup -q -n vile-%{V_base}
-    %patch -p1 -P 1 2 3 4 5 6 7 8 9 10 11 12
+    %patch -p1 -P 1
+    %patch -p1 -P 2
+    %patch -p1 -P 3
+    %patch -p1 -P 4
+    %patch -p1 -P 5
+    %patch -p1 -P 6
+    %patch -p1 -P 7
+    %patch -p1 -P 8
+    %patch -p1 -P 9
+    %patch -p1 -P 10
+    %patch -p1 -P 11
+    %patch -p1 -P 12
     %patch -p0 -P 0
-    exit 0
     chmod u+w filters/sql-filt.l*
     %{l_shtool} subst \
         -e 's;= LEAD;= 0;' \