rpms/calibre/F-12 .cvsignore, 1.10, 1.11 calibre.spec, 1.10, 1.11 sources, 1.10, 1.11 calibre-cssprofiles.patch, 1.1, NONE

[Ionuț Arțăriși]

Author: mapleoin

Update of /cvs/pkgs/rpms/calibre/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3074

Modified Files:
	.cvsignore calibre.spec sources 
Removed Files:
	calibre-cssprofiles.patch 
Log Message:
new release 0.6.25


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	6 Jan 2010 10:09:48 -0000	1.10
+++ .cvsignore	25 Jan 2010 12:57:37 -0000	1.11
@@ -1 +1 @@
-calibre-0.6.32-nofonts.tar.gz
+calibre-0.6.35-nofonts.tar.gz


Index: calibre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/calibre.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- calibre.spec	6 Jan 2010 10:22:33 -0000	1.10
+++ calibre.spec	25 Jan 2010 12:57:37 -0000	1.11
@@ -1,6 +1,6 @@
 Name:           calibre
-Version:        0.6.32
-Release:        2%{?dist}
+Version:        0.6.35
+Release:        1%{?dist}
 Summary:        E-book converter and library management
 Group:          Applications/Multimedia
 License:        GPLv3
@@ -16,10 +16,8 @@ URL:            http://calibre-ebook.com
 # ./generate-tarball.sh %{version}
 Source0:        %{name}-%{version}-nofonts.tar.gz
 Source1:        generate-tarball.sh
-Patch0:         %{name}-cssprofiles.patch
-Patch1:         %{name}-manpages.patch
-Patch2:         %{name}-no-update.patch
-Patch3:         %{name}-executables.patch
+Patch0:         %{name}-manpages.patch
+Patch1:         %{name}-no-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python >= 2.6
@@ -41,7 +39,7 @@ BuildRequires:  python-BeautifulSoup
 Requires:       PyQt4
 Requires:       pyPdf
 Requires:       python-cherrypy
-Requires:       python-cssutils
+Requires:       python-cssutils >= 0.9.6
 Requires:       ImageMagick
 Requires:       odfpy
 Requires:       django-tagging
@@ -69,19 +67,12 @@ TXT, PDF and LRS.
 %prep
 %setup -q -n %{name}
 
-# we've moved the profiles so we don't have to redistribute cssutils
-%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
+%patch0 -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
+%patch1 -p1 -b .no-update
 
 # dos2unix newline conversion
 %{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
@@ -253,6 +244,11 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 25 2010 Ionuț C. Arțăriși <mapleoin at 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
+
 * Wed Jan  6 2010 Ionuț C. Arțăriși <mapleoin at fedoraproject.org> - 0.6.32-2
 - fix for package tagged without adding new patch to cvs
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/calibre/F-12/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	6 Jan 2010 10:09:48 -0000	1.10
+++ sources	25 Jan 2010 12:57:38 -0000	1.11
@@ -1 +1 @@
-e6aca1d5def69ed4bf3bf350e4f23bb3  calibre-0.6.32-nofonts.tar.gz
+9b66732ea5872666fdd05e933c1703df  calibre-0.6.35-nofonts.tar.gz


--- calibre-cssprofiles.patch DELETED ---