Author: glen Date: Fri Dec 22 19:36:55 2006 GMT Module: SPECS Tag: AC-branch ---- Log message: - use new patchset macros for patch series
---- Files affected:
SPECS:
vim.spec (1.357.2.9.2.3.2.8 -> 1.357.2.9.2.3.2.9)
---- Diffs:
================================================================
Index: SPECS/vim.spec
diff -u SPECS/vim.spec:1.357.2.9.2.3.2.8 SPECS/vim.spec:1.357.2.9.2.3.2.9
--- SPECS/vim.spec:1.357.2.9.2.3.2.8 Fri Dec 22 19:34:01 2006
+++ SPECS/vim.spec Fri Dec 22 20:36:50 2006
@@ -92,176 +92,45 @@
Patch106: %{name}-fstab-uuid.patch
Patch107: %{name}-autopaste.patch
Patch108: %{name}-ft-cron.patch
-Patch201: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.001
-Patch202: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.002
-Patch203: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.003
-Patch204: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.004
-# patch for -extra
+# Official patches 10000-...
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 1 4
+# 5: patch for -extra
#Patch205: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.005
-Patch206: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.006
-Patch207: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.007
-Patch208: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.008
-Patch209: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.009
-Patch210: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.010
-Patch211: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.011
-Patch212: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.012
-Patch213: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.013
-Patch214: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.014
-Patch215: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.015
-Patch216: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.016
-Patch217: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.017
-Patch218: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.018
-Patch219: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.019
-Patch220: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.020
-Patch221: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.021
-Patch222: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.022
-Patch223: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.023
-Patch224: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.024
-Patch225: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.025
-Patch226: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.026
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 6 26
# patches for -extra
#Patch227: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.027
#Patch228: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.028
-Patch229: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.029
-Patch230: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.030
-Patch231: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.031
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 29
31
# patch for -extra
#Patch232: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.032
-Patch233: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.033
-Patch234: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.034
-Patch235: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.035
-Patch236: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.036
-Patch237: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.037
-Patch238: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.038
-Patch239: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.039
-Patch240: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.040
-Patch241: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.041
-Patch242: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.042
-Patch243: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.043
-Patch244: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.044
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 33
44
# patch for -extra
#Patch245: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.045
-Patch246: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.046
-Patch247: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.047
-Patch248: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.048
-Patch249: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.049
-Patch250: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.050
-Patch251: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.051
-Patch252: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.052
-Patch253: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.053
-Patch254: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.054
-Patch255: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.055
-Patch256: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.056
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 46
56
# patch for -extra
#Patch257: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.057
-Patch258: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.058
-Patch259: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.059
-Patch260: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.060
-Patch261: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.061
-Patch262: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.062
-Patch263: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.063
-Patch264: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.064
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 58
64
# patch for -extra
#Patch265: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.065
-Patch266: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.066
-Patch267: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.067
-Patch268: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.068
-Patch269: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.069
-Patch270: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.070
-Patch271: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.071
-Patch272: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.072
-Patch273: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.073
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 66
73
# patch for -extra
#Patch274: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.074
-Patch275: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.075
-Patch276: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.076
-Patch277: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.077
-Patch278: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.078
-Patch279: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.079
-Patch280: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.080
-Patch281: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.081
-Patch282: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.082
-Patch283: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.083
-Patch284: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.084
-Patch285: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.085
-Patch286: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.086
-Patch287: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.087
-Patch288: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.088
-Patch289: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.089
-Patch290: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.090
-Patch291: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.091
-Patch292: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.092
-Patch293: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.093
-Patch294: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.094
-Patch295: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.095
-Patch296: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.096
-Patch297: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.097
-Patch298: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.098
-Patch299: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.099
-Patch300: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.100
-Patch301: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.101
-Patch302: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.102
-Patch303: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.103
-Patch304: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.104
-Patch305: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.105
-Patch306: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.106
-Patch307: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.107
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 75
107
# patch for -extra
#Patch308: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.108
-Patch309: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.109
-Patch310: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.110
-Patch311: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.111
-Patch312: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.112
-Patch313: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.113
-Patch314: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.114
-Patch315: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.115
-Patch316: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.116
-Patch317: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.117
-Patch318: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.118
-Patch319: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.119
-Patch320: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.120
-Patch321: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.121
-Patch322: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.122
-Patch323: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.123
-Patch324: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.124
-Patch325: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.125
-Patch326: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.126
-Patch327: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.127
-Patch328: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.128
-Patch329: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.129
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 109
129
# patch for -extra
#Patch330: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.130
-Patch331: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.131
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 131
131
# patch for -extra
#Patch332: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.132
-Patch333: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.133
-Patch334: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.134
-Patch335: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.135
-Patch336: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.136
-Patch337: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.137
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 133
137
# patch for -extra
#Patch338: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.138
-Patch339: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.139
-Patch340: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.140
-Patch341: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.141
-Patch342: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.142
-Patch343: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.143
-Patch344: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.144
-Patch345: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.145
-Patch346: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.146
-Patch347: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.147
-Patch348: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.148
-Patch349: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.149
-Patch350: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.150
-Patch351: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.151
-Patch352: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.152
-Patch353: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.153
-Patch354: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.154
-Patch355: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.155
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 139
155
# patch for -extra
#Patch356: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.156
-Patch357: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.157
-Patch358: ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.158
+%patchset_source -f ftp://ftp.vim.org/pub/editors/vim/patches/7.0/7.0.%03g 157
158
URL: http://www.vim.org/
%{?with_athena:BuildRequires: XFree86-devel}
BuildRequires: acl-devel
@@ -284,7 +153,7 @@
BuildRequires: libgnomeui-devel >= 2.2.0.1
BuildRequires: nautilus-devel >= 2.2.0
%endif
-BuildRequires: rpmbuild(macros) >= 1.311
+BuildRequires: rpmbuild(macros) >= 1.351
%if %{with static}
BuildRequires: acl-static
BuildRequires: attr-static
@@ -698,177 +567,44 @@
%patch23 -p1
# official patches
-%patch201 -p0
-%patch202 -p0
-%patch203 -p0
-%patch204 -p0
+%patchset_patch 1 4
# patch for -extra
#%patch205 -p0
-%patch206 -p0
-%patch207 -p0
-%patch208 -p0
-%patch209 -p0
-%patch210 -p0
-%patch211 -p0
-%patch212 -p0
-%patch213 -p0
-%patch214 -p0
-%patch215 -p0
-%patch216 -p0
-%patch217 -p0
-%patch218 -p0
-%patch219 -p0
-%patch220 -p0
-%patch221 -p0
-%patch222 -p0
-%patch223 -p0
-%patch224 -p0
-%patch225 -p0
-%patch226 -p0
+%patchset_patch 6 26
# patches for -extra
#%patch227 -p0
#%patch228 -p0
-%patch229 -p0
-%patch230 -p0
-%patch231 -p0
+%patchset_patch 29 31
# patch for -extra
#%patch232 -p0
-%patch233 -p0
-%patch234 -p0
-%patch235 -p0
-%patch236 -p0
-%patch237 -p0
-%patch238 -p0
-%patch239 -p0
-%patch240 -p0
-%patch241 -p0
-%patch242 -p0
-%patch243 -p0
-%patch244 -p0
+%patchset_patch 33 44
# patch for -extra
#%patch245 -p0
-%patch246 -p0
-%patch247 -p0
-%patch248 -p0
-%patch249 -p0
-%patch250 -p0
-%patch251 -p0
-%patch252 -p0
-%patch253 -p0
-%patch254 -p0
-%patch255 -p0
-%patch256 -p0
+%patchset_patch 46 56
# patch for -extra
#%patch257 -p0
-%patch258 -p0
-%patch259 -p0
-%patch260 -p0
-%patch261 -p0
-%patch262 -p0
-%patch263 -p0
-%patch264 -p0
+%patchset_patch 58 64
# patch for -extra
#%patch265 -p0
-%patch266 -p0
-%patch267 -p0
-%patch268 -p0
-%patch269 -p0
-%patch270 -p0
-%patch271 -p0
-%patch272 -p0
-%patch273 -p0
+%patchset_patch 66 73
# patch for -extra
#%patch274 -p0
-%patch275 -p0
-%patch276 -p0
-%patch277 -p0
-%patch278 -p0
-%patch279 -p0
-%patch280 -p0
-%patch281 -p0
-%patch282 -p0
-%patch283 -p0
-%patch284 -p0
-%patch285 -p0
-%patch286 -p0
-%patch287 -p0
-%patch288 -p0
-%patch289 -p0
-%patch290 -p0
-%patch291 -p0
-%patch292 -p0
-%patch293 -p0
-%patch294 -p0
-%patch295 -p0
-%patch296 -p0
-%patch297 -p0
-%patch298 -p0
-%patch299 -p0
-%patch300 -p0
-%patch301 -p0
-%patch302 -p0
-%patch303 -p0
-%patch304 -p0
-%patch305 -p0
-%patch306 -p0
-%patch307 -p0
+%patchset_patch 75 107
# patch for -extra
#%patch308 -p0
-%patch309 -p0
-%patch310 -p0
-%patch311 -p0
-%patch312 -p0
-%patch313 -p0
-%patch314 -p0
-%patch315 -p0
-%patch316 -p0
-%patch317 -p0
-%patch318 -p0
-%patch319 -p0
-%patch320 -p0
-%patch321 -p0
-%patch322 -p0
-%patch323 -p0
-%patch324 -p0
-%patch325 -p0
-%patch326 -p0
-%patch327 -p0
-%patch328 -p0
-%patch329 -p0
+%patchset_patch 109 129
# patch for -extra
#%patch330 -p0
-%patch331 -p0
+%patchset_patch 131 131
# patch for -extra
#%patch332 -p0
-%patch333 -p0
-%patch334 -p0
-%patch335 -p0
-%patch336 -p0
-%patch337 -p0
+%patchset_patch 133 137
# patch for -extra
#%patch338 -p0
-%patch339 -p0
-%patch340 -p0
-%patch341 -p0
-%patch342 -p0
-%patch343 -p0
-%patch344 -p0
-%patch345 -p0
-%patch346 -p0
-%patch347 -p0
-%patch348 -p0
-%patch349 -p0
-%patch350 -p0
-%patch351 -p0
-%patch352 -p0
-%patch353 -p0
-%patch354 -p0
-%patch355 -p0
+%patchset_patch 139 155
# patch for -extra
#%patch356 -p0
-%patch357 -p0
-%patch358 -p0
-
+%patchset_patch 157 158
# bonobo
%if %{with bonobo}
@@ -1444,6 +1180,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.357.2.9.2.3.2.9 2006/12/22 19:36:50 glen
+- use new patchset macros for patch series
+
Revision 1.357.2.9.2.3.2.8 2006/12/22 18:34:01 glen
- recognize *.cron (from SOURCES) as cron file
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/vim.spec?r1=1.357.2.9.2.3.2.8&r2=1.357.2.9.2.3.2.9&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
