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

cleanups

Browse Source
This commit is contained in:
Matthias Clasen 2010-04-09 23:50:20 +00:00
parent cadda99710
commit 97eb052ecf
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
yelp.spec
View File

@ -1,4 +1,4 @@
%{?rhel: %global WITH_MONO 0} %global WITH_MONO 0
%{?!WITH_MONO: %global WITH_MONO 1} %{?!WITH_MONO: %global WITH_MONO 1}
%ifarch ppc64 s390 s390x %ifarch ppc64 s390 s390x
%define WITH_MONO 0 %define WITH_MONO 0
@ -50,9 +50,10 @@ Requires: gnome-doc-utils-stylesheets >= %{gnome_doc_utils_version}
Requires: rarian >= %{rarian_version} Requires: rarian >= %{rarian_version}
Requires(pre): GConf2 Requires(pre): GConf2
Requires(post): GConf2 Requires(post): GConf2
Requires(post): desktop-file-utils
Requires(preun): GConf2 Requires(preun): GConf2
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils Requires(postun): desktop-file-utils
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: gecko-devel-unstable >= %{gecko_version} BuildRequires: gecko-devel-unstable >= %{gecko_version}
@ -72,7 +73,6 @@ BuildRequires: intltool
BuildRequires: gnome-common BuildRequires: gnome-common
BuildRequires: automake autoconf libtool BuildRequires: automake autoconf libtool
%if %{WITH_MONO} %if %{WITH_MONO}
BuildRequires: libbeagle-devel BuildRequires: libbeagle-devel
%endif %endif
@ -126,30 +126,25 @@ mkdir -p -m 755 $RPM_BUILD_ROOT/%{_datadir}/gnome/help
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%post %post
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` %gconf_schema_upgrade yelp
gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
update-desktop-database &> /dev/null ||: update-desktop-database &> /dev/null ||:
touch --no-create %{_datadir}/icons/hicolor &> /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
%pre %pre
if [ "$1" -eq 0 ]; then %gconf_schema_prepare yelp
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
fi
%preun %preun
if [ "$1" -eq 0 ]; then %gconf_schema_remove yelp
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/yelp.schemas >& /dev/null || :
fi
%postun %postun
update-desktop-database &> /dev/null ||: 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 %files -f %{name}.lang
%defattr(-,root,root) %defattr(-,root,root)
@ -162,6 +157,10 @@ update-desktop-database &> /dev/null ||:
%{_datadir}/yelp %{_datadir}/yelp
%changelog %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 * Mon Mar 29 2010 Matthias Clasen <mclasen@redhat.com> - 2.30.0-1
- Update to 2.30.0 - Update to 2.30.0