Browse Source

updated calibre

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@2164 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 14 years ago
parent
commit
287c53b42c
1 changed files with 76 additions and 27 deletions
  1. 76 27
      c/calibre/calibre-vl.spec

+ 76 - 27
c/calibre/calibre-vl.spec

@@ -1,10 +1,9 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name:           calibre
+Version:        0.7.25
+Release:        1%{?_dist_release}
 Summary:        E-book converter and library management
-Version:        0.7.18
-Release:        3%{?_dist_release}
-
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://calibre-ebook.com/
@@ -19,9 +18,10 @@ URL:            http://calibre-ebook.com/
 # ./generate-tarball.sh %{version}
 Source0:        %{name}-%{version}-nofonts.tar.xz
 Source1:        generate-tarball.sh
+Source2:	calibre-mount-helper
 Patch0:         %{name}-manpages.patch
 Patch1:         %{name}-no-update.patch
-Patch2:         %{name}-0.6.53-mounthelper.patch
+#Patch2:         %{name}-0.6.53-mounthelper.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	python >= 2.6
@@ -86,8 +86,8 @@ RTF, TXT, PDF and LRS.
 # don't check for new upstream version (that's what packagers do)
 %patch1 -p1 -b .no-update
 
-# Enable mount helper
-%patch2 -p1 -b .mounthelper
+# # Enable mount helper
+#%patch2 -p1 -b .mounthelper
 
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -221,37 +221,55 @@ done;
 	-e "s/iso639.mo/calibre_iso639.mo/" \
 	%{buildroot}%{_libdir}/%{name}/%{name}/utils/localization.py
 
-%{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall   
+%{__rm} -f %{buildroot}%{_bindir}/%{name}-uninstall
+
+%__cp -a %{SOURCE2} %{buildroot}%{_bindir}/
 
 %clean
 %{__rm} -rf %{buildroot}
 
 %post
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor || :
-
-%postun
-if [ $1 -eq 0 ] ; then
-    update-desktop-database &> /dev/null ||:
-    update-mime-database %{_datadir}/mime &> /dev/null || :
-    touch --no-create %{_datadir}/icons/hicolor || :
-    if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-	%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-    fi
+if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
+    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%posttrans
-update-desktop-database -q &> /dev/null
-update-mime-database %{_datadir}/mime >& /dev/null
+%postun
+update-desktop-database &> /dev/null ||:
+update-mime-database %{_datadir}/mime &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
     %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
 %files -f %{name}.lang
 
 %defattr(-,root,root,-)
 %doc COPYRIGHT LICENSE Changelog.yaml
-%{_bindir}/*
+%{_bindir}/calibre
+%{_bindir}/calibre-complete
+%{_bindir}/calibre-customize
+%{_bindir}/calibre-debug
+%{_bindir}/calibre-parallel
+%{_bindir}/calibre-server
+%{_bindir}/calibre-smtp
+%{_bindir}/calibre-mount-helper
+%{_bindir}/calibredb
+%{_bindir}/ebook-convert
+%{_bindir}/ebook-device
+%{_bindir}/ebook-meta
+%{_bindir}/ebook-viewer
+%{_bindir}/epub-fix
+%{_bindir}/fetch-ebook-metadata
+%{_bindir}/librarything
+%{_bindir}/lrf2lrs
+%{_bindir}/lrfviewer
+%{_bindir}/lrs2lrf
+%{_bindir}/markdown-calibre
+%{_bindir}/pdfmanipulate
+%{_bindir}/web2disk
 %config(noreplace) %{_sysconfdir}/bash_completion.d/
 %{_libdir}/%{name}
 %{_datadir}/%{name}
@@ -264,21 +282,52 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Tue Oct 12 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.7.18-3
-- rebuilt with poppler-0.14.2
+* Sun Oct 31 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.25-1
+- new upstream release
+
+  * Tue Oct 19 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.24-1
+  - Update to 0.7.24
 
-* Sat Oct  2 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.7.18-2
-- rebuilt with ImageMagick-6.6.4.8
-- added %%posttrans section
+  * Sat Oct 09 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.23-1
+  - Update to 0.7.23
+  - Fix up mount helper with our own local script. 
+  - Change files to list binaries so missing ones can more easily be noted. 
+
+  * Mon Oct 04 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.22-1
+  - Update to 0.7.22
+
+  * Fri Oct 01 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.21-1
+  - Update to 0.7.21
+
+  * Wed Sep 29 2010 jkeating - 0.7.20-2
+  - Rebuilt for gcc bug 634757
+
+  * Fri Sep 24 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.20-1
+  - Update to 0.7.20
+
+  * Wed Sep 15 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.18-3
+  - Rebuild for new ImageMagick
 
 * Wed Sep 29 2010 Munehiro Yamamoto <munepi@vinelinux.org> 0.7.18-1
 - new upstream release
 - Fix svg/png changes. 
 
+  * Mon Sep 13 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.18-2
+  - Fix svg/png changes. 
+
+  * Sun Sep 12 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.18-1
+  - Update to 0.7.18
+  - Require > 0.9.6 cssutils
+
+  * Fri Sep 03 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.17-1
+  - Update to 0.7.17
+
+  * Fri Aug 27 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.16-1
+  - Update to 0.7.16
+
 * Mon Aug 23 2010 Munehiro Yamamoto <munepi@vinelinux.org> - 0.7.15-1
 - initial build based on Fedora development
 
-
 * Sat Aug 21 2010 Kevin Fenzi <kevin@tummy.com> - 0.7.15-1
 - Update to 0.7.15