rpms/calibre/devel calibre-executables.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 calibre.spec, 1.8, 1.9 sources, 1.8, 1.9

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv730

Modified Files:
	.cvsignore calibre.spec sources 
Added Files:
	calibre-executables.patch 
Log Message:
new release: 0.6.32


calibre-executables.patch:
 install.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE calibre-executables.patch ---
diff -up calibre/setup/install.py.executables calibre/setup/install.py
--- calibre/setup/install.py.executables	2010-01-06 11:12:45.214637969 +0200
+++ calibre/setup/install.py	2010-01-06 11:12:58.056763017 +0200
@@ -185,7 +185,7 @@ class Develop(Command):
         script = template.format(
                 module=mod, func=func,
                 path=self.libdir, resources=self.sharedir,
-                executables=self.staging_bindir,
+                executables=self.bindir,
                 extensions=self.j(self.libdir, 'calibre', 'plugins'))
         path = self.j(self.staging_bindir, name)
         if not os.path.exists(self.staging_bindir):


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	19 Dec 2009 13:27:10 -0000	1.8
+++ .cvsignore	6 Jan 2010 09:48:28 -0000	1.9
@@ -1 +1 @@
-calibre-0.6.29-nofonts.tar.gz
+calibre-0.6.32-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/calibre.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- calibre.spec	19 Dec 2009 13:27:10 -0000	1.8
+++ calibre.spec	6 Jan 2010 09:48:28 -0000	1.9
@@ -1,5 +1,5 @@
 Name:           calibre
-Version:        0.6.29
+Version:        0.6.32
 Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
@@ -19,6 +19,7 @@ Source1:        generate-tarball.sh
 Patch0:         %{name}-cssprofiles.patch
 Patch1:         %{name}-manpages.patch
 Patch2:         %{name}-no-update.patch
+Patch3:         %{name}-executables.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python >= 2.6
@@ -35,6 +36,7 @@ BuildRequires:  python-lxml
 BuildRequires:  python-dateutil
 BuildRequires:  python-imaging
 BuildRequires:  xdg-utils
+BuildRequires:  python-BeautifulSoup
 
 Requires:       PyQt4
 Requires:       pyPdf
@@ -71,11 +73,16 @@ TXT, PDF and LRS.
 %patch0 -p1 -b .cssprofiles
 
 # 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
 %patch1 -p1 -b .manpages
 
 # don't check for new upstream version (that's what packagers do)
 %patch2 -p1 -b .no-update
 
+# don't write full buildpath in binary files 
+# http://bugs.calibre-ebook.com/ticket/4437
+%patch3 -p1 -b .executables
+
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
 
@@ -231,7 +238,7 @@ fi
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-%doc COPYRIGHT LICENSE
+%doc COPYRIGHT LICENSE Changelog.yaml
 
 %{_bindir}/*
 %config(noreplace) %{_sysconfdir}/bash_completion.d/
@@ -246,9 +253,11 @@ fi
 %{_mandir}/man1/*
 
 %changelog
-* Sat Dec 19 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.29-1
-- New upstream release
+* Wed Jan  6 2010 Ionuț C. Arțăriși <mapleoin at 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
 
 * Sun Dec  6 2009 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.26-1
 - New upstream version


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	19 Dec 2009 13:27:10 -0000	1.8
+++ sources	6 Jan 2010 09:48:28 -0000	1.9
@@ -1 +1 @@
-523d266c8f7e9adf10c9cb670e76ca6b  calibre-0.6.29-nofonts.tar.gz
+e6aca1d5def69ed4bf3bf350e4f23bb3  calibre-0.6.32-nofonts.tar.gz