rpms/calibre/F-13 .cvsignore, 1.13, 1.14 calibre-manpages.patch, 1.1, 1.2 calibre.spec, 1.14, 1.15 generate-tarball.sh, 1.1, 1.2 sources, 1.13, 1.14
Ionuț Arțăriși
mapleoin at fedoraproject.org
Sun Apr 11 07:56:10 UTC 2010
- Previous message: rpms/player/F-13 player.spec,1.18,1.19
- Next message: rpms/calibre/F-12 .cvsignore, 1.14, 1.15 calibre-manpages.patch, 1.1, 1.2 calibre.spec, 1.16, 1.17 generate-tarball.sh, 1.1, 1.2 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mapleoin
Update of /cvs/pkgs/rpms/calibre/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9153
Modified Files:
.cvsignore calibre-manpages.patch calibre.spec
generate-tarball.sh sources
Log Message:
upstream release 0.6.47
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-13/.cvsignore,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- .cvsignore 26 Feb 2010 21:22:16 -0000 1.13
+++ .cvsignore 11 Apr 2010 07:56:09 -0000 1.14
@@ -1 +1 @@
-calibre-0.6.42-nofonts.tar.gz
+calibre-0.6.47-nofonts.tar.bz2
calibre-manpages.patch:
linux.py | 2 +-
utils/help2man.py | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
Index: calibre-manpages.patch
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-13/calibre-manpages.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- calibre-manpages.patch 1 Nov 2009 09:27:14 -0000 1.1
+++ calibre-manpages.patch 11 Apr 2010 07:56:09 -0000 1.2
@@ -1,32 +1,37 @@
diff -up calibre/src/calibre/linux.py.manpages calibre/src/calibre/linux.py
---- calibre/src/calibre/linux.py.manpages 2009-10-11 20:11:44.926081363 +0300
-+++ calibre/src/calibre/linux.py 2009-10-11 20:11:55.616050312 +0300
-@@ -331,7 +331,7 @@ class PostInstall:
+--- calibre/src/calibre/linux.py.manpages 2010-04-10 19:34:42.632332811 +0300
++++ calibre/src/calibre/linux.py 2010-04-10 19:34:50.404207554 +0300
+@@ -339,7 +339,7 @@ class PostInstall:
continue
parser = parser()
raw = create_man_page(prog, parser)
-- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+ manfile = os.path.join(manpath, prog+'.1')
- self.info('\tInstalling MAN page for', prog)
- open(manfile, 'wb').write(raw)
- self.manifest.append(manfile)
+- if isfreebsd:
++ if isfreebsd or islinux:
+ manfile = os.path.join(manpath, prog+'.1')
+ else:
+ manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
diff -up calibre/src/calibre/utils/help2man.py.manpages calibre/src/calibre/utils/help2man.py
---- calibre/src/calibre/utils/help2man.py.manpages 2009-10-11 20:12:24.795952999 +0300
-+++ calibre/src/calibre/utils/help2man.py 2009-10-11 20:12:52.463949704 +0300
-@@ -3,7 +3,7 @@ __license__ = 'GPL 3'
- __copyright__ = '2009, Kovid Goyal <kovid at kovidgoyal.net>'
+--- calibre/src/calibre/utils/help2man.py.manpages 2010-04-10 19:30:51.670926847 +0300
++++ calibre/src/calibre/utils/help2man.py 2010-04-10 19:32:27.842332121 +0300
+@@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi
__docformat__ = 'restructuredtext en'
--import time, bz2
-+import time
+ import time, bz2
+-from calibre.constants import isfreebsd
++from calibre.constants import isfreebsd, islinux
from calibre.constants import __version__, __appname__, __author__
-@@ -57,6 +57,6 @@ def create_man_page(prog, parser):
+@@ -58,9 +58,7 @@ def create_man_page(prog, parser):
lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
x in lines]
-- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
-+ return (u'\n'.join(lines).encode('utf-8'))
-
-
+- if not isfreebsd:
+- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+- else:
++ if isfreebsd or islinux:
+ return (u'\n'.join(lines)).encode('utf-8')
+-
+-
++ else:
++ return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-13/calibre.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- calibre.spec 26 Feb 2010 21:22:16 -0000 1.14
+++ calibre.spec 11 Apr 2010 07:56:09 -0000 1.15
@@ -1,5 +1,7 @@
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+
Name: calibre
-Version: 0.6.42
+Version: 0.6.47
Release: 1%{?dist}
Summary: E-book converter and library management
Group: Applications/Multimedia
@@ -14,11 +16,10 @@ URL: http://calibre-ebook.com
# Download the upstream tarball and invoke this script while in the tarball's
# directory:
# ./generate-tarball.sh %{version}
-Source0: %{name}-%{version}-nofonts.tar.gz
+Source0: %{name}-%{version}-nofonts.tar.bz2
Source1: generate-tarball.sh
Patch0: %{name}-manpages.patch
Patch1: %{name}-no-update.patch
-Patch2: %{name}-cssprofiles.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python >= 2.6
@@ -36,6 +37,8 @@ BuildRequires: python-dateutil
BuildRequires: python-imaging
BuildRequires: xdg-utils
BuildRequires: python-BeautifulSoup
+BuildRequires: chmlib-devel
+BuildRequires: python-cssutils
Requires: PyQt4
Requires: pyPdf
@@ -62,8 +65,8 @@ i.e. a single entry in the database that
formats. It also supports conversion to and from a dozen different ebook
formats.
-Supported input formats are: MOBI, LIT, PRC, EPUB, ODT, HTML, CBR, CBZ, RTF,
-TXT, PDF and LRS.
+Supported input formats are: MOBI, LIT, PRC, EPUB, CHM, ODT, HTML, CBR, CBZ,
+RTF, TXT, PDF and LRS.
%prep
%setup -q -n %{name}
@@ -75,10 +78,6 @@ TXT, PDF and LRS.
# don't check for new upstream version (that's what packagers do)
%patch1 -p1 -b .no-update
-# we've moved the profiles so we don't have to redistribute cssutils
-# until 0.9.6 comes to fedora
-%patch2 -p1 -b .cssprofiles
-
# dos2unix newline conversion
%{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -102,9 +101,6 @@ OVERRIDE_CFLAGS="%{optflags}" python set
%install
rm -rf %{buildroot}
-# this is the only file we need from the provided cssutils package
-cp -p src/cssutils/profiles.py src/calibre/css_profiles.py
-
mkdir -p %{buildroot}%{_datadir}
# create directories for xdg-utils
@@ -116,6 +112,10 @@ mkdir -p %{buildroot}%{_datadir}/mime/pa
mkdir -p %{buildroot}%{_datadir}/applications
mkdir -p %{buildroot}%{_datadir}/desktop-directories
+# create directory for calibre environment module
+# the install script assumes it's there.
+mkdir -p %{buildroot}%{python_sitelib}
+
XDG_DATA_DIRS="%{buildroot}%{_datadir}" \
XDG_UTILS_INSTALL_MODE="system" \
LIBPATH="%{_libdir}" \
@@ -123,7 +123,10 @@ python setup.py install --root=%{buildro
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--staging-libdir=%{buildroot}%{_libdir} \
-
+# remove shebang from init_calibre.py here because
+# it just got spawned by the install script
+%{__sed} -i -e '/^#!\//, 1d' %{buildroot}%{python_sitelib}/init_calibre.py
+
# icons
mkdir -p %{buildroot}%{_datadir}/pixmaps/
cp -p resources/images/library.png \
@@ -240,9 +243,17 @@ fi
%{_datadir}/mime/packages/*
%{_datadir}/icons/hicolor/scalable/mimetypes/*
%{_datadir}/icons/hicolor/scalable/apps/*
+%{python_sitelib}/init_calibre.py*
%{_mandir}/man1/*
%changelog
+* Sat Apr 10 2010 Ionuț C. Arțăriși <mapleoin at 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)
+
* Fri Feb 26 2010 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.42-1
- new upstream release 0.6.42
- remove shebang from default_tweaks.py
Index: generate-tarball.sh
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-13/generate-tarball.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- generate-tarball.sh 1 Nov 2009 09:27:14 -0000 1.1
+++ generate-tarball.sh 11 Apr 2010 07:56:09 -0000 1.2
@@ -2,8 +2,9 @@
VERSION=$1
+rm -rf calibre
tar -xvzf calibre-$VERSION.tar.gz
rm -f calibre/resources/fonts/liberation/*
rm -f calibre/resources/fonts/prs500/*
-tar -cvzf calibre-$VERSION-nofonts.tar.gz calibre
+tar -cvjf calibre-$VERSION-nofonts.tar.bz2 calibre
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-13/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources 26 Feb 2010 21:22:16 -0000 1.13
+++ sources 11 Apr 2010 07:56:09 -0000 1.14
@@ -1 +1 @@
-d964a1a0907b24573aafc7de94b32c83 calibre-0.6.42-nofonts.tar.gz
+6367195fc90386583963dc966258df60 calibre-0.6.47-nofonts.tar.bz2
- Previous message: rpms/player/F-13 player.spec,1.18,1.19
- Next message: rpms/calibre/F-12 .cvsignore, 1.14, 1.15 calibre-manpages.patch, 1.1, 1.2 calibre.spec, 1.16, 1.17 generate-tarball.sh, 1.1, 1.2 sources, 1.14, 1.15
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list