rpms/fbreader/EL-5 fbreader-0.12.9-desktop-file.patch, NONE, 1.1 .cvsignore, 1.12, 1.13 fbreader.spec, 1.17, 1.18 sources, 1.12, 1.13 fbreader-0.10.0-desktop-file.patch, 1.1, NONE

[Michel Alexandre Salim]

Author: salimma

Update of /cvs/pkgs/rpms/fbreader/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29030/EL-5

Modified Files:
	.cvsignore fbreader.spec sources 
Added Files:
	fbreader-0.12.9-desktop-file.patch 
Removed Files:
	fbreader-0.10.0-desktop-file.patch 
Log Message:
Build latest fbreader for EL-5


fbreader-0.12.9-desktop-file.patch:
 desktop |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

--- NEW FILE fbreader-0.12.9-desktop-file.patch ---
--- fbreader-0.12.9/fbreader/desktop/desktop.desktop-file	2010-03-25 00:38:01.000000000 +0100
+++ fbreader-0.12.9/fbreader/desktop/desktop	2010-03-28 14:14:32.624078717 +0200
@@ -1,9 +1,5 @@
 [Desktop Entry]
-Name=E-book reader
-Name[ar]=قارئ الكتب الإلكترونية
-Name[es]=Lector de Libros
-Name[ru]=Чтение электронных книг
-Name[zh_CN]=电子书阅读
+Name=FBReader
 GenericName=E-book reader
 GenericName[ar]=قارئ الكتب الإلكترونية
 GenericName[es]=Lector de Libros
@@ -19,5 +15,5 @@
 StartupNotify=true
 Terminal=false
 Type=Application
-Icon=FBReader.png
-Categories=Office;Viewer;Literature;
+Icon=FBReader
+Categories=Office;Viewer;


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore	26 Jan 2010 10:01:24 -0000	1.12
+++ .cvsignore	8 Jul 2010 12:00:22 -0000	1.13
@@ -1 +1 @@
-fbreader-sources-0.12.1.tgz
+fbreader-sources-0.12.10.tgz


Index: fbreader.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/fbreader.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- fbreader.spec	26 Jan 2010 11:27:48 -0000	1.17
+++ fbreader.spec	8 Jul 2010 12:00:26 -0000	1.18
@@ -1,5 +1,5 @@
 Name:           fbreader
-Version:        0.12.1
+Version:        0.12.10
 Release:        1%{?dist}
 Summary:        E-book reader
 
@@ -8,7 +8,7 @@ License:        GPLv2+
 URL:            http://www.fbreader.org/
 Source0:        http://www.fbreader.org/fbreader-sources-%{version}.tgz
 Source1:        README.Fedora
-Patch0:         fbreader-0.10.0-desktop-file.patch
+Patch0:         fbreader-0.12.9-desktop-file.patch
 Patch1:         fbreader-optflags.patch
 # Use to expose the compiler flags used during build
 # Patch2:         fbreader-debug.patch
@@ -20,6 +20,9 @@ BuildRequires:  gtk2-devel fribidi-devel
 BuildRequires:  libjpeg-devel desktop-file-utils
 BuildRequires:  qt4-devel sqlite-devel
 
+# needed because sometimes the API change without soname bump
+Requires:       zlibrary = %{version}-%{release}
+
 
 %description
 FBReader is an e-book reader, with the following main features:
@@ -210,7 +213,6 @@ exit 0
 %{_datadir}/applications/fedora-FBReader.desktop
 %{_datadir}/pixmaps/FBReader.png
 %{_datadir}/pixmaps/FBReader
-%{_datadir}/zlibrary
 
 %files gtk
 %files qt
@@ -242,6 +244,16 @@ exit 0
 
 
 %changelog
+* Mon Jun  7 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.10-1
+- Update to 0.12.10
+
+* Sun Mar 28 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.9-1
+- Update to 0.12.9
+
+* Sat Feb 13 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.2-1
+- Update to 0.12.2
+- Fix overlap between fbreader and zlibrary
+
 * Tue Jan 26 2010 Michel Salim <salimma at fedoraproject.org> - 0.12.1-1
 - Update to 0.12.1
 
@@ -252,9 +264,18 @@ exit 0
 * Thu Sep 17 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-3
 - Split out zlibrary and zlibrary-ui subpackages (fixes bz# 523946)
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.7-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Mar 31 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.7-1
 - Update to 0.10.7
 
+* Tue Feb 24 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.3-3
+- Fix for GCC 4.4
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.10.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Thu Feb  5 2009 Michel Salim <salimma at fedoraproject.org> - 0.10.3-1
 - Update to 0.10.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fbreader/EL-5/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources	26 Jan 2010 10:01:24 -0000	1.12
+++ sources	8 Jul 2010 12:00:26 -0000	1.13
@@ -1 +1 @@
-7236d094a91f26d19a3cfd3db8fcf946  fbreader-sources-0.12.1.tgz
+da9ec4721efdb0ec0aaa182bff16ad82  fbreader-sources-0.12.10.tgz


--- fbreader-0.10.0-desktop-file.patch DELETED ---