rpms/gnochm/FC-5 gnochm.spec,1.4,1.5
Patrice Dumas (pertusus)
fedora-extras-commits at redhat.com
Mon Sep 25 20:37:54 UTC 2006
Author: pertusus
Update of /cvs/extras/rpms/gnochm/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21924
Modified Files:
gnochm.spec
Log Message:
sync with devel
Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/FC-5/gnochm.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- gnochm.spec 16 Jun 2006 14:22:53 -0000 1.4
+++ gnochm.spec 25 Sep 2006 20:37:53 -0000 1.5
@@ -1,6 +1,6 @@
Name: gnochm
Version: 0.9.8
-Release: 1%{?dist}
+Release: 5%{?dist}
Summary: CHM file viewer
Group: Applications/Publishing
@@ -10,7 +10,10 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
-BuildRequires: gettext
+BuildRequires: gettext
+# internal intltool is used, so BR the perl module
+BuildRequires: perl(XML::Parser)
+# BuildRequires: intltool
Requires: python-chm gnome-python2-gconf pygtk2-libglade
Requires: gnome-python2-gtkhtml2
@@ -20,8 +23,6 @@
BuildRequires: scrollkeeper
Requires(post): scrollkeeper
Requires(postun): scrollkeeper
-Requires(post): desktop-file-utils
-Requires(postun): desktop-file-utils
BuildRequires: desktop-file-utils
%description
@@ -56,6 +57,11 @@
--add-category X-Fedora \
--delete-original \
$RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/gnome/48x48/mimetypes/
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnochm.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
+mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/chmfile.png $RPM_BUILD_ROOT%{_datadir}/icons/gnome/48x48/mimetypes/application-x-chm.png
+ln -s application-x-chm.png $RPM_BUILD_ROOT%{_datadir}/icons/gnome/48x48/mimetypes/gnome-mime-application-x-chm.png
%find_lang %{name}
@@ -85,6 +91,11 @@
update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/gnome || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+
%preun
if [ "$1" -eq 0 ]; then
export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -100,6 +111,12 @@
update-desktop-database &> /dev/null ||:
+touch --no-create %{_datadir}/icons/hicolor || :
+touch --no-create %{_datadir}/icons/gnome || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/gnome || :
+
+
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING NEWS README
@@ -114,10 +131,21 @@
%{_mandir}/*/man*/gnochm.1*
%{_datadir}/mime-info/gnochm.*
%{_datadir}/omf/gnochm/
-%{_datadir}/pixmaps/chmfile.png
-%{_datadir}/pixmaps/gnochm*.png
+%{_datadir}/pixmaps/gnochm_logo.png
+%{_datadir}/icons/hicolor/
+%{_datadir}/icons/gnome/
%changelog
+* Mon Sep 25 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-5
+- put the icon for chm file type in the gnome icon theme
+
+* Sun Sep 24 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-4
+- put icon file in %%{_datadir}/icons/hicolor/
+- remove Requires() desktop-file-utils according to the new guidelines
+
+* Tue Sep 12 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-3
+- BuildRequires perl(XML::Parser) required by the internal intltool
+
* Sun Jun 4 2006 Patrice Dumas <pertusus at free.fr> 0.9.8-1
- update to 0.9.8
More information about the scm-commits
mailing list