cleanups
This commit is contained in:
parent
cadda99710
commit
97eb052ecf
37
yelp.spec
37
yelp.spec
@ -1,4 +1,4 @@
|
||||
%{?rhel: %global WITH_MONO 0}
|
||||
%global WITH_MONO 0
|
||||
%{?!WITH_MONO: %global WITH_MONO 1}
|
||||
%ifarch ppc64 s390 s390x
|
||||
%define WITH_MONO 0
|
||||
@ -50,9 +50,10 @@ Requires: gnome-doc-utils-stylesheets >= %{gnome_doc_utils_version}
|
||||
Requires: rarian >= %{rarian_version}
|
||||
Requires(pre): GConf2
|
||||
Requires(post): GConf2
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(preun): GConf2
|
||||
Requires(post): desktop-file-utils
|
||||
Requires(postun): desktop-file-utils
|
||||
|
||||
BuildRequires: pango-devel >= %{pango_version}
|
||||
BuildRequires: gtk2-devel >= %{gtk2_version}
|
||||
BuildRequires: gecko-devel-unstable >= %{gecko_version}
|
||||
@ -72,7 +73,6 @@ BuildRequires: intltool
|
||||
BuildRequires: gnome-common
|
||||
BuildRequires: automake autoconf libtool
|
||||
|
||||
|
||||
%if %{WITH_MONO}
|
||||
BuildRequires: libbeagle-devel
|
||||
%endif
|
||||
@ -126,30 +126,25 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/gnome/help
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
|
||||
%gconf_schema_upgrade yelp
|
||||
update-desktop-database &> /dev/null ||:
|
||||
|
||||
# update icon themes
|
||||
touch %{_datadir}/icons/hicolor
|
||||
if [ -x /usr/bin/gtk-update-icon-cache ]; then
|
||||
/usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
|
||||
fi
|
||||
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
||||
|
||||
%pre
|
||||
if [ "$1" -eq 0 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
|
||||
fi
|
||||
%gconf_schema_prepare yelp
|
||||
|
||||
%preun
|
||||
if [ "$1" -eq 0 ]; then
|
||||
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
|
||||
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
|
||||
fi
|
||||
%gconf_schema_remove yelp
|
||||
|
||||
%postun
|
||||
update-desktop-database &> /dev/null ||:
|
||||
if [ $1 -eq 0 ]; then
|
||||
touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
|
||||
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
||||
fi
|
||||
|
||||
%posttrans
|
||||
gtk-update-icon-cache %{_datadir}icons/hicolor &> /dev/null || :
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
@ -162,6 +157,10 @@ update-desktop-database &> /dev/null ||:
|
||||
%{_datadir}/yelp
|
||||
|
||||
%changelog
|
||||
* Fri Apr 9 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-2
|
||||
- Drop libbeagle dep
|
||||
- Use GConf macros
|
||||
|
||||
* Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
|
||||
- Update to 2.30.0
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user