From: Elan Ruusamäe <glen@delfi.ee>
Date: Tue, 26 Mar 2013 16:58:30 +0000 (+0200)
Subject: up to 7.3.854 (without 7.3.780 patch)
X-Git-Tag: auto/th/vim-7.3.875-1~4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=cdd976c0f4abdf5f0c00a8ec11fc26f0254abb09;p=packages%2Fvim.git

up to 7.3.854 (without 7.3.780 patch)
---

diff --git a/sources b/sources
index aa6163c..4aa145b 100644
--- a/sources
+++ b/sources
@@ -760,3 +760,94 @@ f36da7fd453e2bbd8b74c817f8927dd7  7.3.757
 feede44e7a31055cdc967abb2162ed3e  7.3.760
 109b0ea8a2924338865855a64017de7f  7.3.761
 d11098382b38b12e3b552400421450bc  7.3.762
+41421f5affa5d4d7aace28f9bcf77ea5  7.3.763
+735563349503f9a61dd0cfc7cde6c589  7.3.764
+46c72c3a1dd3ec3f724bcb50d6dade7a  7.3.765
+da189fdac966e978606cb93cb458208d  7.3.766
+b12fffc522168a4171e2719697e0f5db  7.3.767
+a2057e7be90bddf92ac3319a0aa54c5b  7.3.768
+87e6d0e78dd7313609652e785c10b3fd  7.3.769
+c960937e7ee14d1b7ded058dcb8ea508  7.3.770
+a2a42505b2dec3eaeeb051a57c3d19c6  7.3.771
+79a9882a2e79411d56f3e1fd83685918  7.3.772
+65793f976e3cd13d6ba9f3d40584c16a  7.3.773
+5a0e8b6fc2d5784c85ea039832d67641  7.3.774
+a5ba9b3b9a1152c5be34dc13febc7950  7.3.775
+c55117708c70f883e6db1a940a30fe2b  7.3.776
+8338b979e35b7048b50453a98bbf4532  7.3.777
+be191f4db81309b22f16accceead7748  7.3.778
+c25f516df1a6f4e91bb03596ef123952  7.3.779
+1207767150015dbafbc74d7b8405cdec  7.3.781
+83a1a0ae88c37c97c237a2d6555e0cd7  7.3.782
+9d7aec8d3c5e4b5344d8203e1b5efce6  7.3.783
+a4b70df647438d5904f6a8ec02879ee1  7.3.784
+abbdecdc9efc9be9f6dac03a37268520  7.3.785
+a020433516fc2d9afab5186fc56d9fa1  7.3.786
+f96930682ad10b23e1a70540b6ab3d8c  7.3.787
+2e53c81838fd8c17018c1f24704bddb8  7.3.788
+ac01ff688623aad44b3ec1c6cf44ffe9  7.3.789
+f4dad2ef2444a565a869c92589c713ce  7.3.790
+38b8fb23f2a7e62c2e085e3908142f4c  7.3.791
+b5f040a56b0ecfa75ec80d3f6e940ce1  7.3.792
+b7ef33f3d9632ce55b18a2c8d566e306  7.3.793
+a495c230f69bfdd8c5759f62b97c602e  7.3.794
+62d2214429441abc2532736046feaa32  7.3.795
+d820b7899584a76615c5bfaeac99cecb  7.3.796
+b9d5040f551e27ba00fa8af05956f8e4  7.3.797
+09c965b1245f4bd4b218a64cef11130b  7.3.798
+6ef0a3c4d4c09ec1d7c3e5a622486281  7.3.799
+d4ae3cb2665e16fcbc5486f59feeaa79  7.3.800
+1681c127f2aa8bdba9d6844b59fecebf  7.3.801
+af0e2f7ee0934107e8f6427f26ce57d7  7.3.802
+6099115d1de823d7c4db760eaf7e0b49  7.3.803
+6595af234c5e2ed6d293b022952620d6  7.3.804
+36f9da91d4275d298a38d8a3782d93c7  7.3.805
+5c87d23889ee90e363418e7225067158  7.3.806
+375e799b20798f0c48da1260f06beb8b  7.3.807
+89d06c08901d59f528c41ff8222726f6  7.3.808
+ca40dd8b3565b95d8ba79f91178b166e  7.3.809
+44da6a1159468cc2f901c38c8b8249f9  7.3.810
+a24bef95639d7a5b949b25a3f4869d7a  7.3.811
+80441a6cf1565be9311ea87668e6fd9e  7.3.812
+7b1626326917577e5949531cd8548474  7.3.813
+8ece3a0fb3f87fa42f7465415e970bd8  7.3.814
+17cc83581cc8c0b3208c5fc11588255f  7.3.815
+b712b854580eb6842c423f75eb0e3474  7.3.816
+cf1c2b392a9b8e0b568e1d0213ea2b2e  7.3.817
+22745f101e8ad1fede4f4b3b6101a9bb  7.3.818
+30137ebb501f34ef25fc740bb3146e84  7.3.819
+0d34f0a6a04288282dcfb2eccb24722b  7.3.820
+be6c083ee5624621eaec22198bc516b1  7.3.821
+4ee4672fdd33a392010542497d4638fc  7.3.822
+083123561537365a520aeb07a0f43b4a  7.3.823
+b97638fa86f0f4651402a58089480ab6  7.3.824
+415a5269dd35fcfbef03a9d82a4f48e4  7.3.825
+c930b4e1c52dfa262cb0a55f12231306  7.3.826
+cdace24f2193d2e4ed04166481d6276d  7.3.827
+4215b471adda7c16bfdbe87da73b6af0  7.3.828
+186bc7b9036620cfa70677951e227b2d  7.3.829
+94f2416ff615a769750b07b7aaa00179  7.3.830
+4d061236f08a1b077e017f0246c9e4a6  7.3.831
+312223ba089ae771aaa564c0d08a662e  7.3.832
+583ff52dfc79893762283ead7a0e3aee  7.3.833
+ccf2e81d30b95d5e706be57f5a72583c  7.3.834
+c71152054f5f2f1296801b1263cb0f82  7.3.835
+0eb860a53f948645085c5236b0819af4  7.3.836
+51f60b66613b7535855d1e592f544d83  7.3.837
+a3b9ad5d94ab29fd0891db19939a5bb8  7.3.838
+3a1e2a7ef2cb8c98a75e4121d58ebd59  7.3.839
+21e3dcb67ba9926ec7ab8b92c1c3869e  7.3.840
+ca0b0640f383d02715aa74ade316fbd9  7.3.841
+a52eb40ecb77d8fc07a8229cd0c07121  7.3.842
+db29c4289936ea6a94ea7cda8aef4e62  7.3.843
+cce5250b4ea9a362bbefc591c519259a  7.3.844
+16c3883653cf2e13a6941f1d5734b48e  7.3.845
+34dd4ebffd4b84e0abbd9271497159fe  7.3.846
+12fd92c34db268c53e386a8bef5fdc30  7.3.847
+81d762df01e532a439a7ce729eb7e13d  7.3.848
+9a25ed7501d8fa17e9961b607470cd21  7.3.849
+5b59690cf254b2c200abed4e99d54afa  7.3.850
+10ba00ee007cfca5100616a77d3d2ea9  7.3.851
+21c9217486bb1e3df06a5f15295c521f  7.3.852
+99397a46ea6c51d1daecd839fc1632b5  7.3.853
+4746af04bc1010db7e7d09b6e093dd7b  7.3.854
diff --git a/vim-localedir.patch b/vim-localedir.patch
index 4e3f806..67f6a27 100644
--- a/vim-localedir.patch
+++ b/vim-localedir.patch
@@ -76,13 +76,13 @@
  	   INSTALL_DATA=$(INSTALL_DATA) FILEMOD=$(FILEMOD) install; \
  	fi
  	if test -d $(LANGSOURCE); then \
