- fix path to ImageMagick 6.8.x headers

- add paths to qt4 private headers
- updated files
- rel 1

diff --git a/calibre.spec b/calibre.spec
index 6cc3a686efbbc94b5b3b9b06c01c82409133bf12..5252b6bc3ce9ae075bd144d12d04a971049487ac 100644 (file)
--- a/calibre.spec
+++ b/calibre.spec
@@ -13,7 +13,7 @@ Summary:      E-book converter and library management
 Summary(pl.UTF-8):     Konwerter oraz biblioteka dla e-booków
 Name:          calibre
 Version:       0.9.35
-Release:       0.1
+Release:       1
 License:       GPL v3+
 Group:         Applications/Multimedia
 Source0:       %{name}-%{version}-nofonts.tar.xz
@@ -25,6 +25,8 @@ Patch1:               %{name}-no-update.patch
 Patch2:                %{name}-env_module.patch
 Patch3:                %{name}-locales.patch
 Patch4:                shebang-python-fix.patch
+Patch5:                imagemagick-6.8.patch
+Patch6:                qt4-private.patch
 URL:           http://www.calibre-ebook.com/
 BuildRequires: ImageMagick-devel >= 6.6.4.7
 BuildRequires: QtGui-devel
@@ -124,6 +126,8 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla calibre.
 %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
@@ -137,7 +141,7 @@ rm -f resources/localization/locales.zip
 %build
 CC="%{__cc}" \
 CXX=%{__cxx} \
-OVERRIDE_CFLAGS="%{rpmcflags} -I/usr/include/qt4/private" \
+OVERRIDE_CFLAGS="%{rpmcflags}" \
 OVERRIDE_LDFLAGS="%{rpmldflags}" \
 %{__python} setup.py build
 
@@ -210,7 +214,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc Changelog.yaml COPYRIGHT README
+%doc Changelog.yaml COPYRIGHT README.md
 %attr(755,root,root) %{_bindir}/calibre
 %attr(755,root,root) %{_bindir}/calibre-complete
 %attr(755,root,root) %{_bindir}/calibre-customize
@@ -223,8 +227,8 @@ fi
 %attr(755,root,root) %{_bindir}/ebook-convert
 %attr(755,root,root) %{_bindir}/ebook-device
 %attr(755,root,root) %{_bindir}/ebook-meta
+%attr(755,root,root) %{_bindir}/ebook-polish
 %attr(755,root,root) %{_bindir}/ebook-viewer
-%attr(755,root,root) %{_bindir}/epub-fix
 %attr(755,root,root) %{_bindir}/fetch-ebook-metadata
 %attr(755,root,root) %{_bindir}/lrf2lrs
 %attr(755,root,root) %{_bindir}/lrfviewer
@@ -237,6 +241,7 @@ fi
 %{_desktopdir}/calibre-gui.desktop
 %{_desktopdir}/calibre-lrfviewer.desktop
 %{_iconsdir}/hicolor/*/*/*.png
+%{_datadir}/mime/application/*.xml
 %{_datadir}/mime/packages/calibre-mimetypes.xml
 %{_pixmapsdir}/%{name}-gui.png
 %{_pixmapsdir}/calibre-viewer.png

diff --git a/imagemagick-6.8.patch b/imagemagick-6.8.patch
new file mode 100644 (file)
index 0000000..a700d8f
--- /dev/null
+++ b/imagemagick-6.8.patch
@@ -0,0 +1,31 @@
+--- calibre/setup/build_environment.py~        2013-06-14 14:05:26.545918167 +0200
++++ calibre/setup/build_environment.py 2013-06-14 14:08:05.417786156 +0200
+@@ -148,7 +148,7 @@
+     # Include directories
+     png_inc_dirs = pkgconfig_include_dirs('libpng', 'PNG_INC_DIR',
+         '/usr/include')
+-    magick_inc_dirs = pkgconfig_include_dirs('MagickWand', 'MAGICK_INC', '/usr/include/ImageMagick')
++    magick_inc_dirs = pkgconfig_include_dirs('MagickWand', 'MAGICK_INC', '/usr/include/ImageMagick-6')
+ 
+     # Library directories
+     png_lib_dirs = pkgconfig_lib_dirs('libpng', 'PNG_LIB_DIR', '/usr/lib64')
+--- calibre/src/calibre/utils/magick/generate.py~      2013-06-14 04:43:40.000000000 +0200
++++ calibre/src/calibre/utils/magick/generate.py       2013-06-14 14:08:45.158252817 +0200
+@@ -7,7 +7,7 @@
+ 
+ import os, textwrap, re, subprocess
+ 
+-INC = '/usr/include/ImageMagick'
++INC = '/usr/include/ImageMagick-6'
+ 
+ '''
+ Various constants defined in the ImageMagick header files. Note that
+@@ -42,7 +42,7 @@
+     '''%const
+     with open('/tmp/ig.c','wb') as f:
+         f.write(t)
+-    subprocess.check_call(['gcc', '-I/usr/include/ImageMagick', '/tmp/ig.c', '-o', '/tmp/ig', '-lMagickWand'])
++    subprocess.check_call(['gcc', '-I/usr/include/ImageMagick-6', '/tmp/ig.c', '-o', '/tmp/ig', '-lMagickWand'])
+     return int(subprocess.Popen(["/tmp/ig"],
+         stdout=subprocess.PIPE).communicate()[0].strip())
+ 

diff --git a/qt4-private.patch b/qt4-private.patch
new file mode 100644 (file)
index 0000000..a937c04
--- /dev/null
+++ b/qt4-private.patch
@@ -0,0 +1,11 @@
+--- calibre/setup/build_environment.py~        2013-06-14 14:10:30.722824622 +0200
++++ calibre/setup/build_environment.py 2013-06-14 14:15:07.539397931 +0200
+@@ -82,7 +82,7 @@
+ pyqt = pyqtconfig.Configuration()
+ 
+ qt_inc = pyqt.qt_inc_dir
+-qt_private_inc = []
++qt_private_inc = [ '/usr/include/qt4/private/include/QtGui', '/usr/include/qt4/private/include/QtCore' ]
+ qt_lib = pyqt.qt_lib_dir
+ ft_lib_dirs = []
+ ft_libs = []