Hello community, here is the log from the commit of package gourmet for openSUSE:Factory checked in at 2014-06-16 21:26:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gourmet (Old) and /work/SRC/openSUSE:Factory/.gourmet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gourmet" Changes: -------- --- /work/SRC/openSUSE:Factory/gourmet/gourmet.changes 2011-10-02 10:09:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.gourmet.new/gourmet.changes 2014-06-16 21:26:22.000000000 +0200 @@ -1,0 +2,39 @@ +Sun Jun 8 07:12:16 UTC 2014 - [email protected] + +- Update to version 0.17.4: + + Introduces the use of InfoBars for import and export messages + + #743 - When adding a recipe to a shopping list that's already + there, increase the amounts of ingredients accordingly. + + #756 - Fix MyCookbook import + + #241, #287 - Fix two nasty bugs related to entering + ingredients under a British English locale (en_GB) + + #264 - Add a couple of new keyboard shortcuts + + #759 - Add an AppData file to properly represent Gourmet in + the Gnome and KDE native software centers +- Removed fdupes usage as relinking files was messing up the + installation, causing gourmet to install but not start +- Rebase removed-python-shebang.patch for current version +- Re-enable lang_package; fdupes was somehow preventing + generation of the .mo files +- Changes from version 0.17.3: + + Fixed deb#744707 - Replace compressed jQuery v1.4.2 by + uncompressed v1.11.0 + + #752 - Add My CookBook import/export plugin. + +------------------------------------------------------------------- +Thu Apr 17 07:48:52 UTC 2014 - [email protected] + +- Update to version 0.17.2: + + Lots of upstream changes from previous packaged version, see + /usr/share/doc/packages/gourmet/ChangeLog file for a full list +- Packaging changes: + + Rebased removed-python-shebang.patch so that it applies + cleanly with the updated version + + Manually generate and install icons in the hicolor icon dir; + introduces BuildRequires on ImageMagick, inkscape and + hicolor-icon-theme + + Disable lang package: no translations in upstream tarball + + Use desktop-file-utils to install .desktop file, updating the + categories as applicable. + +------------------------------------------------------------------- Old: ---- gourmet-0.15.9.tar.bz2 New: ---- 0.17.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gourmet.spec ++++++ --- /var/tmp/diff_new_pack.ldLhEE/_old 2014-06-16 21:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ldLhEE/_new 2014-06-16 21:26:23.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package gourmet # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 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 @@ -16,22 +16,26 @@ # - Name: gourmet -Version: 0.15.9 -Release: 1 -License: GPL-2.0 +Version: 0.17.4 +Release: 0 Summary: Recipes Management Application -Url: http://grecipe-manager.sourceforge.net +License: GPL-2.0 Group: Productivity/Office/Other -Source: gourmet-%{version}.tar.bz2 +Url: http://grecipe-manager.sourceforge.net +Source: https://github.com/thinkle/%{name}/archive/%{version}.tar.gz # PATCH-FIX-UPSTREAM removed-python-shebang.patch sf#3275762 [email protected] -- cleaned shebang in modules Patch0: removed-python-shebang.patch +BuildRequires: ImageMagick +BuildRequires: desktop-file-utils BuildRequires: fdupes +BuildRequires: hicolor-icon-theme +BuildRequires: inkscape BuildRequires: intltool BuildRequires: python-devel BuildRequires: update-desktop-files Requires: python-base +BuildRequires: python-distutils-extra # The gnome python module is really used, so this is not about the meta-package Requires: python-gnome %if 0%{?suse_version} <= 1130 @@ -58,37 +62,53 @@ %lang_package %prep -%setup -q +%setup -q -n %{name}-%{version} %patch0 -p1 %build python setup.py build %install -python setup.py install --skip-build --root=%{buildroot} --prefix="%{_prefix}" -%if 0%{?suse_version} <= 1120 -%{__rm} %{buildroot}%{_datadir}/locale/sv_SE/LC_MESSAGES/* -%endif -%fdupes %{buildroot}%{python_sitelib} -%fdupes -s %{buildroot}%{_datadir} -%suse_update_desktop_file -r "%{name}" Utility DesktopUtility - -%find_lang "%{name}" - -%check +python setup.py install --root=%{buildroot} --prefix="%{_prefix}" -%clean -%{?buildroot:rm -rf %{buildroot}} +# INSTALL APPLICATION ICONS +cp data/icons/scalable/apps/gourmet.svg gourmet.svg +for i in 24 32 48 64 128 256; +do + convert -density ${i}x -geometry ${i}x gourmet.svg %{name}-${i}x${i}.png + install -Dm0644 %{name}-${i}x${i}.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png +done +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps + +desktop-file-install build/share/applications/gourmet.desktop \ + --add-category="Office;ProjectManagement;" \ + --copy-name-to-generic-name + +%find_lang %{name} %{?no_lang_C} +rm -fr %{buildroot}%{_datadir}/doc/%{name} + +# gourmet expects to find the resource directory in %{python_sitelib}/gourmet/data rather than %{_datadir}/gourmet: see https://github.com/thinkle/gourmet/issues/762 +# ln -s %{_datadir}/%{name} %{buildroot}%{python_sitelib}/%{name}/data + +%post +%icon_theme_cache_post +%desktop_database_post + +%postun +%icon_theme_cache_postun +%desktop_database_postun %files %defattr(-, root, root) -%doc README CHANGES PKG-INFO +%doc README.md FAQ CHANGES CODING.md LICENSE ChangeLog %{_bindir}/gourmet %{_datadir}/gourmet/ -%{_datadir}/pixmaps/recbox.png %{_datadir}/applications/gourmet.desktop %{python_sitelib}/gourmet/ %{python_sitelib}/*.egg-info +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%dir %{_datadir}/appdata +%{_datadir}/appdata/gourmet.appdata.xml %files lang -f %{name}.lang ++++++ removed-python-shebang.patch ++++++ --- /var/tmp/diff_new_pack.ldLhEE/_old 2014-06-16 21:26:23.000000000 +0200 +++ /var/tmp/diff_new_pack.ldLhEE/_new 2014-06-16 21:26:23.000000000 +0200 @@ -1,276 +1,99 @@ -diff --git a/src/lib/GourmetRecipeManager.py b/src/lib/GourmetRecipeManager.py -index 4c79327..d6c88a5 100644 ---- a/src/lib/GourmetRecipeManager.py -+++ b/src/lib/GourmetRecipeManager.py +Index: gourmet-0.17.4/gourmet/GourmetRecipeManager.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/GourmetRecipeManager.py ++++ gourmet-0.17.4/gourmet/GourmetRecipeManager.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python - import os.path, time, os, sys, re, threading, StringIO, pango, string - import Image - import gtk.glade, gtk, gobject, gtk.gdk, traceback -diff --git a/src/lib/convert.py b/src/lib/convert.py -index d3c9e73..81b9ceb 100644 ---- a/src/lib/convert.py -+++ b/src/lib/convert.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - import re, locale, math - from defaults.defaults import lang as defaults - from gettext import gettext as _ -diff --git a/src/lib/defaults/defaults_de.py b/src/lib/defaults/defaults_de.py -index b42102a..d1bea14 100644 ---- a/src/lib/defaults/defaults_de.py -+++ b/src/lib/defaults/defaults_de.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # we set up default information for our locale. - # Translators should use this file as the basis of their translation. -diff --git a/src/lib/defaults/defaults_en.py b/src/lib/defaults/defaults_en.py -index 62462d1..a37e404 100644 ---- a/src/lib/defaults/defaults_en.py -+++ b/src/lib/defaults/defaults_en.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - # we set up default information for our locale. -diff --git a/src/lib/defaults/defaults_en_GB.py b/src/lib/defaults/defaults_en_GB.py -index 6497897..48d0400 100644 ---- a/src/lib/defaults/defaults_en_GB.py -+++ b/src/lib/defaults/defaults_en_GB.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - ## we set up default information. -diff --git a/src/lib/defaults/defaults_es.py b/src/lib/defaults/defaults_es.py -index eae42d0..a90806f 100644 ---- a/src/lib/defaults/defaults_es.py -+++ b/src/lib/defaults/defaults_es.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - # we set up default information for our locale (Spanish) -diff --git a/src/lib/defaults/defaults_fr.py b/src/lib/defaults/defaults_fr.py -index 0a7607b..ecd9438 100644 ---- a/src/lib/defaults/defaults_fr.py -+++ b/src/lib/defaults/defaults_fr.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # we set up default information for our locale. - # Translators should use this file as the basis of their translation. -diff --git a/src/lib/defaults/defaults_nl.py b/src/lib/defaults/defaults_nl.py -index 25f020c..490ed86 100644 ---- a/src/lib/defaults/defaults_nl.py -+++ b/src/lib/defaults/defaults_nl.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - ## we set up default information. -diff --git a/src/lib/defaults/defaults_pt.py b/src/lib/defaults/defaults_pt.py -index ecf8360..44e7318 100644 ---- a/src/lib/defaults/defaults_pt.py -+++ b/src/lib/defaults/defaults_pt.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - ## we set up default information. -diff --git a/src/lib/defaults/defaults_sk.py b/src/lib/defaults/defaults_sk.py -index d19bd88..d9e385a 100644 ---- a/src/lib/defaults/defaults_sk.py -+++ b/src/lib/defaults/defaults_sk.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - ## we set up default information. -diff --git a/src/lib/defaults/defaults_sv.py b/src/lib/defaults/defaults_sv.py -index 17393c8..3bca1bb 100644 ---- a/src/lib/defaults/defaults_sv.py -+++ b/src/lib/defaults/defaults_sv.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - # -*- coding: utf-8 -*- - # - # we set up default information for our locale. -diff --git a/src/lib/exporters/recipe_emailer.py b/src/lib/exporters/recipe_emailer.py -index 8bdaaa4..6e9630c 100644 ---- a/src/lib/exporters/recipe_emailer.py -+++ b/src/lib/exporters/recipe_emailer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import gtk.glade, urllib, StringIO, os.path - import exporter, html_exporter, pdf_exporter - from gourmet import gglobals -diff --git a/src/lib/gdebug.py b/src/lib/gdebug.py -index f222d3c..11a3a45 100644 ---- a/src/lib/gdebug.py -+++ b/src/lib/gdebug.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - from OptionParser import * - import time,traceback - -diff --git a/src/lib/gtk_extras/FauxActionGroups.py b/src/lib/gtk_extras/FauxActionGroups.py -index 8a75ae2..0c940a8 100644 ---- a/src/lib/gtk_extras/FauxActionGroups.py -+++ b/src/lib/gtk_extras/FauxActionGroups.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - import gtk.glade, gtk - from gourmet.gdebug import * - from gettext import gettext as _ -diff --git a/src/lib/gtk_extras/ThumbnailGenerator.py b/src/lib/gtk_extras/ThumbnailGenerator.py -index a65d7c3..7ef882e 100644 ---- a/src/lib/gtk_extras/ThumbnailGenerator.py -+++ b/src/lib/gtk_extras/ThumbnailGenerator.py -@@ -1,4 +1,3 @@ --#!/usr/bin/env python - # -*- python -*- - # - # Python Thumbnail image generator -diff --git a/src/lib/gtk_extras/WidgetSaver.py b/src/lib/gtk_extras/WidgetSaver.py -index 69c774e..53300cc 100644 ---- a/src/lib/gtk_extras/WidgetSaver.py -+++ b/src/lib/gtk_extras/WidgetSaver.py + import os.path, os, re, threading, string + import gtk, gobject, gtk.gdk + import batchEditor +Index: gourmet-0.17.4/gourmet/gtk_extras/WidgetSaver.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/gtk_extras/WidgetSaver.py ++++ gourmet-0.17.4/gourmet/gtk_extras/WidgetSaver.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import gtk.gdk import os - from gourmet.gdebug import * -diff --git a/src/lib/gtk_extras/dialog_extras.py b/src/lib/gtk_extras/dialog_extras.py -index bc019e8..c97b96e 100644 ---- a/src/lib/gtk_extras/dialog_extras.py -+++ b/src/lib/gtk_extras/dialog_extras.py + from gourmet.gdebug import debug +Index: gourmet-0.17.4/gourmet/gtk_extras/dialog_extras.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/gtk_extras/dialog_extras.py ++++ gourmet-0.17.4/gourmet/gtk_extras/dialog_extras.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python - import gtk, gobject, os.path, optionTable, thumbnail, cb_extras, fnmatch, re + import gtk, gobject, os.path, optionTable, thumbnail, fnmatch, re import pango import xml.sax.saxutils -diff --git a/src/lib/gtk_extras/optionTable.py b/src/lib/gtk_extras/optionTable.py -index a46d8a5..9977e5c 100644 ---- a/src/lib/gtk_extras/optionTable.py -+++ b/src/lib/gtk_extras/optionTable.py +Index: gourmet-0.17.4/gourmet/gtk_extras/optionTable.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/gtk_extras/optionTable.py ++++ gourmet-0.17.4/gourmet/gtk_extras/optionTable.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import gtk, cb_extras, gobject class CustomOption (gtk.HBox): -diff --git a/src/lib/gtk_extras/treeview_extras.py b/src/lib/gtk_extras/treeview_extras.py -index 4d80e76..beb3955 100644 ---- a/src/lib/gtk_extras/treeview_extras.py -+++ b/src/lib/gtk_extras/treeview_extras.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - from gourmet.gdebug import * - import gtk, gobject - -diff --git a/src/lib/importers/importer.py b/src/lib/importers/importer.py -index 54a3180..f9c4abf 100644 ---- a/src/lib/importers/importer.py -+++ b/src/lib/importers/importer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - import os,stat,re,time,StringIO - from gourmet import keymanager, convert, ImageExtras - from gourmet.gdebug import debug, TimeAction, print_timer_info, debug_decorator -diff --git a/src/lib/importers/mealmaster_importer.py b/src/lib/importers/mealmaster_importer.py -index 73b4658..4681f8a 100644 ---- a/src/lib/importers/mealmaster_importer.py -+++ b/src/lib/importers/mealmaster_importer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - import importer, plaintext_importer - import re, os.path, string, array - from gourmet import convert, check_encodings -diff --git a/src/lib/plugins/import_export/mastercook_import_plugin/mastercook_importer.py b/src/lib/plugins/import_export/mastercook_import_plugin/mastercook_importer.py -index 9d37d27..3d484ff 100644 ---- a/src/lib/plugins/import_export/mastercook_import_plugin/mastercook_importer.py -+++ b/src/lib/plugins/import_export/mastercook_import_plugin/mastercook_importer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - import gourmet.importers.importer as importer - import xml.sax, re, os.path - from gourmet.gdebug import debug -diff --git a/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_importer.py b/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_importer.py -index e24c400..1131ead 100644 ---- a/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_importer.py -+++ b/src/lib/plugins/import_export/mealmaster_plugin/mealmaster_importer.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - from gourmet.importers import importer, plaintext_importer - import re, os.path, string, array - from gourmet import convert, check_encodings -diff --git a/src/lib/plugins/python_shell/ipython_view.py b/src/lib/plugins/python_shell/ipython_view.py -index db9926f..6b6a785 100644 ---- a/src/lib/plugins/python_shell/ipython_view.py -+++ b/src/lib/plugins/python_shell/ipython_view.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - ''' - Provides IPython console widget. - -diff --git a/src/lib/plugins/web_plugin/gourmetweb/manage.py b/src/lib/plugins/web_plugin/gourmetweb/manage.py -index bcdd55e..d47073c 100755 ---- a/src/lib/plugins/web_plugin/gourmetweb/manage.py -+++ b/src/lib/plugins/web_plugin/gourmetweb/manage.py -@@ -1,4 +1,3 @@ --#!/usr/bin/python - from django.core.management import execute_manager - try: - import settings # Assumed to be in the same directory. -diff --git a/src/lib/prefs.py b/src/lib/prefs.py -index 0be1b90..76733b1 100644 ---- a/src/lib/prefs.py -+++ b/src/lib/prefs.py +Index: gourmet-0.17.4/gourmet/prefs.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/prefs.py ++++ gourmet-0.17.4/gourmet/prefs.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import os, os.path, pickle, gglobals class Prefs: -@@ -86,5 +85,3 @@ def get_prefs (): - except Prefs, p: - return p - --if __name__ == '__main__': -- p = Prefs() -diff --git a/src/lib/reccard.py b/src/lib/reccard.py -index c89a0da..fa23629 100644 ---- a/src/lib/reccard.py -+++ b/src/lib/reccard.py +Index: gourmet-0.17.4/gourmet/reccard.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/reccard.py ++++ gourmet-0.17.4/gourmet/reccard.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python import gc - import gtk.glade, gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string - import types -diff --git a/src/lib/recindex.py b/src/lib/recindex.py -index cbc1e04..ccf9b81 100644 ---- a/src/lib/recindex.py -+++ b/src/lib/recindex.py + import gobject, gtk, gtk.gdk + import os.path, string +Index: gourmet-0.17.4/gourmet/recindex.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/recindex.py ++++ gourmet-0.17.4/gourmet/recindex.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python - import gtk.glade, gtk, time, re, gtk.gdk, gobject, pango - from gtk_extras import WidgetSaver, ratingWidget from ImageExtras import get_pixbuf_from_jpg -diff --git a/src/lib/shopgui.py b/src/lib/shopgui.py -index 6b74d62..c2146c5 100644 ---- a/src/lib/shopgui.py -+++ b/src/lib/shopgui.py + from gdebug import debug + from gettext import gettext as _, ngettext +Index: gourmet-0.17.4/gourmet/shopgui.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/shopgui.py ++++ gourmet-0.17.4/gourmet/shopgui.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python - import gtk.glade, gtk, gobject, pango, sys, os.path, time, os, string + import gtk, gobject, pango, sys, os.path, time, os, string import recipeManager, convert, reccard, prefs from gtk_extras import WidgetSaver, mnemonic_manager -diff --git a/src/lib/version.py b/src/lib/version.py -index 9626aff..1d4355d 100644 ---- a/src/lib/version.py -+++ b/src/lib/version.py +Index: gourmet-0.17.4/gourmet/exporters/recipe_emailer.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/exporters/recipe_emailer.py ++++ gourmet-0.17.4/gourmet/exporters/recipe_emailer.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + import urllib, StringIO, os.path + import exporter, html_exporter, pdf_exporter + from gourmet import gglobals +Index: gourmet-0.17.4/gourmet/plugins/python_shell/ipython_view.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/plugins/python_shell/ipython_view.py ++++ gourmet-0.17.4/gourmet/plugins/python_shell/ipython_view.py @@ -1,4 +1,3 @@ -#!/usr/bin/python - from gettext import gettext as _ - appname = _("Gourmet Recipe Manager") - copyright = _("Copyright (c) 2004,2005,2006,2007,2008,2009,2010,2011 Thomas M. Hinkle. GNU GPL v2") + ''' + Provides IPython console widget. + +Index: gourmet-0.17.4/gourmet/plugins/web_plugin/manage.py +=================================================================== +--- gourmet-0.17.4.orig/gourmet/plugins/web_plugin/manage.py ++++ gourmet-0.17.4/gourmet/plugins/web_plugin/manage.py +@@ -1,4 +1,3 @@ +-#!/usr/bin/env python + import os, sys + + if __name__ == "__main__": -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