---- vim72/src/po/Makefile~	2008-07-24 21:52:54.000000000 +0300
-+++ vim72/src/po/Makefile	2009-04-15 11:25:53.058913958 +0300
-@@ -132,6 +132,7 @@
+--- vim73/src/po/Makefile~	2013-02-22 17:28:18.000000000 +0200
++++ vim73/src/po/Makefile	2013-02-22 17:46:40.771918175 +0200
+@@ -151,6 +151,7 @@
  
- install: $(MOFILES)
+ install: $(MOFILES) $(MOCONVERTED)
  	@$(MAKE) prefixcheck
 +	install -d $(LOCALEDIR); \
- 	for lang in $(LANGUAGES); do \
+ 	for lang in $(LANGUAGES) $(CONVERTED); do \
  	  dir=$(LOCALEDIR)/$$lang/; \
  	  if test ! -x "$$dir"; then \
diff --git a/vim-locales.patch b/vim-locales.patch
index 18919f1..b72a8bc 100644
--- a/vim-locales.patch
+++ b/vim-locales.patch
@@ -1,11 +1,12 @@
---- vim72/src/po/Makefile.orig	2009-04-26 13:48:02.165042621 +0200
-+++ vim72/src/po/Makefile	2009-04-26 13:48:27.241706378 +0200
-@@ -18,9 +18,7 @@
+--- vim73/src/po/Makefile~	2013-02-22 17:47:17.000000000 +0200
++++ vim73/src/po/Makefile	2013-02-22 17:47:53.395264524 +0200
+@@ -18,10 +18,8 @@
  		it \
  		ja \
  		ko \
 -		ko.UTF-8 \
  		nb \
+ 		nl \
 -		no \
  		pl \
  		pt_BR \
@@ -21,12 +22,13 @@
  
  MOFILES = \
  		af.mo \
-@@ -45,9 +43,7 @@
-  		it.mo \
-  		ja.mo \
+@@ -56,10 +54,8 @@
+ 		it.mo \
+ 		ja.mo \
  		ko.mo \
 -		ko.UTF-8.mo \
  		nb.mo \
+ 		nl.mo \
 -		no.mo \
  		pl.mo \
  		pt_BR.mo \
@@ -41,12 +43,13 @@
  		zh_TW.mo
  
  CONVERTED = \
-@@ -82,9 +78,7 @@
-  		it.ck \
+@@ -90,10 +90,8 @@
+ 		it.ck \
  		ja.ck \
  		ko.ck \
 -		ko.UTF-8.ck \
  		nb.ck \
+ 		nl.ck \
 -		no.ck \
  		pl.ck \
  		pt_BR.ck \
diff --git a/vim.spec b/vim.spec
index 13b14e4..c31c2f6 100644
--- a/vim.spec
+++ b/vim.spec
@@ -26,8 +26,8 @@
 # tail -n1 sources | awk '{print $2}'
 
 %define		ver		7.3
-%define		patchlevel	762
-%define		rel		2
+%define		patchlevel	854
+%define		rel		1
 Summary:	Vi IMproved - a Vi clone
 Summary(de.UTF-8):	VIsual editor iMproved
 Summary(es.UTF-8):	Editor visual incrementado
@@ -685,7 +685,9 @@ jak również GUI GTK+2.
 %setup -q -n %{name}73
 
 # official patches
-%patchset_patch 1 %{patchlevel}
+%patchset_patch 1 779
+# 7.3.780 patch is broken, does not apply and i fail to make it apply, bug in patch?
+%patchset_patch 781 %{patchlevel}
 
 %patch0 -p1
 %patch1 -p1