Author: arekm Date: Sun May 27 15:02:57 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 0.8.53; man pages no longer in upstream package
---- Files affected:
packages/calibre:
calibre.spec (1.137 -> 1.138) , calibre-manpages.patch (1.2 -> NONE)
(REMOVED)
---- Diffs:
================================================================
Index: packages/calibre/calibre.spec
diff -u packages/calibre/calibre.spec:1.137 packages/calibre/calibre.spec:1.138
--- packages/calibre/calibre.spec:1.137 Thu May 24 14:58:53 2012
+++ packages/calibre/calibre.spec Sun May 27 17:02:51 2012
@@ -14,20 +14,21 @@
Summary: E-book converter and library management
Summary(pl.UTF-8): Konwerter oraz biblioteka dla e-booków
Name: calibre
-Version: 0.8.39
-Release: 2
+Version: 0.8.53
+Release: 1
License: GPL v3+
Group: Applications/Multimedia
Source0: %{name}-%{version}-nofonts.tar.xz
-# Source0-md5: 584549a7d76004131aeb36ec7d62439e
+# Source0-md5: 78785f551169af48f7334785cd1c6d2e
Source1: generate-tarball.sh
Source2: %{name}-mount-helper
Patch0: %{name}-prefix.patch
-Patch1: %{name}-manpages.patch
+
Patch2: %{name}-no-update.patch
Patch3: %{name}-env_module.patch
Patch4: %{name}-locales.patch
Patch5: shebang-python-fix.patch
+Patch6: calibre-0.8.21-poppler.patch
URL: http://www.calibre-ebook.com/
BuildRequires: ImageMagick-devel >= 6.6.4.7
BuildRequires: chmlib-devel
@@ -112,11 +113,12 @@
%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
@@ -145,8 +147,6 @@
%py_comp $RPM_BUILD_ROOT%{_libdir}/%{name}
%py_postclean %{_libdir}/%{name}
-# move manpages and locales to proper place
-mv $RPM_BUILD_ROOT%{_datadir}/%{name}/man $RPM_BUILD_ROOT%{_mandir}
mv $RPM_BUILD_ROOT%{_datadir}/%{name}/localization/locales
$RPM_BUILD_ROOT%{_datadir}/locale
# set proper filenames for locales (TODO: switch to patch if possible)
@@ -206,7 +206,6 @@
%attr(755,root,root) %{_bindir}/web2disk
%{_datadir}/%{name}
%{_libdir}/%{name}
-%{_mandir}/man1/*.1*
%files -n bash-completion-calibre
%defattr(644,root,root,755)
@@ -218,6 +217,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.138 2012/05/27 15:02:51 arekm
+- up to 0.8.53; man pages no longer in upstream package
+
Revision 1.137 2012/05/24 12:58:53 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/packages/calibre/calibre.spec?r1=1.137&r2=1.138
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
