packages: calibre/calibre.spec, calibre/calibre-0.8.21-poppler.patch (REMOV...

[baggins]

Author: baggins                      Date: Sat Jun 30 21:40:00 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 0.8.58
- poppler patch removed, pdf reflow is now in python

---- Files affected:
packages/calibre:
   calibre.spec (1.146 -> 1.147) , calibre-0.8.21-poppler.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.146 packages/calibre/calibre.spec:1.147
--- packages/calibre/calibre.spec:1.146	Sat Jun 30 23:27:26 2012
+++ packages/calibre/calibre.spec	Sat Jun 30 23:39:55 2012
@@ -13,21 +13,19 @@
 Summary:	E-book converter and library management
 Summary(pl.UTF-8):	Konwerter oraz biblioteka dla e-booków
 Name:		calibre
-Version:	0.8.53
-Release:	6
+Version:	0.8.58
+Release:	1
 License:	GPL v3+
 Group:		Applications/Multimedia
 Source0:	%{name}-%{version}-nofonts.tar.xz
-# Source0-md5:	78785f551169af48f7334785cd1c6d2e
+# Source0-md5:	a431cc15339f345068ad89505070c6b2
 Source1:	generate-tarball.sh
 Source2:	%{name}-mount-helper
 Patch0:		%{name}-prefix.patch
-
-Patch2:		%{name}-no-update.patch
-Patch3:		%{name}-env_module.patch
-Patch4:		%{name}-locales.patch
-Patch5:		shebang-python-fix.patch
-Patch6:		%{name}-0.8.21-poppler.patch
+Patch1:		%{name}-no-update.patch
+Patch2:		%{name}-env_module.patch
+Patch3:		%{name}-locales.patch
+Patch4:		shebang-python-fix.patch
 URL:		http://www.calibre-ebook.com/
 BuildRequires:	ImageMagick-devel >= 6.6.4.7
 BuildRequires:	chmlib-devel
@@ -113,12 +111,10 @@
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 
 # 64bit target build fix
 %{__sed} -i -e "s!'/usr/lib'!'%{_libdir}'!g" setup/build_environment.py
@@ -252,6 +248,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2012/06/30 21:39:55  baggins
+- 0.8.58
+- poppler patch removed, pdf reflow is now in python
+
 Revision 1.146  2012/06/30 21:27:26  baggins
 - rel 6
 - package XDG stuff
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/calibre/calibre.spec?r1=1.146&r2=1.147