updated calibre-vl.spec

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1970 ec354946-7b23-47d6-9f5a-488ba84defc7

c/calibre/calibre-vl.spec

@@ -1,7 +1,7 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
-Version:        0.7.15
+Version:        0.7.18
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -21,7 +21,6 @@ Source1:        generate-tarball.sh
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
 Patch2:         %{name}-0.6.53-mounthelper.patch
-Patch3:		%{name}-0.6.47-python-fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	python >= 2.6
@@ -79,9 +78,6 @@ RTF, TXT, PDF and LRS.
 %prep
 %setup -q -n %{name}
 
-# # remove redundant / non-free fonts
-# %__rm -rf resources/fonts/*
-
 # don't append calibre1 to the name of the manpages. No need to compress either
 # upstream won't fix: http://bugs.calibre-ebook.com/ticket/3770#comment:7
 %patch0 -p1 -b .manpages
@@ -91,7 +87,6 @@ RTF, TXT, PDF and LRS.
 
 # Enable mount helper
 %patch2 -p1 -b .mounthelper
-#% patch3 -p1 -b .python-fix
 
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -147,8 +142,8 @@ python setup.py install --root=%{buildroot}%{_prefix} \
 %__mkdir_p %{buildroot}%{_datadir}/pixmaps/
 %__cp -p resources/images/library.png \
 	%{buildroot}%{_datadir}/pixmaps/%{name}-gui.png
-%__cp -p resources/images/viewer.svg \
-	%{buildroot}%{_datadir}/pixmaps/calibre-viewer.svg
+%__cp -p resources/images/viewer.png \
+	%{buildroot}%{_datadir}/pixmaps/calibre-viewer.png
 
 # every file is empty here
 find %{buildroot}%{_datadir}/mime -maxdepth 1 -type f|xargs %__rm -f 
@@ -172,10 +167,10 @@ desktop-file-validate \
 %__mkdir_p %{buildroot}%{_datadir}/icons/hicolor/scalable
 %__mkdir_p %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes
 %__mkdir_p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
-%__cp -p resources/images/mimetypes/lrf.svg \
-    %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sony-bbeb.svg
-%__cp -p resources/images/viewer.svg \
-    %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/calibre-viewer.svg
+%__cp -p resources/images/mimetypes/lrf.png \
+    %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/application-x-sony-bbeb.png
+%__cp -p resources/images/viewer.png \
+    %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/calibre-viewer.png
 
 # don't put bash completions in /usr/etc
 %__mv %{buildroot}%{_prefix}%{_sysconfdir} %{buildroot}
@@ -263,58 +258,187 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Mon Aug 23 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.15-1
+* Wed Sep 29 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.18-1
+- new upstream release
+- Fix svg/png changes. 
+
+* Mon Aug 23 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 0.7.15-1
 - initial build based on Fedora development
 
-* Sun Aug 08 2010 Ahmad Samir <ahmadsamir@mandriva.org> 0.7.13-1mdv2010.1
-+ Revision: 567781
-- update to 0.7.13
 
-* Fri Aug 06 2010 Ahmad Samir <ahmadsamir@mandriva.org> 0.7.12-1mdv2011.0
-+ Revision: 567146
-- update to 0.7.12
+* Sat Aug 21 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.15-1
+- Update to 0.7.15
+
+* Thu Aug 19 2010 Rex Dieter <rdieter@fedoraproject.org> - 0.7.14-2
+- rebuild (poppler)
+
+* Fri Aug 13 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.14-1
+- Update to 0.7.14
+
+* Fri Aug 06 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.13-1
+- Update to 0.7.13
+
+* Mon Aug 02 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.12-1
+- Update to 0.7.12
+
+* Fri Jul 30 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.11-1
+- Update to 0.7.11
+
+* Fri Jul 30 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.10-2
+- Rebuilt for python2.7
+
+* Fri Jul 23 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.10-1
+- Update to 0.7.10
+
+* Sat Jul 17 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.9-1
+- Update to 0.7.9
+
+* Sun Jul 11 2010 Michal Nowak <mnowak@redhat.com> - 0.7.8-1
+- Update to 0.7.8
+- build tar.xz instead of tar.bz2
+
+* Fri Jul 02 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.7-1
+- Update to 0.7.7
+
+* Wed Jun 30 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.6-1
+- Update to 0.7.6 
+
+* Fri Jun 25 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.5-1
+- Update to 0.7.5
+
+* Sun Jun 20 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.4-1
+- Update to 0.7.4
+
+* Tue Jun 08 2010 Dan Horák <dan@danny.cz> - 0.7.1-2
+- rebuilt with podofo 0.8.1
+
+* Mon Jun 07 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.1-1
+- Update to 0.7.1
+- Added versioned dep on python-cssutils to make sure at least 0.9.6 is installed.
+
+* Fri Jun 04 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.0-1
+- Update to 0.7.0
+
+* Fri May 28 2010 Kevin Fenzi <kevin@tummy.com> - 0.6.55-1
+- Update to 0.6.55
+
+* Fri May 21 2010 Kevin Fenzi <kevin@tummy.com> - 0.6.54-1
+- Update to 0.6.54
+
+* Fri May 21 2010 Kevin Fenzi <kevin@tummy.com> - 0.6.53-1
+- Update to 0.6.53
+
+* Wed May  5 2010 Marcela Maslanova <mmaslano@redhat.com> - 0.6.47-2
+- Rebuild against new poppler
+
+* Sat Apr 10 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.47-1
+- new upstream release 0.6.47
+- new chmlib requirement
+- create directory for calibre's environment module
+- use bzip2 instead of gzip when preparing tarball in generate-tarball.sh
+- remove cssutils patches (we now have python-cssutils 0.9.6 in Fedora)
 
