Accepting request 84410 from devel:libraries:c_c++

- move lenses from /usr/share/libaugeas0/augeas
  to /usr/share/augeas (bnc#719199)
- move vim lenses syntax files from -lenses to -devel package (forwarded request 84389 from dmacvicar)

OBS-URL: https://build.opensuse.org/request/show/84410
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/augeas?expand=0&rev=19
This commit is contained in:
Sascha Peilicke 2011-09-22 11:01:11 +00:00 committed by Git OBS Bridge
commit a244b7ecb0
2 changed files with 20 additions and 24 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Sep 22 08:50:38 UTC 2011 - dmacvicar@suse.de
- move lenses from /usr/share/libaugeas0/augeas
to /usr/share/augeas (bnc#719199)
- move vim lenses syntax files from -lenses to -devel package
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Sep 17 13:40:12 UTC 2011 - jengelh@medozas.de Sat Sep 17 13:40:12 UTC 2011 - jengelh@medozas.de

View File

@ -104,19 +104,14 @@ modifying the official lenses, or when creating new ones.
%build %build
export CFLAGS="-Wno-error $RPM_OPT_FLAGS" export CFLAGS="-Wno-error $RPM_OPT_FLAGS"
%configure --disable-static --datadir=%{_datadir}/%{__shrlibname} %configure --disable-static
%{__make} %_smp_mflags %{__make} %_smp_mflags
%install %install
make install DESTDIR=$RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
# create symlinks of augeas.vim files to vim/site # move vim files to the right location
mkdir -p $RPM_BUILD_ROOT/usr/share/vim/site/ftdetect; \ mv $RPM_BUILD_ROOT/%{_datadir}/vim/vimfiles $RPM_BUILD_ROOT/%{_datadir}/vim/site
mkdir $RPM_BUILD_ROOT/usr/share/vim/site/syntax; \
ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim \
${RPM_BUILD_ROOT}/usr/share/vim/site/ftdetect/augeas.vim
ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim \
${RPM_BUILD_ROOT}/usr/share/vim/site/syntax/augeas.vim
%post -n %{__shrlibname} %post -n %{__shrlibname}
/sbin/ldconfig /sbin/ldconfig
@ -141,30 +136,24 @@ ln -s %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim \
%{_includedir}/* %{_includedir}/*
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/augeas.pc %{_libdir}/pkgconfig/augeas.pc
# vim support files
%files lenses
%defattr(-,root,root,-)
%dir %{_datadir}/%{__shrlibname}
%dir %{_datadir}/%{__shrlibname}/%{name}
%dir %{_datadir}/%{__shrlibname}/%{name}/lenses
%dir %{_datadir}/%{__shrlibname}/%{name}/lenses/dist
%{_datadir}/%{__shrlibname}/%{name}/lenses/dist/*.aug
%dir %{_datadir}/vim %dir %{_datadir}/vim
%dir %{_datadir}/vim/site %dir %{_datadir}/vim/site
%dir %{_datadir}/vim/site/ftdetect %dir %{_datadir}/vim/site/ftdetect
%{_datadir}/vim/site/ftdetect/augeas.vim %{_datadir}/vim/site/ftdetect/augeas.vim
%dir %{_datadir}/vim/site/syntax %dir %{_datadir}/vim/site/syntax
%{_datadir}/vim/site/syntax/augeas.vim %{_datadir}/vim/site/syntax/augeas.vim
%dir %{_datadir}/%{__shrlibname}/vim
%dir %{_datadir}/%{__shrlibname}/vim/vimfiles %files lenses
%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect %defattr(-,root,root,-)
%{_datadir}/%{__shrlibname}/vim/vimfiles/ftdetect/augeas.vim %dir %{_datadir}/%{name}
%dir %{_datadir}/%{__shrlibname}/vim/vimfiles/syntax %dir %{_datadir}/%{name}/lenses
%{_datadir}/%{__shrlibname}/vim/vimfiles/syntax/augeas.vim %dir %{_datadir}/%{name}/lenses/dist
%{_datadir}/%{name}/lenses/dist/*.aug
%files lense-tests %files lense-tests
%defattr(-,root,root,-) %defattr(-,root,root,-)
%dir %{_datadir}/%{__shrlibname}/%{name}/lenses/dist/tests %dir %{_datadir}/%{name}/lenses/dist/tests
%{_datadir}/%{__shrlibname}/%{name}/lenses/dist/tests/*.aug %{_datadir}/%{name}/lenses/dist/tests/*.aug
%changelog %changelog