[jbrout] New checkout from the upstream.
Matej Cepl
mcepl at fedoraproject.org
Wed Oct 1 14:20:30 UTC 2014
commit 3aa170da09115a2c3061ff3dd1ee3ad90c590f49
Author: Matěj Cepl <mcepl at redhat.com>
Date: Tue Sep 30 18:46:39 2014 +0200
New checkout from the upstream.
jbrout-no-pyexiv2-warning.patch | 30 ------------------------------
jbrout-pillow.patch | 20 ++++++++------------
jbrout-purge-no-attribute-attrib.patch | 24 +++++++++++-------------
jbrout.spec | 31 +++++++++++++++----------------
sources | 2 +-
5 files changed, 35 insertions(+), 72 deletions(-)
---
diff --git a/jbrout-pillow.patch b/jbrout-pillow.patch
index e5c5574..32a5269 100644
--- a/jbrout-pillow.patch
+++ b/jbrout-pillow.patch
@@ -1,8 +1,6 @@
-Index: jbrout/jbrout/jbrout.py
-===================================================================
---- jbrout.orig/jbrout/jbrout.py
-+++ jbrout/jbrout/jbrout.py
-@@ -2387,7 +2387,7 @@ class Window(GladeApp):
+--- a/jbrout/jbrout.py
++++ b/jbrout/jbrout.py
+@@ -2546,7 +2546,7 @@ class Window(GladeApp):
openURL(u"http://jbrout.free.fr/help/%s/" % lang)
def on_a_propos_activate(self, widget, *args):
@@ -11,16 +9,14 @@ Index: jbrout/jbrout/jbrout.py
about = gtk.AboutDialog()
about.set_name('jbrout')
about.set_version(__version__)
-Index: jbrout/jbrout/plugins/instantWeb/instantweb.py
-===================================================================
---- jbrout.orig/jbrout/plugins/instantWeb/instantweb.py
-+++ jbrout/jbrout/plugins/instantWeb/instantweb.py
-@@ -25,7 +25,7 @@ import select
+--- a/jbrout/plugins/instantWeb/instantweb.py
++++ b/jbrout/plugins/instantWeb/instantweb.py
+@@ -27,7 +27,7 @@ import select
from jbrout.common import cd2rd
try:
- import Image
+ from PIL import Image
except:
- raise "you should install PIL module (http://www.pythonware.com/products/pil/)"
-
+ raise Exception("you should install PIL module " +
+ "(http://www.pythonware.com/products/pil/)")
diff --git a/jbrout-purge-no-attribute-attrib.patch b/jbrout-purge-no-attribute-attrib.patch
index 074a08e..8d39018 100644
--- a/jbrout-purge-no-attribute-attrib.patch
+++ b/jbrout-purge-no-attribute-attrib.patch
@@ -1,20 +1,18 @@
-Index: jbrout/jbrout/jbrout/db.py
-===================================================================
---- jbrout.orig/jbrout/jbrout/db.py
-+++ jbrout/jbrout/jbrout/db.py
-@@ -14,6 +14,7 @@
+--- a/jbrout/jbrout/db.py
++++ b/jbrout/jbrout/db.py
+@@ -13,7 +13,6 @@
+ ## GNU General Public License for more details.
##
+ from lxml.etree import Element, ElementTree
+-#~ import cElementTree as ElementTree
+ import gc
- from lxml.etree import Element,ElementTree
-+from xml.etree import ElementTree as et
- import lxml
- import traceback
- from datetime import datetime
-@@ -600,7 +601,14 @@ class PhotoNode(object):
+ import pygtk
+@@ -665,7 +664,14 @@ class PhotoNode(object):
real = property(__getReal)
def __getFolder(self):
-- na=dec(self.__node.getparent().attrib["name"])
+- na = dec(self.__node.getparent().attrib["name"])
+ try:
+ na=dec(self.__node.getparent().attrib["name"])
+ except Exception as exc:
@@ -23,6 +21,6 @@ Index: jbrout/jbrout/jbrout/db.py
+ et.tostring(self.__node, encoding="utf-8")
+ print >>sys.stderr, "self.__node.getparent() = %s" % \
+ et.tostring(self.__node.getparent(), encoding="utf-8")
- assert type(na)==unicode
+ assert type(na) == unicode
return na
folder = property(__getFolder)
diff --git a/jbrout.spec b/jbrout.spec
index 1cb04ae..59ad7f5 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -1,10 +1,10 @@
-%global svn_checkout 1
-%global revno 338
+%global git_checkout 1
+%global revno 20140930reva7c8fb8
Name: jbrout
-Version: 0.3.%{revno}
-%if 0%{?svn_checkout}
-Release: 0.12.svn%{revno}%{?dist}
+Version: 0.4
+%if 0%{?git_checkout}
+Release: 0.13.git%{revno}%{?dist}
%else
Release: 3%{?dist}
%endif
@@ -12,11 +12,12 @@ Summary: Photo manager, written in python/pygtk
Group: Applications/Multimedia
License: GPLv2
URL: http://jbrout.manatlan.com/
-%if 0%{?svn_checkout}
-# svn export -r %{revno} http://jbrout.googlecode.com/svn/trunk/ jbrout
-# rm -f jbrout/dist/winRuntime/GTK_runtime.zip
-# rm -f jbrout/dist/winRuntime/python_runtime-2.5.zip
-# tar cvJf jbrout.tar.xz jbrout/
+%if 0%{?git_checkout}
+# git clone https://code.google.com/p/jbrout/
+# git archive %{revno} | tar -x -C /tmp/jbrout/
+# rm -f /tmp/jbrout/dist/winRuntime/GTK_runtime.zip
+# rm -f /tmp/jbrout/dist/winRuntime/python_runtime-2.5.zip
+# tar cvJf -C /tmp/ jbrout.tar.xz jbrout/
Source0: %{name}.tar.xz
%else
Source0: http://jbrout.free.fr/download/sources/%{name}_%{version}.tar.gz
@@ -28,13 +29,9 @@ Source4: jbrout-install.sh
Source5: jbrout-clean-SVN-checkout.sh
# EXPERIMENTAL for now, don't distribute!
Patch0: jbrout-purge-no-attribute-attrib.patch
-# No pyexiv2 warning at all (reverse upstream r331)
-# Fedora users have no choice about what pyexiv2 to use.
-# Besides pyexiv2 0.3.* is now officially stable.
-Patch1: jbrout-no-pyexiv2-warning.patch
# python-pillow compatibility
# https://bugzilla.redhat.com/show_bug.cgi?id=895287
-Patch2: jbrout-pillow.patch
+Patch1: jbrout-pillow.patch
BuildArch: noarch
Requires: python >= 2.4, python-lxml, pygtk2 >= 2.6
Requires: python-imaging, pyexiv2 >= 0.1.2, fbida
@@ -66,7 +63,6 @@ jBrout is able to :
%setup -q -n %{name}
%patch0 -p1
%patch1 -p1
-%patch2 -p1
sh %{SOURCE5}
install -p %{SOURCE1} jbrout/Makefile
install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script
@@ -98,6 +94,9 @@ desktop-file-install \
%{_datadir}/applications/jbrout.desktop
%changelog
+* Tue Sep 30 2014 Matej Cepl <mcepl at redhat.com> - 0.4-0.13.git20140930reva7c8fb8
+- New checkout from the upstream.
+
* Fri Sep 26 2014 Matej Cepl <mcepl at redhat.com> - 0.3.338-0.12.svn338
- Renew the package for the new package review.
diff --git a/sources b/sources
index 9f8af94..9191064 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8d1266cf1cb7e330a9086dc1cd049834 jbrout.tar.xz
+a8352d4367cbbce9dbbf1359263347d5 jbrout.tar.xz
More information about the scm-commits
mailing list