rpms/calibre/F-12 .cvsignore, 1.2, 1.3 calibre.spec, 1.1, 1.2 import.log, 1.1, 1.2 sources, 1.2, 1.3

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18107/F-12

Modified Files:
	.cvsignore calibre.spec import.log sources 
Log Message:
calibre updated to 0.6.20


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	1 Nov 2009 09:47:09 -0000	1.2
+++ .cvsignore	4 Nov 2009 10:44:14 -0000	1.3
@@ -1 +1 @@
-calibre-0.6.19-nofonts.tar.gz
+calibre-0.6.20-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- calibre.spec	1 Nov 2009 09:47:09 -0000	1.1
+++ calibre.spec	4 Nov 2009 10:44:14 -0000	1.2
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.19
-Release:        3%{?dist}
+Version:        0.6.20
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -35,6 +35,7 @@ BuildRequires:  python-dateutil
 BuildRequires:  python-imaging
 BuildRequires:  xdg-utils
 
+Requires:       PyQt4
 Requires:       pyPdf
 Requires:       python-cherrypy
 Requires:       python-cssutils
@@ -119,7 +120,7 @@ python setup.py install --root=%{buildro
 # icons
 mkdir -p %{buildroot}%{_datadir}/pixmaps/
 cp -p resources/images/library.png                \
-   %{buildroot}%{_datadir}/pixmaps/%{name}.png
+   %{buildroot}%{_datadir}/pixmaps/%{name}-gui.png
 cp -p resources/images/viewer.svg                 \
    %{buildroot}%{_datadir}/pixmaps/calibre-viewer.svg
 
@@ -129,21 +130,12 @@ find %{buildroot}%{_datadir}/mime -maxde
 # packages aren't allowed to register mimetypes like this
 rm -f %{buildroot}%{_datadir}/applications/defaults.list
 
-# Version isn't used correctly and it's not required either
-desktop-file-install \
---remove-key="Version" \
---dir=%{buildroot}%{_datadir}/applications \
-%{buildroot}%{_datadir}/applications/calibre-gui.desktop
-
-desktop-file-install \
---remove-key="Version" \
---dir=%{buildroot}%{_datadir}/applications \
-%{buildroot}%{_datadir}/applications/%{name}-lrfviewer.desktop
-
-desktop-file-install \
---remove-key="Version" \
---dir=%{buildroot}%{_datadir}/applications \
+desktop-file-validate \
 %{buildroot}%{_datadir}/applications/calibre-ebook-viewer.desktop
+desktop-file-validate \
+%{buildroot}%{_datadir}/applications/calibre-gui.desktop
+desktop-file-validate \
+%{buildroot}%{_datadir}/applications/calibre-lrfviewer.desktop
 
 
 mv %{buildroot}%{_datadir}/mime/packages/calibre-mimetypes \
@@ -246,6 +238,13 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Wed Nov  4 2009 Ionuț Arțăriși <mapleoin at fedoraproject.org> - 0.6.20-1
+- new upstream version:
+http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2030Oct2009
+- upstream now ships correct .desktop files
+- fixed missing dependency: PyQt4
+- fixed calibre-gui icon
+
 * Thu Oct 22 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.19-3
 - removed unfree fonts from source package
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	1 Nov 2009 09:47:09 -0000	1.1
+++ import.log	4 Nov 2009 10:44:14 -0000	1.2
@@ -1 +1,2 @@
 calibre-0_6_19-3_fc11:F-12:calibre-0.6.19-3.fc11.src.rpm:1257068462
+calibre-0_6_20-1_fc12:F-12:calibre-0.6.20-1.fc12.src.rpm:1257331145


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	1 Nov 2009 09:47:09 -0000	1.2
+++ sources	4 Nov 2009 10:44:14 -0000	1.3
@@ -1 +1 @@
-087e8b4bdd098ea1d22598c025d6eaaf  calibre-0.6.19-nofonts.tar.gz
+e308bf9fe321a0b48e496db7a2b8014b  calibre-0.6.20-nofonts.tar.gz