rpms/vim/devel vim.spec,1.241,1.242
Karsten Hopp
karsten at fedoraproject.org
Thu Dec 3 13:34:31 UTC 2009
- Previous message: rpms/expat/F-12 expat-1.95.8-CVE-2009-3560.patch, NONE, 1.1 expat-1.95.8-CVE-2009-3720.patch, NONE, 1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.33, 1.34
- Next message: rpms/vim/devel vim-7.2-elinks-parameter-518791.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: karsten
Update of /cvs/extras/rpms/vim/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13912
Modified Files:
vim.spec
Log Message:
vim-7.2-elinks-parameter-518791.patch
Index: vim.spec
===================================================================
RCS file: /cvs/extras/rpms/vim/devel/vim.spec,v
retrieving revision 1.241
retrieving revision 1.242
diff -u -p -r1.241 -r1.242
--- vim.spec 9 Nov 2009 15:55:15 -0000 1.241
+++ vim.spec 3 Dec 2009 13:34:31 -0000 1.242
@@ -18,7 +18,7 @@
#used for pre-releases:
%define beta %{nil}
%define vimdir vim72%{?beta}
-%define patchlevel 284
+%define patchlevel 315
Summary: The VIM editor
URL: http://www.vim.org/
@@ -350,6 +350,37 @@ Patch281: ftp://ftp.vim.org/pub/vim/patc
Patch282: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.282
Patch283: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.283
Patch284: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.284
+Patch285: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.285
+Patch286: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.286
+Patch287: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.287
+Patch288: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.288
+Patch289: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.289
+Patch290: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.290
+Patch291: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.291
+Patch292: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.292
+Patch293: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.293
+Patch294: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.294
+Patch295: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.295
+Patch296: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.296
+Patch297: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.297
+Patch298: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.298
+Patch299: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.299
+Patch300: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.300
+Patch301: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.301
+Patch302: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.302
+Patch303: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.303
+Patch304: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.304
+Patch305: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.305
+Patch306: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.306
+Patch307: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.307
+Patch308: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.308
+Patch309: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.309
+Patch310: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.310
+Patch311: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.311
+Patch312: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.312
+Patch313: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.313
+Patch314: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.314
+Patch315: ftp://ftp.vim.org/pub/vim/patches/7.2/7.2.315
Patch3000: vim-7.0-syntax.patch
Patch3002: vim-7.1-nowarnings.patch
@@ -357,11 +388,12 @@ Patch3003: vim-6.1-rh3.patch
Patch3004: vim-7.0-rclocation.patch
Patch3006: vim-6.4-checkhl.patch
Patch3007: vim-7.2-fstabsyntax.patch
-Patch3008: vim-7.1-lib64.patch
-Patch3009: vim-7.0-warning.patch
-Patch3010: vim-7.0-syncolor.patch
-Patch3011: vim-7.0-specedit.patch
-Patch3012: vim72-rh514717.patch
+Patch3008: vim-7.0-warning.patch
+Patch3009: vim-7.0-syncolor.patch
+Patch3010: vim-7.0-specedit.patch
+Patch3011: vim72-rh514717.patch
+Patch3012: vim-7.2-httpfiletype-499123.patch
+Patch3013: vim-7.2-elinks-parameter-518791.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ncurses-devel gettext perl-devel
@@ -370,6 +402,9 @@ BuildRequires: libacl-devel gpm-devel au
%if %{WITH_SELINUX}
BuildRequires: libselinux-devel
%endif
+%if "%{withruby}" == "1"
+Buildrequires: ruby-devel ruby
+%endif
%if %{desktop_file}
# for /usr/bin/desktop-file-install
Requires: desktop-file-utils
@@ -768,6 +803,37 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runti
%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
+%patch308 -p0
+%patch309 -p0
+%patch310 -p0
+%patch311 -p0
+%patch312 -p0
+%patch313 -p0
+%patch314 -p0
+%patch315 -p0
# install spell files
@@ -797,12 +863,15 @@ cp -f %{SOURCE20} runtime/autoload/tar.v
cp -f %{SOURCE21} runtime/autoload/netrwFileHandlers.vim
cp -f %{SOURCE22} runtime/autoload/netrw.vim
cp -f %{SOURCE23} runtime/autoload/netrwSettings.vim
-
+%patch3013 -p1
%build
cd src
autoconf
+sed -e "s+VIMRCLOC = \$(VIMLOC)+VIMRCLOC = /etc+" Makefile > Makefile.tmp
+mv -f Makefile.tmp Makefile
+
export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2"
@@ -829,7 +898,7 @@ export CXXFLAGS="$RPM_OPT_FLAGS -D_GNU_S
--disable-rubyinterp \
%endif
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
cp vim gvim
make clean
@@ -855,7 +924,7 @@ make clean
--disable-rubyinterp \
%endif
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
cp vim enhanced-vim
make clean
@@ -874,7 +943,7 @@ perl -pi -e "s/\/etc\/vimrc/\/etc\/virc/
--with-compiledby="<bugzilla at redhat.com>" \
--with-modified-by="<bugzilla at redhat.com>"
-make %{?_smp_mflags}
+make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -890,8 +959,8 @@ rm -f README*.info
cd src
-make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
-make installgtutorbin DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin
+make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
+make installgtutorbin DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
mv $RPM_BUILD_ROOT/bin/xxd $RPM_BUILD_ROOT/%{_bindir}/xxd
mv $RPM_BUILD_ROOT/bin/gvimtutor $RPM_BUILD_ROOT/%{_bindir}/gvimtutor
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
@@ -931,8 +1000,8 @@ install -m755 enhanced-vim $RPM_BUILD_RO
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT/%{_datadir}/applications \
- --add-category "Development;TextEditor;X-Red-Hat-Base" \
%{SOURCE3}
+ # --add-category "Development;TextEditor;X-Red-Hat-Base" D\
%else
mkdir -p ./%{_sysconfdir}/X11/applnk/Applications
cp %{SOURCE3} ./%{_sysconfdir}/X11/applnk/Applications/gvim.desktop
@@ -1000,6 +1069,7 @@ vi-Bram.txt vi_help.txt /*vi-Bram*
vi-Moolenaar.txt vi_help.txt /*vi-Moolenaar*
vi-credits.txt vi_help.txt /*vi-credits*
EOF
+LANG=C sort tags > tags.tmp; mv tags.tmp tags
)
(cd ../runtime; rm -rf doc; ln -svf ../../vim/%{vimdir}/doc docs;)
rm -f $RPM_BUILD_ROOT/%{_datadir}/vim/%{vimdir}/macros/maze/maze*.c
@@ -1228,6 +1298,17 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Wed Dec 03 2009 Karsten Hopp <karsten at redhat.com> 7.2.315-1
+- patchlevel 315
+- fix vimrc location in man page (#456992)
+- correct syntax highlighting of httpd config files in /etc/httpd (#499123)
+- Buildrequire ruby, ruby-devel (#503872)
+- Remove check for static gravity (#510307)
+- sort tags file (#517725)
+- use one gvim to open multiple file selections from nautilus (#519265)
+- use elinks -source instead of elinks -dump (#518791)
+- add ext4 keyword to /etc/fstab syntax highlighting (#498290)
+
* Mon Nov 09 2009 Karsten Hopp <karsten at redhat.com> 7.2.284-1
- patchlevel 284
- Previous message: rpms/expat/F-12 expat-1.95.8-CVE-2009-3560.patch, NONE, 1.1 expat-1.95.8-CVE-2009-3720.patch, NONE, 1.1 expat-2.0.1-confcxx.patch, NONE, 1.1 expat.spec, 1.33, 1.34
- Next message: rpms/vim/devel vim-7.2-elinks-parameter-518791.patch,NONE,1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list