-* Thu Aug 05 2010 Funda Wang <fwang@mandriva.org> 0.7.10-3mdv2011.0
-+ Revision: 566253
-- rebuild for new poppler
+* Fri Feb 26 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.42-1
+- new upstream release 0.6.42
+- remove shebang from default_tweaks.py
 
-* Fri Jul 30 2010 Ahmad Samir <ahmadsamir@mandriva.org> 0.7.10-2mdv2011.0
-+ Revision: 563265
-- update manpage and no-update patches (from Fedora)
-- drop SOURCE1 and python-cssutils hack, it's not needed anymore as
-  python-cssutils has been updated to 0.9.7b3
-- build with optflags
-- delete mimeinfo.cache too
+* Mon Feb  1 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.37-1
+- new upstream release 0.6.37
 
-  + Juan Luis Baptiste <juancho@mandriva.org>
-    - Updated to 0.7.10, redo diff calibre-no-update.patch.
+* Fri Jan 29 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.36-1
+- new upstream release 0.6.36
+- fixed a cssprofiles issue with loading the profiles
 
-* Sat Jul 10 2010 Funda Wang <fwang@mandriva.org> 0.6.54-2mdv2011.0
-+ Revision: 549995
-- rebuild for new imagemagick
+* Tue Jan 26 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.35-3
+- added -cssprofiles patch to cvs 
 
-  + Tomas Kindl <supp@mandriva.org>
-    - various minor SPEC fixes and clean-ups
+* Tue Jan 26 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.35-2
+- remove python-cssutils 0.9.6 dependency
 
-  + Juan Luis Baptiste <juancho@mandriva.org>
-    - Updated to 0.6.54.
+* Mon Jan 25 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.35-1
+- new upstream release
+- fedora includes cssutils >= 0.9.6 now; removed the cssprofiles patch
+- removed -executables patch, upstream fixed it: http://bugs.calibre-ebook.com/ticket/4437
 
-* Tue Apr 20 2010 Tomas Kindl <supp@mandriva.org> 0.6.48-1mdv2010.1
-+ Revision: 537127
-- update to 0.6.48
-- fix python-odf and python-django-tagging dependency'
+* Wed Jan  6 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.32-2
+- fix for package tagged without adding new patch to cvs
 
-* Tue Apr 20 2010 Tomas Kindl <supp@mandriva.org> 0.6.47-3mdv2010.1
-+ Revision: 536983
-- fix incorrect odf-py require & bump release
-- fix incorrect odf-py require
+* Wed Jan  6 2010 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.32-1
+- new upstream release 0.6.32
+- project website has changed
+- added python-BeautifulSoup BuildRequire
+- new patch to fix full buildpath in binary files
 
-* Mon Apr 19 2010 Tomas Kindl <supp@mandriva.org> 0.6.47-2mdv2010.1
-+ Revision: 536555
-- enable PoDoFo dependency as we have PoDoFo in MDV now
+* Sun Dec  6 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.26-1
+- New upstream version
+- Regenerated no-update patch because of code relocation
 
-* Sun Apr 18 2010 Tomas Kindl <supp@mandriva.org> 0.6.47-1mdv2010.1
-+ Revision: 536529
-- initial import containing all pertinent fixes to ensure it will build on Mandriva...
-- create calibre
+* Wed Dec  2 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.25-1
+- New upstream release
 
+* Wed Nov 18 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.24-1
+- New upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2416Nov2009
+
+* Mon Nov 16 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.23-1
+- new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2313Nov2009
+- patch to stop checking for new upstream version
+
+* Sat Nov  7 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.21-1
+- new upstream version: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.2106Nov2009
+- added python-BeautifulSoup requirement
+
+* Wed Nov  4 2009 Ionuț Arțăriși <mapleoin@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@fedoraproject.org> - 0.6.19-3
+- removed unfree fonts from source package
+
+* Thu Oct 22 2009 Ionuț C. Arțăriși <mapleoin@fedoraproject.org> - 0.6.19-2
+- readability enhancements
+- added python-genshi requires
+- removed libwmf require since ImageMagick provides libwmf-lite as a
+  dependency and that's what we actually need
+
+* Wed Oct 21 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> - 0.6.19-1
+- new upstream version:
+  http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1920Oct2009
+- delete fonts, calibre can find the system fonts
+- specify libdir as an install option, so calibre will link properly
+  even on 64bit
+
+* Mon Oct 19 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> - 0.6.18-1
+- updated requires list
+- new upstream release
+- can override CFLAGS now
+- removed trac and genshi duplicates
+- use xdg env variables to do desktop integration in the buildroot
+- added xdg-utils buildrequire
+- install udev rules in /usr/lib even on 64bit and don't own the whole dir
+- removed wrongly used Version field from .desktop files
+
+* Mon Oct 12 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> - 0.6.17-2
+- mimick what calibre's desktop-integration script does (mimetypes, icons etc.)
+- removed unneeded INSTALL file
+- marked bash completion file as config(noreplace) and take ownership of the dir
+
+* Sat Oct 10 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> - 0.6.17-1
+- new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1709Oct2009
+- the install process changed significantly
+- locales were added
+
+* Thu Sep 10 2009 Ionuț Arțăriși <mapleoin@lavabit.com> - 0.6.11-1
+- new upstream release: http://calibre.kovidgoyal.net/wiki/Changelog#Version0.6.1104Sep2009
+- minor path fixes
+- rearranged files section
+
+* Fri Aug 28 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> 0.6.10-1
+- handle desktop files
+- don't compress manpages and don't list them as duplicates
+- added lrfviewer icon
+
+* Tue Aug 25 2009 Ionuț Arțăriși <mapleoin@fedoraproject.org> 0.6.8-1
+- Initial RPM release