rpms/vim
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Reset content to fedora/f19

Browse Source
This commit is contained in:
Daniel Mach 2013-05-14 14:06:28 -04:00
parent 4286bd2fc1
commit 6ffa9a239f
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vim-7.3-xsubpp-path.patch
View File

@ -1,12 +0,0 @@
diff -up vim73/src/Makefile.xsubpp vim73/src/Makefile
--- vim73/src/Makefile.xsubpp 2013-05-13 15:02:15.894805644 +0200
+++ vim73/src/Makefile 2013-05-13 15:07:03.922821257 +0200
@@ -2416,7 +2416,7 @@ lintinstall:
auto/if_perl.c: if_perl.xs
$(PERL) -e 'unless ( $$] >= 5.005 ) { for (qw(na defgv errgv)) { print "#define PL_$$_ $$_\n" }}' > $@
- $(PERL) $(PERLLIB)/ExtUtils/xsubpp -prototypes -typemap \
+ $(PERL) $(PERLLIB)/vendor_perl/ExtUtils/xsubpp -prototypes -typemap \
$(PERLLIB)/ExtUtils/typemap if_perl.xs >> $@
auto/osdef.h: auto/config.h osdef.sh osdef1.h.in osdef2.h.in

10
vim.spec
View File

@ -1013,7 +1013,6 @@ Patch3011: vim72-rh514717.patch
Patch3012: vim-7.3-bug816848.patch
Patch3013: vim-7.3-manpage-typo-668894-675480.patch
Patch3014: vim-7.3-rubyversion.patch
Patch3015: vim-7.3-xsubpp-path.patch
Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel ncurses-devel gettext perl-devel
@ -2110,7 +2109,6 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk
%patch3012 -p1
%patch3013 -p1
%patch3014 -p1
%patch3015 -p1
%build
cp -f %{SOURCE5} .
@ -2306,8 +2304,11 @@ if [ -n "\$BASH_VERSION" -o -n "\$KSH_VERSION" -o -n "\$ZSH_VERSION" ]; then
fi
EOF
cat >$RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/vim.csh <<EOF
[ -x /%{_bindir}/id ] || exit
[ \`/%{_bindir}/id -u\` -gt 200 ] && alias vi vim
if ( -x /usr/bin/id ) then
if ( "\`/usr/bin/id -u\`" > 100 ) then
alias vi vim
endif
endif
EOF
chmod 0644 $RPM_BUILD_ROOT/%{_sysconfdir}/profile.d/*
install -p -m644 %{SOURCE4} $RPM_BUILD_ROOT/%{_sysconfdir}/vimrc
@ -2573,7 +2574,6 @@ rm -rf $RPM_BUILD_ROOT
* Mon May 13 2013 Karsten Hopp <karsten@redhat.com> 7.3.943-2
- add BR perl(ExtUtils::ParseXS)
- fix path to xsubpp script
* Mon May 13 2013 Karsten Hopp <karsten@redhat.com> 7.3.943-1
- patchlevel 943