Mailinglist Archive: opensuse-commit (861 mails)
| < Previous | Next > |
commit calibre for openSUSE:Factory
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 18 Jan 2011 02:18:31 +0100
- Message-id: <20110118011831.41B3B20259@hilbert.suse.de>
Hello community,
here is the log from the commit of package calibre for openSUSE:Factory
checked in at Tue Jan 18 02:18:31 CET 2011.
--------
--- calibre/calibre.changes 2010-07-29 08:39:27.000000000 +0200
+++ calibre/calibre.changes 2011-01-17 12:20:37.000000000 +0100
@@ -1,0 +2,1178 @@
+Fri Jan 14 22:15:01 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- reformatted complete calibre.changes file:
+ openSUSE:Factory requires a linewidth < 70
+ (refer to the dashed lines for linewidth)
+
+-------------------------------------------------------------------
+Thu Jan 13 09:35:04 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- removed Require: python-django-tagging since it is no longer
+ needed (searched the calibre sources for "tagging" and "django")
+
+- added packages that are only required, to BuildRequires, too,
+ because
+
+ Requires should always be a subset of BuildRequires. If there
+ are packages that are only Required
+ * there is no way to check whether these packages are available
+ in the given repositories unless you install the package (the
+ build environment only contains packages from the given
+ repositories and the project
+ * the project's repository might become inconsistent, because
+ Required packages do not block a build. So a package might get
+ published, although a Required package does not build
+
+-------------------------------------------------------------------
+Wed Jan 12 16:01:20 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- another Requires fix
+
+-------------------------------------------------------------------
+Wed Jan 12 15:38:19 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- fixed Requires; made Buildrequires/Requires section in spec file
+ readable
+
+-------------------------------------------------------------------
+Wed Jan 12 10:24:30 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- added a patch so calibre works with python-cssutils 0.9.8
+ (needs to be removed once calibre officially switches to the new
+ python-cssutils version)
+- fixed a minor spec-file error
+
+-------------------------------------------------------------------
+Tue Jan 11 15:06:14 UTC 2011 - fsundermeyer@xxxxxxxxxxxx
+
+- general project changes:
+ * removed all packages alre3ady provided by targets
+ * remaining packages only build for the targets where they are
+ needed
+ * python packages now all link to devel:languages:python
+ * podofo now links to graphics
+ * removed obsolete 11.1 build target
+ * removed 11.3 KDE_Factory build target
+
+- calibre changes:
+ * fixed various issues in the spec file - now builds for Factory
+ * cleaned up the spec file
+ * added rpmlintrc (no need to remove all the shebangs)
+ * generate-tarball.sh uses a tmp dir now and is less verbose
+ * updated to new version 0.7.38
+ Changelog see http://calibre-ebook.com/whats-new
+
+-------------------------------------------------------------------
+Fri Jan 7 10:26:59 UTC 2011 - saigkill@xxxxxxxxxxxx
+
+- added %%dir %%{_datadir}/locale/* for 11.1 & 11.2
+
+-------------------------------------------------------------------
+Fri Dec 24 11:17:22 UTC 2010 - saigkill@xxxxxxxxxxxx
+
+- updated to 0.7.35
+- New Features
+ o Add a simple to use Rich text editor for comments to the
+ edit metadata dialog.
+ o E-book viewer: Add a right click menu item 'Inspect'
+ that allows you to inspect the underlying HTML/CSS
+ source of the currently displayed content
+ o When deleting books from the library if a device is
+ connected and the books are also present on the device
+ ask the user if the books should be deleted from the
+ device, the library, or both.
+ o Add device drivers for Trekstore eBook Player 7, Sanda
+ Bambook, ALuratek Color, Samsung Galaxy, LG Optimus,
+ Motorola Droid 2 and Sunstech EB700
+ o Add an entry to the menu of the calibre library button
+ to select a random book from your calibre library
+ o SONY driver: Add a couple of special extra collections
+ for all books by author and all books by title, to
+ workaround the broken sorting on newer SONY models. To
+ enable these collections, go to
+ Preferences->Plugins->Device Interface plugins and
+ customize the SONY plugin.
+ o Edit metadata dialog: When downloading metadata, make
+ the table of matching books sortable
+ o Add a success message after a database integrity check
+ completes successfully
+ o Search and replace: When using regular expression mode,
+ add a special input field '{template}' that allows use
+ the templating language to create complex input
+ fields. Also allow setting of series_index by search and
+ replace using the same syntax as in the book list,
+ namely, Series Name [series number]
+ o Bulk metadata edit: Add option to automatically set
+ cover from the cover present in the actual ebook files
+ o E-book viewer: Show format of current book in the title
+ bar.
+ o Add a tweak to control how author names are displayed in
+ the Tag Browser and Content Server
+ o FB2 Output: Restore sectionizing functionality
+- Bug Fixes
+ o When in narrow layout, reserve 40% of available width in
+ the book details panel for series/formats/etc and use
+ the rest for comments
+ o PDB Input: Fix failure to block-indent PML sections
+ o Tag browser: When renaming items dont reset the library
+ view and try not to scroll the Tag Browser itself
+ o Conversion pipeline: Fix broken link rewriting for
+ inline CSS embedded in HTML
+ o Fix regression in 0.7.34 that broke recipes using
+ extra_css to link to SONY device fonts
+ o SONY driver: Don't upload thumbnails as they slow down
+ post disconnect processing on older models
+ o Content server: Fix a bug that allowed remote users to
+ read arbitrary png/gif/js/css/html files
+ o On X11 initialize fontconfig in the GUI thread as Qt
+ also uses fontconfig internally and fontconfig is not
+ thread safe. Fixes a few random crashes on calibre
+ strartup
+ o When using the remove specific format actions, only show
+ available formats in the selected books
+ o Linux binary build: If setting system default locale
+ fails, try setting locale to en_US.UTF-8 instead
+ o Have the title sort tweak respected everywhere
+ o PocketBook 701 driver: Swap the main memory and card
+ drives on windows
+ o Fix regression in templating that caused series_index to
+ be shown even when book had no series
+ o Content server: Fix regressiont hat broke browsing by
+ rating
+ o Content server OPDS feeds: Fix parsing of author names
+ as XML
+
+-------------------------------------------------------------------
+Sat Dec 18 00:20:48 UTC 2010 - saigkill@xxxxxxxxxxxx
+
+- updated to 0.7.34
+- New Features
+ o Page turn animations in the e-book viewer
+ o Conversion pipeline: Add an option to set the minimum line
+ height of all elemnts as a percentage of the computed font
+ size. By default, calibre now sets the line height to 120% of
+ the computed font size.
+ o Large speedup in startup times and post metadata edit wait
+ for large libraries
+ o Allow changing the font used in the calibre interface via
+ Preferences->Look and feel
+ o Allow editing of the title sort value for a book via the
+ edit metadata dialog
+ o Disable the cover cache. This means that if you are running
+ calibre on an underpowered machine, you might notice some slow
+ down in the cover browser. On the other hand, calibre's memory
+ consumption is reduced.
+ o You can now restart calibre in debug mode by clicking the
+ arrow next to the Preferences button. In debug mode, after you
+ quit calibre, a diagnostic log will popup
+ o When creating a new calibre library add an option to copy
+ the custom column, saved searches, etc from the current
+ library.
+ o Add more tweaks to control how the next available series
+ number is calculated.
+ o Add a tweak to control layout of the custom metadata tab in
+ the edit metadata dialog
+ o Apple driver: Set series number as track number on windows
+ when sending books to iTunes
+ o Drivers for PocketBook 701 and Samsung E65
+ o E-book viewer: Add option to have the mouse wheel flip pages
+ o Add a load_resources method to the InterfaceAction and
+ Plugin classes to facilitate loading of resources from plugin
+ ZIP files
+ o E-book viewer: Add option to not remember position in book
+ when quitting.
+ o When sorting the book list, keep the current book visible
+ after the sort completes.
+ o EPUB Output: Add an option to flatten the EPUB file
+ structure, specially for FBReaderJ.
+ o EPUB Output: Ensure all files inside the generated EPUB have
+ unique filenames, to support broken EPUB readers like Stanza,
+ Aldiko, FBReader and Sigil
+ o FB2 Output: Add support for some 2.1 style tags.
+ o Bulk metadata edit: Add options to delete cover/generate
+ default cover.
+ o Fix a regression in 0.7.33 that broke updating covers in
+ ebook files when saving to disk.
+ o Don't refresh the Tag browser if it is hidden. Speeds up
+ metadata editing with large libraries, if you hide the Tag
++++ 1723 more lines (skipped)
++++ between calibre/calibre.changes
++++ and calibre/calibre.changes
calling whatdependson for head-i586
Old:
----
calibre-0.6.53.tar.bz2
New:
----
calibre-0.7.38-nofonts.tar.bz2
calibre-cssutils.diff
generate-tarball.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ calibre.spec ++++++
--- /var/tmp/diff_new_pack.qv9Yfk/_old 2011-01-18 02:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.qv9Yfk/_new 2011-01-18 02:15:27.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package calibre (Version 0.6.53)
+# spec file for package calibre
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,44 +19,96 @@
Summary: EBook Management Application
Name: calibre
-Version: 0.6.53
-Release: 5
-Source0: %{name}-%{version}.tar.bz2
-Source1: %{name}-rpmlintrc
+Version: 0.7.38
+Release: 1
+Url: http://calibre-ebook.com
+Group: Productivity/Other
+License: GPL3
+Source0: %{name}-%{version}-nofonts.tar.bz2
Source2: %{name}.desktop
Source3: %{name}.png
-Patch0: %{name}-setup.install.py.diff
-Patch1: %{name}-l18n.diff
-Patch2: %{name}-no-update-manpage.diff
+Source4: generate-tarball.sh
+# saigkill@xxxxxxxxxxxx 09/5/10 --fixes LC_MESSAGES stuff
+# see http://bugs.calibre-ebook.com/ticket/3770
+Patch0: %{name}-l18n.diff
+# saigkill@xxxxxxxxxxxx 09/5/10 --fixes man issues
+# see http://bugs.calibre-ebook.com/ticket/3770
+Patch1: %{name}-no-update-manpage.diff
+# saigkill@xxxxxxxxxxxx 09/5/10 --adjust installion
+Patch2: %{name}-setup.install.py.diff
+# make calibre work with python-cssutils 0.9.8
+Patch3: %{name}-cssutils.diff
+
+#
+# A note on BuildRequires and Requires:
+#
+# Requires should always be a subset of BuildRequires. If there are packages
+# that are only Required
+# * there is no way to check whether these packages are available in the given
+# repositories unless you install the package (the build environment only
+# contains packages from the given repositories and the project
+# * the project's repository might become inconsistent, because Required
+# packages do not block a build. So a package might get published, although
+# a Required package does not build
-License: GPL3
-Group: Productivity/Other
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: update-desktop-files
-BuildRequires: python-devel python-qt4-devel >= 4.5.0
-BuildRequires: python-setuptools python-sip-devel
-BuildRequires: python-dateutil >= 1.4.1
-BuildRequires: help2man libqt4-devel >= 4.6.0
-#BuildRequires: libpodofo0_6_99-devel podofo
-BuildRequires: libpodofo-devel podofo
-BuildRequires: python-beautifulsoup >= 3.0.5
-BuildRequires: python-mechanize >= 0.1.11
BuildRequires: chmlib-devel >= 0.40
-BuildRequires: python-lxml >= 2.1.5
-BuildRequires: python-imaging >= 1.1.6
-BuildRequires: python-cssutils >= 0.9.7a2
+BuildRequires: fdupes
+BuildRequires: help2man
+BuildRequires: ImageMagick-devel
+BuildRequires: liberation-fonts
+BuildRequires: libicu-devel
+BuildRequires: libpodofo-devel
+BuildRequires: libpoppler-qt4-devel >= 0.12.0
+BuildRequires: libqt4-devel >= 4.5.0
BuildRequires: libwmf-devel >= 0.2.8
-BuildRequires: libpoppler-qt4-devel >= 0.12.0 poppler
-BuildRequires: ImageMagick-devel fdupes xdg-utils
-# python-dnspython
-Requires: python-imaging dbus-1-python python-lxml python-mechanize
-Requires: python-beautifulsoup python-dateutil hal
-Requires: python-cssutils
+BuildRequires: podofo
+BuildRequires: poppler >= 0.12.0
+BuildRequires: python-beautifulsoup >= 3.0.5
+BuildRequires: python-cherrypy
+BuildRequires: python-cssutils >= 0.9.7a2
+BuildRequires: python-dateutil >= 1.4.1
+BuildRequires: python-devel
+BuildRequires: python-dnspython
+# python-genshi is a required package, see above
+BuildRequires: python-genshi
+BuildRequires: python-imaging >= 1.1.6
+BuildRequires: python-lxml >= 2.2.1
+BuildRequires: python-mechanize >= 0.1.11
+BuildRequires: python-odfpy
+BuildRequires: python-pypdf
+BuildRequires: python-qt4-devel >= 4.5.0
+BuildRequires: python-setuptools
+BuildRequires: python-sip-devel
+BuildRequires: update-desktop-files
+BuildRequires: xdg-utils
+
+Requires: chmlib >= 0.40
+Requires: dbus-1-python
+Requires: hal
+Requires: ImageMagick
+Requires: liberation-fonts
+Requires: poppler-qt4 >= 0.12.0
+Requires: libqt4 >= 4.5.0
+Requires: podofo
+Requires: python-beautifulsoup >= 3.0.5
+Requires: python-cherrypy
+Requires: python-cssutils >= 0.9.7a2
+Requires: python-dateutil >= 1.4.1
+Requires: python-dnspython
+Requires: python-genshi
+Requires: python-imaging >= 1.1.6
+Requires: python-lxml >= 2.2.1
+Requires: python-mechanize >= 0.1.11
+Requires: python-odfpy
+Requires: python-pypdf
+Requires: python-qt4 >= 4.5.0
Requires: python-setuptools
+Requires: python-sip
+Requires: python-genshi
Requires: xdg-utils
-# %{py_requires}
-# Vendor: Kovid Goyal <kovid@xxxxxxxxxxxxxx>
-Url: http://calibre-ebook.com
+
+%{py_requires}
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
# http://lists.opensuse.org/opensuse-packaging/2009-08/msg00110.html
%description
@@ -77,19 +129,27 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3
+
+# dos2unix newline conversion
+%{__sed} -i 's/\r//' src/calibre/web/feeds/recipes/*
+
+# remove the executable flag from files
+find src/calibre -name "*.py" -type f | xargs %{__chmod} -x
+%{__chmod} -x resources/recipes/*
-# Fix line endings to avoid rpmlint warning:
-#find -name "*.py" | xargs sed -i 's/\r//'
%{__cp} -v %{S:2} %{S:3} .
%build
+#export CFLAGS="$CFLAGS $RPM_OPT_FLAGS"
+#OVERRIDE_CFLAGS="% { optflags } -fno-strict-aliasing"
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
%{__python} setup.py build
%install
+rm -rf %{buildroot}
%{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/udev/rules.d/ \
- $RPM_BUILD_ROOT/usr/share/qt4/translations/ \
-# $RPM_BUILD_ROOT%{_mandir}/man1
+ $RPM_BUILD_ROOT/usr/share/qt4/translations/
%{__python} setup.py install \
--prefix=%{_prefix} \
@@ -99,55 +159,40 @@
--staging-sharedir=$RPM_BUILD_ROOT%{_datadir} \
--staging-mandir=$RPM_BUILD_ROOT%{_mandir} \
--libdir=%{_libdir}
-# --record=%{name}.files \
-# --record-rpm=%{name}.files
-%suse_update_desktop_file -i -n calibre Office Viewer Literature
+%suse_update_desktop_file -i -n calibre Office Viewer
%find_lang %{name}
%find_lang iso639
-# Fix udev rules
-if [ -e $RPM_BUILD_ROOT/lib/udev/rules.d/95-calibre.rules ]; then
- pushd $RPM_BUILD_ROOT
- %{__mv} ./lib/udev/rules.d/95-calibre.rules \
- ./%{_sysconfdir}/udev/rules.d/
- %{__rm} -rf ./lib/udev/
- popd
-fi
-
-# Remove any remaining executable bits to avoid rpmlint warnings
-pushd $RPM_BUILD_ROOT%{_libdir}/%{name}/
-for i in $(find -type f -name *.py); do
- %{__chmod} -x $i
-done
-popd
-
%fdupes $RPM_BUILD_ROOT%{_libdir}/%{name}/
%fdupes $RPM_BUILD_ROOT%{_datadir}/%{name}/
+# packages aren't allowed to register mimetypes like this
+rm -f %{buildroot}%{_datadir}/applications/defaults.list
+
+# these are provided as separate packages
+rm -rf %{buildroot}%{_libdir}/%{name}/{odf,cherrypy,pyPdf,encutils,cssutils}
+rm -rf %{buildroot}%{_libdir}/%{name}/cal/utils/genshi
+rm -rf %{buildroot}%{_libdir}/%{name}/cal/trac
+
%clean
[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && %{__rm} -rf
$RPM_BUILD_ROOT
-#
-
%files -f %{name}.lang -f iso639.lang
%defattr(-,root,root)
%config %{_sysconfdir}/bash_completion.d/%{name}
-%config %{_sysconfdir}/udev/rules.d/95-calibre.rules
-%dir %{_sysconfdir}/udev
-%dir %{_sysconfdir}/udev/rules.d/
%{_bindir}/*
%exclude %{_bindir}/calibre-uninstall
%{_libdir}/%{name}/
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/%{name}/
-%if 0%{?suse_version} == 1110
-%{_datadir}/locale/*/LC_MESSAGES/calibre.mo
+# # these languages are not supported
+%if 0%{?suse_version} <= 1130
+%exclude %{_datadir}/locale/ast/LC_MESSAGES/*
%endif
+%exclude %{_datadir}/locale/sc/LC_MESSAGES/*
%{_mandir}/man1/*
-#%files -f %{name}.lang
-
%changelog
++++++ calibre-cssutils.diff ++++++
--- src/calibre/ebooks/oeb/stylizer.py 2011-01-12 10:26:25.108920983 +0100
+++ src/calibre/ebooks/oeb/stylizer.py_new 2011-01-12 10:40:56.797983394
+0100
@@ -17,7 +17,14 @@
from xml.dom import SyntaxErr as CSSSyntaxError
import cssutils
from cssutils.css import CSSStyleRule, CSSPageRule, CSSStyleDeclaration, \
- CSSValueList, CSSFontFaceRule, cssproperties
+ CSSFontFaceRule, cssproperties
+#
+# In python-cssutils >= 0.9.8 no CSSValueList is replaced with PropertyValue
+#
+try:
+ from cssutils.css import CSSValueList
+except ImportError:
+ from cssutils.css import PropertyValue as CSSValueList
from cssutils import profile as cssprofiles
from lxml import etree
from lxml.cssselect import css_to_xpath, ExpressionError, SelectorSyntaxError
++++++ calibre-no-update-manpage.diff ++++++
--- /var/tmp/diff_new_pack.qv9Yfk/_old 2011-01-18 02:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.qv9Yfk/_new 2011-01-18 02:15:27.000000000 +0100
@@ -1,27 +1,7 @@
-diff -x '*~' -Naur calibre.bak//src/calibre/gui2/ui.py
calibre/src/calibre/gui2/ui.py
---- calibre.bak//src/calibre/gui2/ui.py 2010-05-01 01:20:07.000000000
+0200
-+++ calibre/src/calibre/gui2/ui.py 2010-05-05 08:59:34.000000000 +0200
-@@ -251,11 +251,11 @@
- self.latest_version = ' '
- self.vanity.setText(self.vanity_template%dict(version=' ', device='
'))
- self.device_info = ' '
-- if not opts.no_update_check:
-- self.update_checker = CheckForUpdates(self)
-- QObject.connect(self.update_checker,
-- SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-- self.update_checker.start(2000)
-+ #if not opts.no_update_check:
-+ # self.update_checker = CheckForUpdates(self)
-+ # QObject.connect(self.update_checker,
-+ # SIGNAL('update_found(PyQt_PyObject)'), self.update_found)
-+ # self.update_checker.start(2000)
- ####################### Status Bar #####################
- self.status_bar = StatusBar(self.jobs_dialog, self.system_tray_icon)
- self.setStatusBar(self.status_bar)
diff -x '*~' -Naur calibre.bak//src/calibre/linux.py
calibre/src/calibre/linux.py
---- calibre.bak//src/calibre/linux.py 2010-05-01 01:20:06.000000000 +0200
-+++ calibre/src/calibre/linux.py 2010-05-05 09:46:20.000000000 +0200
-@@ -326,10 +326,11 @@
+--- calibre.bak//src/calibre/linux.py 2010-06-05 02:38:19.000000000 +0200
++++ calibre/src/calibre/linux.py 2010-06-05 21:12:56.837641453 +0200
+@@ -291,10 +291,11 @@
if isfreebsd:
manpath = os.path.join(self.opts.staging_root, 'man/man1')
else:
@@ -35,7 +15,7 @@
for src in entry_points['console_scripts']:
prog, right = src.split('=')
prog = prog.strip()
-@@ -342,7 +343,7 @@
+@@ -307,7 +308,7 @@
if isfreebsd:
manfile = os.path.join(manpath, prog+'.1')
else:
@@ -45,8 +25,8 @@
open(manfile, 'wb').write(raw)
self.manifest.append(manfile)
diff -x '*~' -Naur calibre.bak//src/calibre/utils/help2man.py
calibre/src/calibre/utils/help2man.py
---- calibre.bak//src/calibre/utils/help2man.py 2010-05-01 01:20:07.000000000
+0200
-+++ calibre/src/calibre/utils/help2man.py 2010-05-05 09:19:03.000000000
+0200
+--- calibre.bak//src/calibre/utils/help2man.py 2010-06-05 02:38:20.000000000
+0200
++++ calibre/src/calibre/utils/help2man.py 2010-06-05 21:14:49.376641317
+0200
@@ -3,7 +3,7 @@
__copyright__ = '2009, Kovid Goyal <kovid@xxxxxxxxxxxxxx>'
__docformat__ = 'restructuredtext en'
@@ -56,11 +36,12 @@
from calibre.constants import isfreebsd
from calibre.constants import __version__, __appname__, __author__
-@@ -59,7 +59,14 @@
+@@ -59,7 +59,15 @@
x in lines]
if not isfreebsd:
- return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
++# return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+ buf = StringIO.StringIO()
+ f = gzip.GzipFile(mode="wb", fileobj=buf)
+ try:
@@ -68,7 +49,7 @@
+ finally:
+ f.close()
+ return buf.getvalue()
-+ #return bz2.compress((u'\n'.join(lines)).encode('utf-8'))
++
else:
return (u'\n'.join(lines)).encode('utf-8')
++++++ calibre-rpmlintrc ++++++
--- /var/tmp/diff_new_pack.qv9Yfk/_old 2011-01-18 02:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.qv9Yfk/_new 2011-01-18 02:15:27.000000000 +0100
@@ -1,11 +1,3 @@
-# Output filters
-# addFilter("wrong-script-end-of-line-encoding")
-addFilter("python-naming-policy-not-applied")
+# # Output filters
addFilter("non-executable-script")
-addFilter("files-duplicate .*/__init__.py .*")
-addFilter("no-packager-tag")
-addFilter("files-duplicate .*dependency_links.txt")
-addFilter("files-duplicate .*/manage.py")
-
-# Strange warning message:
-addFilter("invalid-lc-messages-dir /usr/share/locale/ast/LC_MESSAGES/.*")
+addFilter("no-manual-page-for-binary")
++++++ calibre.desktop ++++++
--- /var/tmp/diff_new_pack.qv9Yfk/_old 2011-01-18 02:15:27.000000000 +0100
+++ /var/tmp/diff_new_pack.qv9Yfk/_new 2011-01-18 02:15:27.000000000 +0100
@@ -9,4 +9,4 @@
Terminal=false
Type=Application
Icon=calibre.png
-Categories=Office;Viewer;Literature;
+Categories=Office;Viewer
++++++ generate-tarball.sh ++++++
#!/bin/sh
#
# Copyright (c) 2010,2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# Authors: Sascha Manns <saigkill@xxxxxxxxxxxx>
# Frank Sundermeyer <fsundermeyer@xxxxxxxxxxxx>
#
# Downloads the latest source file for Calibre from
# http://status.calibre-ebook.com/dist/src
# Unpacks the sources to a temporary directory, removes
# fonts (proprietary ons and Liberation) and repacks it
# to calibre-$VERSION-nofonts.tar.bz2 in the current directory
#----------
# Functions
#----------
# usage
function usage {
echo -e "\nusage: $0 VERSION\n"
echo -e "Downloads the latest source file for Calibre from"
echo -e "http://status.calibre-ebook.com/dist/src"
echo -e "Unpacks the sources to a temporary directory, removes"
echo -e "fonts (proprietary ons and Liberation) and repacks it"
echo -e "to calibre-$VERSION-nofonts.tar.bz2 in $(pwd)"
exit 1
}
function exit_on_error {
echo -e "$1"
exit 1
}
VERSION=$1
[ -z $VERSION ] && usage
MYTEMP=$(mktemp -dq) || exit_on_error "Error: Could not create tmp directory"
trap exit 0 SIGTERM SIGINT
#-----
# Main
#-----
cd $MYTEMP || exit_on_error "Error: Could not cd into $MYTEMP"
echo -n "Downloading ... "
wget -q http://status.calibre-ebook.com/dist/src
echo "done"
echo -n "Processing archive ... "
tar -xzf calibre-$VERSION.tar.gz
rm -f calibre/resources/fonts/liberation/*
rm -f calibre/resources/fonts/prs500/*
echo "done"
cd - > /dev/null
echo -n "Creating new archive $(pwd)/calibre-$VERSION-nofonts.tar.bz2 ... "
tar -c -f calibre-$VERSION-nofonts.tar.bz2 -C ${MYTEMP} -j calibre
echo "done"
echo -n "Cleaning up ... "
rm -rf $MYTEMP
echo "done"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |