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

Revert "install everything in /usr"

Browse Source 
This reverts commit 346844e66f.

Conflicts:

	vim.spec
This commit is contained in:
Karsten Hopp 2012-05-23 11:27:29 +02:00
parent 79b71d4e37
commit 26be22e1e0
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
vim.spec
View File

@ -599,7 +599,6 @@ Requires: desktop-file-utils
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version} BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
%endif %endif
Epoch: 2 Epoch: 2
Conflicts: filesystem < 3
%description %description
VIM (VIsual editor iMproved) is an updated and improved version of the VIM (VIsual editor iMproved) is an updated and improved version of the
@ -639,7 +638,6 @@ many different languages.
Summary: A minimal version of the VIM editor Summary: A minimal version of the VIM editor
Group: Applications/Editors Group: Applications/Editors
Provides: vi = %{version}-%{release} Provides: vi = %{version}-%{release}
Provides: /bin/vi
%description minimal %description minimal
VIM (VIsual editor iMproved) is an updated and improved version of the VIM (VIsual editor iMproved) is an updated and improved version of the
@ -1333,6 +1331,7 @@ make VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT/bin
mkdir -p $RPM_BUILD_ROOT/%{_bindir} mkdir -p $RPM_BUILD_ROOT/%{_bindir}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/{after,autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}/vimfiles/after/{autoload,colors,compiler,doc,ftdetect,ftplugin,indent,keymap,lang,plugin,print,spell,syntax,tutor}
@ -1348,12 +1347,12 @@ rm -f README*.info
cd src cd src
make install DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir} make install DESTDIR=$RPM_BUILD_ROOT BINDIR=/bin VIMRCLOC=/etc VIMRUNTIMEDIR=/usr/share/vim/%{vimdir}
make installgtutorbin DESTDIR=$RPM_BUILD_ROOT BINDIR=%{_bindir} 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 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/{16x16,32x32,48x48,64x64}/apps
install -m755 vim $RPM_BUILD_ROOT%{_bindir}/vi install -m755 gvim $RPM_BUILD_ROOT/%{_bindir}/gvim
install -m755 enhanced-vim $RPM_BUILD_ROOT%{_bindir}/vim
install -m755 gvim $RPM_BUILD_ROOT%{_bindir}/gvim
install -p -m644 %{SOURCE7} \ install -p -m644 %{SOURCE7} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps/gvim.png
install -p -m644 %{SOURCE8} \ install -p -m644 %{SOURCE8} \
@ -1362,12 +1361,17 @@ install -p -m644 %{SOURCE9} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/gvim.png
install -p -m644 %{SOURCE10} \ install -p -m644 %{SOURCE10} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/64x64/apps/gvim.png
install -m755 enhanced-vim $RPM_BUILD_ROOT/%{_bindir}/vim
( cd $RPM_BUILD_ROOT ( cd $RPM_BUILD_ROOT
ln -sf vi ./%{_bindir}/rvi mv ./bin/vimtutor ./%{_bindir}/vimtutor
ln -sf vi ./%{_bindir}/rview mv ./bin/vim ./bin/vi
ln -sf vi ./%{_bindir}/view rm -f ./bin/rvim
ln -sf vi ./%{_bindir}/ex ln -sf vi ./bin/ex
ln -sf vi ./bin/rvi
ln -sf vi ./bin/rview
ln -sf vi ./bin/view
ln -sf vim ./%{_bindir}/ex
ln -sf vim ./%{_bindir}/rvim ln -sf vim ./%{_bindir}/rvim
ln -sf vim ./%{_bindir}/vimdiff ln -sf vim ./%{_bindir}/vimdiff
perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1 perl -pi -e "s,$RPM_BUILD_ROOT,," .%{_mandir}/man1/vim.1 .%{_mandir}/man1/vimtutor.1
@ -1630,17 +1634,18 @@ rm -rf $RPM_BUILD_ROOT
%files minimal %files minimal
%defattr(-,root,root) %defattr(-,root,root)
%config(noreplace) %{_sysconfdir}/virc %config(noreplace) %{_sysconfdir}/virc
%{_bindir}/ex /bin/ex
%{_bindir}/vi /bin/vi
%{_bindir}/view /bin/view
%{_bindir}/rvi /bin/rvi
%{_bindir}/rview /bin/rview
%files enhanced %files enhanced
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/vim %{_bindir}/vim
%{_bindir}/rvim %{_bindir}/rvim
%{_bindir}/vimdiff %{_bindir}/vimdiff
%{_bindir}/ex
%{_bindir}/vimtutor %{_bindir}/vimtutor
%config(noreplace) %{_sysconfdir}/profile.d/vim.* %config(noreplace) %{_sysconfdir}/profile.d/vim.*
%{_mandir}/man1/rvim.* %{_mandir}/man1/rvim.*