[gourmet] New upstream release - 0.16.0
Jeff Raber
jraber at fedoraproject.org
Wed Jul 10 05:34:59 UTC 2013
commit f82b0d167e9e738225519c2050cd4a5d003d2605
Author: Jeff Raber <jeff.raber at gmail.com>
Date: Wed Jul 10 00:34:11 2013 -0500
New upstream release - 0.16.0
.gitignore | 1 +
0001-use-pillow-compatable-imports.patch | 74 +++++++++++++++
...-fix_rpmlint_non-executable-script_errors.patch | 96 ++++++++++++++++++++
13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch | 15 ---
gourmet.spec | 44 ++++------
remove_bundled_BeautifulSoup.patch | 38 --------
sources | 2 +-
7 files changed, 190 insertions(+), 80 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b8748e1..e348422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/gourmet-0.15.6.tar.gz
/gourmet-0.15.9.tar.gz
+/gourmet-0.16.0.tar.bz2
diff --git a/0001-use-pillow-compatable-imports.patch b/0001-use-pillow-compatable-imports.patch
new file mode 100644
index 0000000..97db6d9
--- /dev/null
+++ b/0001-use-pillow-compatable-imports.patch
@@ -0,0 +1,74 @@
+From 680ae4a168cc72d2783ad6938345f1962905c50f Mon Sep 17 00:00:00 2001
+From: Jeff Raber <jeff.raber at gmail.com>
+Date: Tue, 9 Jul 2013 23:35:49 -0500
+Subject: [PATCH] Use PIL compatable imports
+
+Fixes https://bugzilla.redhat.com/show_bug.cgi?id=895238
+---
+ gourmet/ImageExtras.py | 3 ++-
+ gourmet/exporters/exporter.py | 3 ++-
+ gourmet/plugins/import_export/html_plugin/html_exporter.py | 3 ++-
+ gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py | 3 ++-
+ gourmet/reccard.py | 3 ++-
+ 5 files changed, 10 insertions(+), 5 deletions(-)
+
+diff --git a/gourmet/ImageExtras.py b/gourmet/ImageExtras.py
+index 0b6e513..258ca89 100644
+--- a/gourmet/ImageExtras.py
++++ b/gourmet/ImageExtras.py
+@@ -1,4 +1,5 @@
+-import os, os.path, tempfile, gtk, Image, StringIO
++import os, os.path, tempfile, gtk, StringIO
++from PIL import Image
+ from gdebug import *
+
+ TMPFILE = tempfile.mktemp(prefix='gourmet_tempfile_')
+diff --git a/gourmet/exporters/exporter.py b/gourmet/exporters/exporter.py
+index ab1c1e3..329b84c 100644
+--- a/gourmet/exporters/exporter.py
++++ b/gourmet/exporters/exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap, types
++from PIL import Image
+ from gourmet import gglobals, convert
+ from gourmet.gdebug import *
+ from gettext import gettext as _
+diff --git a/gourmet/plugins/import_export/html_plugin/html_exporter.py b/gourmet/plugins/import_export/html_plugin/html_exporter.py
+index 6f42cb4..af80a11 100644
+--- a/gourmet/plugins/import_export/html_plugin/html_exporter.py
++++ b/gourmet/plugins/import_export/html_plugin/html_exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++from PIL import Image
+ from gettext import gettext as _
+ from gourmet import convert,gglobals
+ from gourmet.gdebug import *
+diff --git a/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py b/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
+index fa794e6..bc8e973 100644
+--- a/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
++++ b/gourmet/plugins/import_export/mealmaster_plugin/mealmaster_exporter.py
+@@ -1,4 +1,5 @@
+-import re, Image, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++import re, os.path, os, xml.sax.saxutils, time, shutil, urllib, textwrap
++from PIL import Image
+ from gourmet import gglobals, convert
+ from gourmet.exporters.exporter import *
+ from gourmet.gdebug import *
+diff --git a/gourmet/reccard.py b/gourmet/reccard.py
+index 3c0933c..9f1581f 100644
+--- a/gourmet/reccard.py
++++ b/gourmet/reccard.py
+@@ -1,6 +1,7 @@
+ #!/usr/bin/env python
+ import gc
+-import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, Image, StringIO, pango, string
++import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string
++from PIL import Image
+ import types
+ import xml.sax.saxutils, pango
+ import exporters.exportManager
+--
+1.8.3.1
+
diff --git a/0002-fix_rpmlint_non-executable-script_errors.patch b/0002-fix_rpmlint_non-executable-script_errors.patch
new file mode 100644
index 0000000..ba6927e
--- /dev/null
+++ b/0002-fix_rpmlint_non-executable-script_errors.patch
@@ -0,0 +1,96 @@
+diff -ru a/gourmet/exporters/recipe_emailer.py b/gourmet/exporters/recipe_emailer.py
+--- a/gourmet/exporters/recipe_emailer.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/exporters/recipe_emailer.py 2013-07-10 00:16:48.052480039 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import urllib, StringIO, os.path
+ import exporter, html_exporter, pdf_exporter
+ from gourmet import gglobals
+diff -ru a/gourmet/GourmetRecipeManager.py b/gourmet/GourmetRecipeManager.py
+--- a/gourmet/GourmetRecipeManager.py 2013-03-06 12:24:31.000000000 -0600
++++ b/gourmet/GourmetRecipeManager.py 2013-07-10 00:14:43.045635823 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import os.path, time, os, sys, re, threading, StringIO, pango, string
+ try:
+ from PIL import Image
+diff -ru a/gourmet/gtk_extras/dialog_extras.py b/gourmet/gtk_extras/dialog_extras.py
+--- a/gourmet/gtk_extras/dialog_extras.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/gtk_extras/dialog_extras.py 2013-07-10 00:15:29.813577525 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gtk, gobject, os.path, optionTable, thumbnail, cb_extras, fnmatch, re
+ import pango
+ import xml.sax.saxutils
+diff -ru a/gourmet/gtk_extras/FauxActionGroups.py b/gourmet/gtk_extras/FauxActionGroups.py
+--- a/gourmet/gtk_extras/FauxActionGroups.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/gtk_extras/FauxActionGroups.py 2013-07-10 00:14:35.333645438 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gtk
+ from gourmet.gdebug import *
+ from gettext import gettext as _
+diff -ru a/gourmet/gtk_extras/optionTable.py b/gourmet/gtk_extras/optionTable.py
+--- a/gourmet/gtk_extras/optionTable.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/gtk_extras/optionTable.py 2013-07-10 00:14:24.117659423 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gtk, cb_extras, gobject
+
+ class CustomOption (gtk.HBox):
+diff -ru a/gourmet/gtk_extras/ThumbnailGenerator.py b/gourmet/gtk_extras/ThumbnailGenerator.py
+--- a/gourmet/gtk_extras/ThumbnailGenerator.py 2013-03-06 12:24:31.000000000 -0600
++++ b/gourmet/gtk_extras/ThumbnailGenerator.py 2013-07-10 00:16:30.628501746 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ # -*- python -*-
+ #
+ # Python Thumbnail image generator
+diff -ru a/gourmet/gtk_extras/WidgetSaver.py b/gourmet/gtk_extras/WidgetSaver.py
+--- a/gourmet/gtk_extras/WidgetSaver.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/gtk_extras/WidgetSaver.py 2013-07-10 00:16:15.716520324 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gtk.gdk
+ import os
+ from gourmet.gdebug import *
+diff -ru a/gourmet/plugins/web_plugin/gourmetweb/manage.py b/gourmet/plugins/web_plugin/gourmetweb/manage.py
+--- a/gourmet/plugins/web_plugin/gourmetweb/manage.py 2013-03-01 17:01:49.000000000 -0600
++++ b/gourmet/plugins/web_plugin/gourmetweb/manage.py 2013-07-10 00:15:57.093543529 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import sys
+ sys.path.append('/usr/share/gourmet') # for debian
+
+diff -ru a/gourmet/prefs.py b/gourmet/prefs.py
+--- a/gourmet/prefs.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/prefs.py 2013-07-10 00:14:12.517673887 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import os, os.path, pickle, gglobals
+
+ class Prefs:
+diff -ru a/gourmet/reccard.py b/gourmet/reccard.py
+--- a/gourmet/reccard.py 2013-02-26 20:02:23.000000000 -0600
++++ b/gourmet/reccard.py 2013-07-10 00:15:17.381593020 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gc
+ import gtk, gobject, os.path, time, os, sys, re, threading, gtk.gdk, StringIO, pango, string
+ from PIL import Image
+diff -ru a/gourmet/recindex.py b/gourmet/recindex.py
+--- a/gourmet/recindex.py 2013-03-01 17:01:49.000000000 -0600
++++ b/gourmet/recindex.py 2013-07-10 00:15:11.493600360 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ import gtk, time, re, gtk.gdk, gobject, pango
+ from gtk_extras import WidgetSaver, ratingWidget
+ from ImageExtras import get_pixbuf_from_jpg
+diff -ru a/gourmet/shopgui.py b/gourmet/shopgui.py
+--- a/gourmet/shopgui.py 2013-01-09 06:10:13.000000000 -0600
++++ b/gourmet/shopgui.py 2013-07-10 00:14:58.325616774 -0500
+@@ -1,4 +1,3 @@
+-#!/usr/bin/env python
+ 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/gourmet.spec b/gourmet.spec
index 75df8a1..aeeb145 100644
--- a/gourmet.spec
+++ b/gourmet.spec
@@ -1,21 +1,19 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
Name: gourmet
-Version: 0.15.9
-Release: 8%{?dist}
+Version: 0.16.0
+Release: 1%{?dist}
Summary: Recipe Manager for the GNOME desktop environment
Group: Applications/Productivity
License: GPLv2+
-URL: http://grecipe-manager.sourceforge.net
-Source0: http://downloads.sourceforge.net/grecipe-manager/%{name}-%{version}.tar.gz
-Patch0: 13a02dd1627664bf0f1c068d3de730e52c9bfbfd.patch
-Patch1: remove_bundled_BeautifulSoup.patch
-Patch2: gourmet-pillow.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+URL: http://thinkle.github.io/gourmet
+Source0: https://launchpad.net/%{name}/main/%{version}/+download/%{name}-%{version}.tar.bz2
+Patch0: 0001-use-pillow-compatable-imports.patch
+Patch1: 0002-fix_rpmlint_non-executable-script_errors.patch
BuildArch: noarch
-BuildRequires: python2-devel
+BuildRequires: python2-devel,python-distutils-extra
BuildRequires: desktop-file-utils
BuildRequires: gettext,intltool
@@ -33,10 +31,6 @@ files and exports web pages & other formats.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-rm ./src/lib/plugins/import_export/web_import_plugin/BeautifulSoup.py
-rm ./src/lib/importers/BeautifulSoup.py
-#chmod -x data/recipe.dtd
%build
@@ -44,17 +38,12 @@ rm ./src/lib/importers/BeautifulSoup.py
%install
rm -rf %buildroot
-%{__python} setup.py install --skip-build --root %buildroot \
- --disable-modules-check
+%{__python} setup.py install --root %buildroot
+rm -rf %{buildroot}/usr/share/doc/gourmet
-
-desktop-file-install %buildroot%_datadir/applications/gourmet.desktop \
- --remove-category=Other \
- --add-category=Utility \
+desktop-file-install build/share/applications/gourmet.desktop \
--add-category=X-Fedora \
- --dir=%buildroot%_datadir/applications \
--copy-name-to-generic-name \
- --delete-original
%find_lang %{name}
@@ -64,18 +53,21 @@ rm -rf %buildroot
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc CHANGES PKG-INFO README TODO FAQ
+%doc CHANGES PKG-INFO README.md TODO FAQ LICENSE
# documentation
-%_bindir/gourmet
# sitelib stuff
%{python_sitelib}/gourmet
# datadir stuff
-%{_datadir}/applications/*gourmet.desktop
-%{_datadir}/pixmaps/recbox.png
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
%{_datadir}/gourmet
-%{python_sitelib}/*.egg-info
+%{python_sitelib}/%{name}*.egg-info
+%{_bindir}/%{name}
%changelog
+* Wed Jul 10 2013 Jeff Raber <jeff.raber at gmail.com> - 0.16.0-1
+- New upstream release
+
* Thu Apr 11 2013 Jon Ciesla <limburgher at gmail.com> - 0.15.9-8
- Drop desktop vendor tag.
diff --git a/sources b/sources
index 50e57bb..d2b06ef 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7bef5569fb4523747973d83ab69a9a79 gourmet-0.15.9.tar.gz
+6a4ddb80b40e1bee7797697f03c9ef82 gourmet-0.16.0.tar.bz2
More information about the scm-commits
mailing list