rpms/gnochm/EL-5 .cvsignore, 1.4, 1.5 gnochm.spec, 1.12, 1.13 sources, 1.4, 1.5

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/gnochm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12157

Modified Files:
	.cvsignore gnochm.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gnochm/EL-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Dec 2006 16:42:40 -0000	1.4
+++ .cvsignore	28 Dec 2007 15:22:21 -0000	1.5
@@ -1 +1 @@
-gnochm-0.9.9.tar.gz
+gnochm-0.9.11.tar.gz


Index: gnochm.spec
===================================================================
RCS file: /cvs/extras/rpms/gnochm/EL-5/gnochm.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- gnochm.spec	9 Dec 2006 17:19:13 -0000	1.12
+++ gnochm.spec	28 Dec 2007 15:22:21 -0000	1.13
@@ -1,12 +1,12 @@
 Name:           gnochm
-Version:        0.9.9
-Release:        2%{?dist}
+Version:        0.9.11
+Release:        1%{?dist}
 Summary:        CHM file viewer
 
 Group:          Applications/Publishing
-License:        GPL
+License:        GPLv2+
 URL:            http://gnochm.sourceforge.net/
-Source0:        http://puzzle.dl.sf.net/gnochm/gnochm-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/gnochm/gnochm-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -17,6 +17,7 @@
 Requires:       python-chm >= 0.8.4
 Requires:       gnome-python2-gconf pygtk2-libglade 
 Requires:       gnome-python2-gtkhtml2
+Requires:       yelp
 
 Requires(pre): GConf2
 Requires(post): GConf2
@@ -49,15 +50,14 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-
-echo "MimeType=application/x-chm" >> $RPM_BUILD_ROOT%{_datadir}/applications/gnochm.desktop
+make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         --delete-original                                       \
+        --remove-category=Application                           \
         $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/
 cp -p $RPM_BUILD_ROOT%{_datadir}/pixmaps/gnochm.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
@@ -138,6 +138,13 @@
 %{_datadir}/icons/gnome/
 
 %changelog
+* Fri Dec 28 2007 Patrice Dumas <pertusus at free.fr> 0.9.11-1
+- update to 0.9.11
+
+* Fri Jun  8 2007 Patrice Dumas <pertusus at free.fr> 0.9.10-1
+- update to 0.9.10
+- add yelp Requires (fix #243387)
+
 * Sat Dec  9 2006 Patrice Dumas <pertusus at free.fr> 0.9.9-2
 - update to 0.9.9
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gnochm/EL-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Dec 2006 16:42:40 -0000	1.4
+++ sources	28 Dec 2007 15:22:21 -0000	1.5
@@ -1 +1 @@
-c6cfabf97778587614973f6c3956f705  gnochm-0.9.9.tar.gz
+d77cc819eaa64b3ab333c4a73e88cfc0  gnochm-0.9.11.tar.gz