Dominique Leuenberger 2020-07-02 21:55:53 +00:00 committed by Git OBS Bridge
commit 38eafc3ffa
2 changed files with 13 additions and 2 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Jun 30 15:14:06 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- stop owning /etc/vimrc so the old, distro provided config actually
gets removed. Leaving it around leads to a duplicated autocmd for
*.spec, leading to spec file template inserted twice.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 22 15:59:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de> Mon Jun 22 15:59:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de>

View File

@ -331,7 +331,7 @@ ln -s -f %{VIM_SUBDIR} %{buildroot}%{_datadir}/vim/current
# additional files # additional files
install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/vim/current/suse.vimrc install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/vim/current/suse.vimrc
install -D -m 0644 /dev/null %{buildroot}%{_sysconfdir}/vimrc #install -D -m 0644 /dev/null %{buildroot}%{_sysconfdir}/vimrc
install -D -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/gvimrc install -D -m 0644 %{SOURCE8} %{buildroot}%{_sysconfdir}/gvimrc
# create site wide runtime directory # create site wide runtime directory
@ -545,7 +545,11 @@ fi
%{_datadir}/vim/%{VIM_SUBDIR}/tutor/* %{_datadir}/vim/%{VIM_SUBDIR}/tutor/*
%files data-common %files data-common
%ghost %config(noreplace) %{_sysconfdir}/vimrc # we can't currently own /etc/vimrc. If we keep owning it, an
# existing, unmodified vimrc would not be removed. That results in a
# duplicated definition of SKEL_spec().
# see also https://github.com/rpm-software-management/rpm/issues/1296
#%ghost %config(noreplace) %{_sysconfdir}/vimrc
%{_datadir}/vim/current %{_datadir}/vim/current
%dir %{_datadir}/vim/ %dir %{_datadir}/vim/
%dir %{_datadir}/vim/%{VIM_SUBDIR}/ %dir %{_datadir}/vim/%{VIM_SUBDIR}/