[vim/f18: 293/294] Merge commit '0a58aceceb59f05d8d11071bf2c436026b2a6fd1' into f18
Karsten Hopp
karsten at fedoraproject.org
Tue May 14 13:10:00 UTC 2013
commit b1dd63cbfb51e7f270f0f0edf6807ced290bd1c3
Merge: e725645 0a58ace
Author: Karsten Hopp <karsten at redhat.com>
Date: Tue May 14 15:03:41 2013 +0200
Merge commit '0a58aceceb59f05d8d11071bf2c436026b2a6fd1' into f18
Conflicts:
README.patches
vim-update.sh
vim.spec
7.3.336 | 212 +-
7.3.713 | 114 +
7.3.714 | 62 +
7.3.715 | 234 ++
7.3.716 | 70 +
7.3.717 | 59 +
7.3.718 | 49 +
7.3.719 | 849 +++++
7.3.720 | 226 ++
7.3.721 | 60 +
7.3.722 | 58 +
7.3.723 | 264 ++
7.3.724 | 50 +
7.3.725 | 58 +
7.3.726 | 66 +
7.3.727 | 55 +
7.3.728 | 191 ++
7.3.729 | 62 +
7.3.730 | 86 +
7.3.731 | 81 +
7.3.732 | 130 +
7.3.733 | 118 +
7.3.734 | 125 +
7.3.735 | 100 +
7.3.736 | 258 ++
7.3.737 | 49 +
7.3.738 | 142 +
7.3.739 | 86 +
7.3.740 | 168 +
7.3.741 | 56 +
7.3.742 | 44 +
7.3.743 | 66 +
7.3.744 | 52 +
7.3.745 | 87 +
7.3.746 | 96 +
7.3.747 | 67 +
7.3.748 | 473 +++
7.3.749 | 59 +
7.3.750 | 83 +
7.3.751 | 103 +
7.3.752 | 68 +
7.3.753 | 103 +
7.3.754 | 48 +
7.3.755 | 137 +
7.3.756 | 107 +
7.3.757 | 51 +
7.3.758 | 78 +
7.3.759 | 106 +
7.3.760 | 99 +
7.3.761 | 93 +
7.3.762 | 56 +
7.3.763 | 69 +
7.3.764 | 175 +
7.3.765 | 98 +
7.3.766 | 74 +
7.3.767 | 120 +
7.3.768 | 68 +
7.3.769 | 450 +++
7.3.770 | 136 +
7.3.771 | 74 +
7.3.772 | 51 +
7.3.773 | 45 +
7.3.774 | 84 +
7.3.775 | 72 +
7.3.776 | 435 +++
7.3.777 | 59 +
7.3.778 | 53 +
7.3.779 | 86 +
7.3.780 | 111 +
7.3.781 | 185 +
7.3.782 | 171 +
7.3.783 | 44 +
7.3.784 | 59 +
7.3.785 | 104 +
7.3.786 | 93 +
7.3.787 | 161 +
7.3.788 | 48 +
7.3.789 | 185 +
7.3.790 | 52 +
7.3.791 | 2124 ++++++++++++
7.3.792 | 131 +
7.3.793 | 72 +
7.3.794 | 75 +
7.3.795 | 212 ++
7.3.796 | Bin 0 -> 3027 bytes
7.3.797 | 58 +
7.3.798 | 103 +
7.3.799 | 58 +
7.3.800 | 64 +
7.3.801 | 61 +
7.3.802 | 50 +
7.3.803 | 106 +
7.3.804 | 46 +
7.3.805 | 99 +
7.3.806 | 171 +
7.3.807 | 52 +
7.3.808 | 289 ++
7.3.809 | 52 +
7.3.810 | 259 ++
7.3.811 | 53 +
7.3.812 | 86 +
7.3.813 | 56 +
7.3.814 | 146 +
7.3.815 | 168 +
7.3.816 | 368 ++
7.3.817 | 48 +
7.3.818 | 133 +
7.3.819 | 682 ++++
7.3.820 | 137 +
7.3.821 | 76 +
7.3.822 | 159 +
7.3.823 | 69 +
7.3.824 | 49 +
7.3.825 | 125 +
7.3.826 | 155 +
7.3.827 | 94 +
7.3.828 | 131 +
7.3.829 | 83 +
7.3.830 | 88 +
7.3.831 | 609 ++++
7.3.832 | 66 +
7.3.833 | 118 +
7.3.834 | 83 +
7.3.835 | 60 +
7.3.836 | 2071 ++++++++++++
7.3.837 | 84 +
7.3.838 | 364 ++
7.3.839 | 76 +
7.3.840 | 54 +
7.3.841 | 59 +
7.3.842 | 54 +
7.3.843 | 111 +
7.3.844 | 197 ++
7.3.845 | 88 +
7.3.846 | 46 +
7.3.847 | 47 +
7.3.848 | 153 +
7.3.849 | 55 +
7.3.850 | 82 +
7.3.851 | 67 +
7.3.852 | 124 +
7.3.853 | 96 +
7.3.854 | 49 +
7.3.855 | 69 +
7.3.856 | 311 ++
7.3.857 | 91 +
7.3.858 | 159 +
7.3.859 | 316 ++
7.3.860 | 85 +
7.3.861 | 165 +
7.3.862 | 215 ++
7.3.863 | 91 +
7.3.864 | 48 +
7.3.865 | 74 +
7.3.866 | 196 ++
7.3.867 | 279 ++
7.3.868 | 90 +
7.3.869 | 358 ++
7.3.870 | 203 ++
7.3.871 | 102 +
7.3.872 | 524 +++
7.3.873 | Bin 0 -> 5967 bytes
7.3.874 | 139 +
7.3.875 | 69 +
7.3.876 | 80 +
7.3.877 | 100 +
7.3.878 | 78 +
7.3.879 | 97 +
7.3.880 | 287 ++
7.3.881 | 108 +
7.3.882 | 59 +
7.3.883 | 65 +
7.3.884 | 73 +
7.3.885 | 88 +
7.3.886 | 93 +
7.3.887 | 308 ++
7.3.888 | 150 +
7.3.889 | 71 +
7.3.890 | 60 +
7.3.891 | 142 +
7.3.892 | 295 ++
7.3.893 | 718 ++++
7.3.894 | 47 +
7.3.895 | 189 ++
7.3.896 | 206 ++
7.3.897 | 126 +
7.3.898 | 304 ++
7.3.899 | 67 +
7.3.900 | 55 +
7.3.901 | 95 +
7.3.902 | 45 +
7.3.903 | 60 +
7.3.904 | 47 +
7.3.905 | 45 +
7.3.906 | 56 +
7.3.907 | 162 +
7.3.908 | 45 +
7.3.909 | 2129 ++++++++++++
7.3.910 | 119 +
7.3.911 | 343 ++
7.3.912 | 52 +
7.3.913 | 73 +
7.3.914 | 72 +
7.3.915 | 47 +
7.3.916 | 115 +
7.3.917 | 85 +
7.3.918 | 80 +
7.3.919 | 57 +
7.3.920 | 51 +
7.3.921 | 58 +
7.3.922 | 83 +
7.3.923 | 82 +
7.3.924 | 1628 +++++++++
7.3.925 | 2899 ++++++++++++++++
7.3.926 | 905 +++++
7.3.927 | 99 +
7.3.928 | 86 +
7.3.929 | 178 +
7.3.930 | 46 +
7.3.931 | 58 +
7.3.932 | 51 +
7.3.933 | 163 +
7.3.934 | 81 +
7.3.935 | 114 +
7.3.936 | 661 ++++
7.3.937 | 616 ++++
7.3.938 | 145 +
7.3.939 | 60 +
7.3.940 | 87 +
7.3.941 | 1456 ++++++++
7.3.942 | 205 ++
7.3.943 | 267 ++
7.3.944 | 69 +
README.patches | 233 ++
nl.po | 8207 +++++++++++++++++++++++++++++++++++++++++++++
vim-7.0-crv.patch | 10 -
vim-7.3-rubyversion.patch | 15 +
vim-7.3-xsubpp-path.patch | 12 +
vim.spec | 537 +++-
239 files changed, 51595 insertions(+), 121 deletions(-)
---
diff --cc vim.spec
index 6418963,8ce1ab5..e4bffe2
--- a/vim.spec
+++ b/vim.spec
@@@ -2091,12 -2568,50 +2571,56 @@@ rm -rf $RPM_BUILD_ROO
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+ * Tue May 14 2013 Karsten Hopp <karsten at redhat.com> 7.3.944-1
+ - patchlevel 944
+
+ * Mon May 13 2013 Karsten Hopp <karsten at redhat.com> 7.3.943-2
+ - add BR perl(ExtUtils::ParseXS)
+ - fix path to xsubpp script
+
+ * Mon May 13 2013 Karsten Hopp <karsten at redhat.com> 7.3.943-1
+ - patchlevel 943
+
+ * Wed May 08 2013 Karsten Hopp <karsten at redhat.com> 7.3.931-1
+ - patchlevel 931
+
+ * Wed May 08 2013 Karsten Hopp <karsten at redhat.com> 7.3.903-1
+ - fix ruby version check
+
+ * Fri Apr 19 2013 Karsten Hopp <karsten at redhat.com> 7.3.903-1
+ - drop crv patch
+ - update 7.3.838 patch, it was broken upstream
+
+ * Mon Apr 15 2013 Karsten Hopp <karsten at redhat.com> 7.3.903-1
+ - patchlevel 903
+
+ * Mon Feb 18 2013 Karsten Hopp <karsten at redhat.com> 7.3.822-1
+ - patchlevel 822
+
+ * Fri Feb 15 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 7.3.797-2
+ - Only use --vendor for desktop-file-install on F18 or less
+
+ * Thu Jan 31 2013 Karsten Hopp <karsten at redhat.com> 7.3.797-1
+ - patchlevel 797
+
+ * Mon Jan 28 2013 Karsten Hopp <karsten at redhat.com> 7.3.785-1
+ - patchlevel 785
+
+ * Tue Nov 20 2012 Karsten Hopp <karsten at redhat.com> 7.3.715-1
+ - patchlevel 715
++*
+* Mon Nov 12 2012 Karsten Hopp <karsten at redhat.com> 7.3.712-1
+- patchlevel 712
+
+* Mon Nov 12 2012 Karsten Hopp <karsten at redhat.com> 7.3.682-2
+- fix vim.csh syntax
+ * Tue Oct 23 2012 Karsten Hopp <karsten at redhat.com> 7.3.712-1
+ - patchlevel 712
+
+ * Mon Oct 15 2012 Karsten Hopp <karsten at redhat.com> 7.3.691-1
+ - patchlevel 691
+
* Fri Oct 05 2012 Karsten Hopp <karsten at redhat.com> 7.3.682-1
- patchlevel 682
- use --enable-rubyinterp=dynamic and --enable-pythoninterp=dynamic
More information about the scm-commits
mailing list