[jbrout] Revert back to the previous last version of master
Matej Cepl
mcepl at fedoraproject.org
Wed Oct 1 14:20:15 UTC 2014
commit 82c394b7e94a4d5d30ef7a14d5884deb1ce24c34
Author: Matěj Cepl <mcepl at redhat.com>
Date: Wed Oct 1 16:19:20 2014 +0200
Revert back to the previous last version of master
.gitignore | 5 +
dead.package | 1 -
jbrout-Makefile | 10 +
jbrout-clean-SVN-checkout.sh | 24 ++
jbrout-install.sh | 19 ++
jbrout-no-pyexiv2-warning.patch | 30 ++
jbrout-pillow.patch | 26 ++
jbrout-purge-no-attribute-attrib.patch | 28 ++
jbrout-usr_bin | 11 +
jbrout.desktop | 11 +
jbrout.spec | 258 +++++++++++++++++
patch | 496 ++++++++++++++++++++++++++++++++
sources | 1 +
13 files changed, 919 insertions(+), 1 deletions(-)
---
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..60eae5f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+jbrout-0.3.282.tar.xz
+jbrout_0.3.284.tar.gz
+jbrout.tar.bz2
+/jbrout.tar.bz2
+/jbrout.tar.xz
diff --git a/jbrout-Makefile b/jbrout-Makefile
new file mode 100644
index 0000000..56ef323
--- /dev/null
+++ b/jbrout-Makefile
@@ -0,0 +1,10 @@
+DESTDIR=
+PODIR=po
+
+all: build
+
+install:
+ ./install-script $(DESTDIR)
+
+build:
+ find $(PODIR) -name \*.po -exec msgfmt -vc '{}' \;
diff --git a/jbrout-clean-SVN-checkout.sh b/jbrout-clean-SVN-checkout.sh
new file mode 100644
index 0000000..81ce06c
--- /dev/null
+++ b/jbrout-clean-SVN-checkout.sh
@@ -0,0 +1,24 @@
+#!/bin/sh
+set -x
+
+[ -n "$1" ] && REPACK="true"
+
+if [ -n "$REPACK" ] ; then
+ [ -d "jbrout" ] && rm -rf jbrout
+ tar xvf "$1"
+ cd jbrout
+fi
+
+rm -rf dist
+rm -rvf jbrout/plugins/multiexport/libs/picasaweb/{atom,gdata}/
+
+find . \( -name \*.exe -o -name \*.dll \) -print -delete
+find . \( -name \*.py -o -name \*.glade -o -name \*.xsl \) -exec dos2unix -k '{}' \;
+find . -type f -executable -exec chmod -x {} \;
+find . -name \*.py -exec sed -i -e '/^#!\/usr.*\/bin\/.*python/d' '{}' \;
+
+if [ "x$REPACK" = "xtrue" ] ; then
+ cd ..
+ rm -fv "$1"
+ tar cvjf jbrout.tar.bz2 jbrout
+fi
diff --git a/jbrout-install.sh b/jbrout-install.sh
new file mode 100644
index 0000000..0284933
--- /dev/null
+++ b/jbrout-install.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+set -x
+DESTDIR=$1
+
+install -m a+rx,u+w -d $DESTDIR/usr/share/jbrout/
+cp -r plugins libs jbrout data $DESTDIR/usr/share/jbrout/
+find po |while read NAME ; do \
+ if [ -d $NAME ] ; then \
+ install -m a+rx,u+w -d $DESTDIR/usr/share/locale/$NAME ;\
+ elif [ $NAME == *.mo ] ; then \
+ install -p -m a+r,u+w $NAME "$DESTDIR/usr/share/jbrout/locale/$NAME" ;\
+ fi ;\
+done
+chmod -R a+rX,u+w plugins $DESTDIR/usr/share/
+install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ *.py
+install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/gpl.txt
+install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/jbrout.glade
+chmod -x $DESTDIR/usr/share/jbrout/jbrout.py
+
diff --git a/jbrout-no-pyexiv2-warning.patch b/jbrout-no-pyexiv2-warning.patch
new file mode 100644
index 0000000..0d740d1
--- /dev/null
+++ b/jbrout-no-pyexiv2-warning.patch
@@ -0,0 +1,30 @@
+Index: jbrout/jbrout/jbrout.py
+===================================================================
+--- jbrout.orig/jbrout/jbrout.py
++++ jbrout/jbrout/jbrout.py
+@@ -3117,9 +3117,6 @@ if __name__ == "__main__":
+ psyco.full()
+ except:
+ print "The psyco module does not seem to be installed. It is not necessary, however it can speed up performance."
+- # Print pyexiv2-0.2+ warning if necessary
+- from jbrout.pyexiv import Check
+- Check()
+
+ try:
+ parser = optparse.OptionParser(usage=USAGE, version=("JBrout "+__version__))
+Index: jbrout/jbrout/jbrout/pyexiv.py
+===================================================================
+--- jbrout.orig/jbrout/jbrout/pyexiv.py
++++ jbrout/jbrout/jbrout/pyexiv.py
+@@ -269,11 +269,6 @@ def Image(f):
+ # pyexiv2 < 0.2
+ return Exiv1Metadata(f)
+
+-def Check():
+- if hasattr(pyexiv2,"ImageMetadata"):
+- # pyexiv2 >= 0.2
+- print "***WARNING*** : YOU ARE USING pyexiv2>0.2 (jbrout doesn't support very well this new version ! not fully tested ! some things are not implemented !!!)"
+-
+ if __name__ == "__main__":
+ t=Image("/home/manatlan/Documents/python/tests_libs_python/TestJPG/p20030830_130202 (copie).jpg")
+ #~ t=Image("/home/manatlan/Documents/python/tests_libs_python/TestJPG/p20030830_130202.jpg")
diff --git a/jbrout-pillow.patch b/jbrout-pillow.patch
new file mode 100644
index 0000000..e5c5574
--- /dev/null
+++ b/jbrout-pillow.patch
@@ -0,0 +1,26 @@
+Index: jbrout/jbrout/jbrout.py
+===================================================================
+--- jbrout.orig/jbrout/jbrout.py
++++ jbrout/jbrout/jbrout.py
+@@ -2387,7 +2387,7 @@ class Window(GladeApp):
+ openURL(u"http://jbrout.free.fr/help/%s/" % lang)
+
+ def on_a_propos_activate(self, widget, *args):
+- import Image
++ from PIL import Image
+ 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
+ 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/)"
+
diff --git a/jbrout-purge-no-attribute-attrib.patch b/jbrout-purge-no-attribute-attrib.patch
new file mode 100644
index 0000000..074a08e
--- /dev/null
+++ b/jbrout-purge-no-attribute-attrib.patch
@@ -0,0 +1,28 @@
+Index: jbrout/jbrout/jbrout/db.py
+===================================================================
+--- jbrout.orig/jbrout/jbrout/db.py
++++ jbrout/jbrout/jbrout/db.py
+@@ -14,6 +14,7 @@
+ ##
+
+ 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):
+ real = property(__getReal)
+
+ def __getFolder(self):
+- na=dec(self.__node.getparent().attrib["name"])
++ try:
++ na=dec(self.__node.getparent().attrib["name"])
++ except Exception as exc:
++ print >>sys.stderr, "Catching exception e:\n%s" % exc
++ print >>sys.stderr, "self.__node = %s" % \
++ 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
+ return na
+ folder = property(__getFolder)
diff --git a/jbrout-usr_bin b/jbrout-usr_bin
new file mode 100644
index 0000000..5012acc
--- /dev/null
+++ b/jbrout-usr_bin
@@ -0,0 +1,11 @@
+#!/bin/sh
+APPPATH=/usr/share/jbrout/jbrout.py
+
+PYTHON=`which python`
+if [ $? != 0 ]; then
+ echo "jbrout requires Python >= 2.4 to be installed." >/dev/stderr
+ exit 1
+fi
+
+cd $(dirname $APPPATH)
+"$PYTHON" "$APPPATH" "$@"
diff --git a/jbrout.desktop b/jbrout.desktop
new file mode 100644
index 0000000..5a55616
--- /dev/null
+++ b/jbrout.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=jBrout
+GenericName=Photo Collection Manager
+GenericName[cs]=Správce fotografické sbírky
+Type=Application
+Exec=/usr/bin/jbrout
+Icon=/usr/share/jbrout/data/gfx/jbrout.png
+Terminal=false
+StartupNotify=true
+Categories=GNOME;GTK;Graphics;2DGraphics;Viewer;RasterGraphics;Photography;
diff --git a/jbrout.spec b/jbrout.spec
new file mode 100644
index 0000000..a52c6c1
--- /dev/null
+++ b/jbrout.spec
@@ -0,0 +1,258 @@
+%global svn_checkout 1
+%global revno 338
+
+Name: jbrout
+Version: 0.3.%{revno}
+%if 0%{?svn_checkout}
+Release: 0.10.svn%{revno}%{?dist}
+%else
+Release: 3%{?dist}
+%endif
+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/
+Source0: %{name}.tar.xz
+%else
+Source0: http://jbrout.free.fr/download/sources/%{name}_%{version}.tar.gz
+%endif
+Source1: jbrout-Makefile
+Source2: jbrout.desktop
+Source3: jbrout-usr_bin
+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
+BuildArch: noarch
+Requires: python >= 2.4, python-lxml, pygtk2 >= 2.6
+Requires: python-imaging, pyexiv2 >= 0.1.2, fbida
+Requires: python-gdata
+# required due to exiftool
+Requires: perl-Image-ExifTool
+BuildRequires: gettext, desktop-file-utils,
+
+%description
+jBrout is able to :
+ * manage albums/photos (= folders/files)
+ * tag photos with IPTC keywords
+ * use internal jpeg thumbnail
+ * comment photos (with jpeg comment) and album (textfile in
+ folder)
+ * rotate loss-less jpeg (and internal jpeg thumbnail)
+ use EXIF info (date, size ..)
+ * search pictures (tags, comment, date, ...)
+ * use plugins (to export to html/gallery, to act like
+ a httpserver, to export pictures to be mailed, ...)
+ * work without database ! (just a xmlfile which can be rebuild
+ from scratch)
+ * handle a lot of photos (jbrout's author claims to have more than 20000
+ of them)
+ * upload photos to a flickr account
+ * ...
+
+%prep
+%setup -q -n %{name}
+%patch0 -p1 -b .noAttributeAttrib
+%patch1 -p1 -b .noPyexiv2Warn
+%patch2 -p1 -b .compat-pillow
+sh %{SOURCE5}
+install -p %{SOURCE1} jbrout/Makefile
+install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script
+
+%build
+cd %{name}
+ls
+make PODIR=po
+
+%install
+cd %{name}
+make DESTDIR=%{buildroot} install
+
+install -D -m a+rx,u+w %{SOURCE3} %{buildroot}%{_bindir}/%{name}
+install -D -p -m a+rx,u+w %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+desktop-file-install \
+ --dir %{buildroot}%{_datadir}/applications \
+ --add-category=X-Fedora \
+ --delete-original \
+ %{buildroot}%{_datadir}/applications/%{name}.desktop
+
+%files
+%doc %{name}/data/gpl.txt
+%{_bindir}/jbrout
+%{_datadir}/jbrout/
+%exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
+%lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
+%lang(it) %{_datadir}/jbrout/plugins/*/po/it/LC_MESSAGES/plugin.mo
+%{_datadir}/applications/jbrout.desktop
+
+%changelog
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.10.svn338
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun Sep 01 2013 Peter Lemenkov <lemenkov at gmail.com> - 0.3.338-0.9.svn338
+- Compress wih xz and remove win32-related binaties from the source tarball
+- Remove RHEL6-related bits. We can't use jbroun in RHEL6 (see rhbz #749473)
+
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.8.svn338
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Mon Feb 4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.338-0.7.svn338
+- Compatibility with python-pillow
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.6.svn338
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.5.svn338
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Oct 27 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.4.svn338
+- fix find cleaning .exe and .dll (closes #749425)
+
+* Mon Oct 24 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.3
+- yet another new version of exiv2 library.
+
+* Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.2
+- Rebuilt against new libraries.
+
+* Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.1
+- Rebuilt against new libraries.
+
+* Sun Jul 10 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1
+- New upstream snapshot (GPL version fixed and one more issue resolved)
+- Eliminate again non-sensical pyexiv2 warning.
+
+* Wed Jul 06 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.336-0.svn336.1
+- All our patches were applied upstream, new SVN checkout
+
+* Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.329-3
+- remove obsolete jbrout-allow-Exif-Orientation-zero.patch
+
+* Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.329-2
+- new upstream checkout (r329)
+- refresh eliminate-metadata-exiftool patch (upstream #129)
+- fix crash with weird iconsize and more recent Gtk (upstream
+ #186)
+- fix import of tags from Xmp.dc.subject (upstream also #129)
+- add more diagnostics for investigating weird crash with
+ getParent being None sometimes
+- use Freedesktop directories instead of ~/.jbrout (upstream
+ #56)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.323-0.svn323.5.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Wed Jan 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.5
+- Add patch to survive bad thumbnail (upstream #179)
+
+* Tue Jan 04 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.4
+- Eliminate exiftool for metadata, make more robust (upstream #129)
+
+* Mon Dec 20 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-3
+- apply patch improving Download plugin (upstream #155)
+
+* Mon Dec 20 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-2
+- patch for ExifOrientation == 0 (upstream #177)
+
+* Sat Dec 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.1
+- Reapply my patch allowing non-standard values of Exif.Orientation.
+- Make it configurable whether we build from a checkout or tarball.
+
+* Thu Dec 09 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.284-2
+- Fix the build and make AutoQA happy.
+
+* Mon Aug 16 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.284-1
+- New upstream release (rhbz#624467)
+
+* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.282-0.3.20100124svn282
+- recompiling .py files against Python 2.7 (rhbz#623324)
+
+* Sun Jan 24 2010 Peter Lemenkov <lemenkov at gmail.com> 0.3.282-0.2.20100124svn282
+- Added BR for exiftool (thanks, Rahul Sundaram <sundaram at fedoraproject.org>)
+
+* Sun Jan 24 2010 Peter Lemenkov <lemenkov at gmail.com> 0.3.282-0.1.20100124svn282
+- Updated to svn ver. 282
+- Fixed #558151
+- Added BR python-gdata
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.174-4.0.20090714svn223.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Tue Jul 14 2009 Matěj Cepl <mcepl at redhat.com> 0.3.174-3.0.20090714svn223.1
+- Attempt to build a new upstream SVN checkout. Fixes bug 510642
+- Remove unneeded files (*.exe, *.c)
+
+* Mon Jul 13 2009 Matěj Cepl <mcepl at redhat.com> - 0.3.174-2
+- Use hashlib if possible.
+
+* Sat Mar 21 2009 Matej Cepl <mcepl at redhat.com> 0.3.174-1
+- New upstream release
+
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.159-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue Feb 17 2009 Matěj Cepl <mcepl at redhat.com> - 0.3.159-2
+- add fbida as Requires
+
+* Thu Jan 15 2009 Matěj Cepl <mcepl at redhat.com> 0.3.159-1
+- New upstream release and this should go to Fedora.
+
+* Sun Jan 11 2009 Matěj Cepl <mcepl at redhat.com> 0.3.151-0.5
+- Fixed building and installing lang files.
+
+* Thu Jan 01 2009 Matěj Cepl <mcepl at redhat.com> 0.3.131-0.1.f10only
+- Testing build of the new upstream release (because of broken upgrade
+ build).
+
+* Thu Jun 26 2008 Matěj Cepl <mcepl at redhat.com> 0.2.201-2
+- Fixing packaging bugs mentioned in the package review.
+
+* Fri Jun 20 2008 Matěj Cepl <mcepl at redhat.com> 0.2.201-1
+- New upstream release.
+
+* Wed Jun 27 2007 Matej Cepl <mcepl at redhat.com> - 0.2.182-1
+- New upstream version (finally!)
+
+* Wed Jun 13 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn172-3
+- Fix locales
+
+* Wed May 23 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn172-2
+- New SVN checkout.
+- Working on Fedora package review.
+- We have svn export so no .svn directories, so no need to remove them
+- Fix Makefile -- DESTDIR should be / per default and don't
+ remove during the installation process
+- Fixed fixing of file permissions -- we did too much and in too
+ many places; consolidated to %%prep stage.
+
+* Mon May 21 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn169-1
+- New SVN checkout
+
+* Thu May 10 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn162-1
+- New SVN checkout
+
+* Tue Apr 3 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn148-2
+- changed BuildRoot to more sane value, now it is allowed.
+
+* Mon Feb 26 2007 Matěj Cepl <mcepl at redhat.com> 0.2.114.svn148-1
+- New upstream SVN
+- encoding is back again with us
+
+* Tue Dec 19 2006 Matěj Cepl <mcepl at redhat.com> 0.2.114.svn145-1
+- Changed to SVN source.
+- Upstream fixed problems with too many shebang lines and encoding of GPL.
+
+* Tue Nov 7 2006 Matěj Cepl <mcepl at redhat.com> 0.2.114-0
+- Initial build.
diff --git a/patch b/patch
new file mode 100644
index 0000000..940199c
--- /dev/null
+++ b/patch
@@ -0,0 +1,496 @@
+diff --git a/.gitignore b/.gitignore
+deleted file mode 100644
+index 60eae5f..0000000
+--- a/.gitignore
++++ /dev/null
+@@ -1,5 +0,0 @@
+-jbrout-0.3.282.tar.xz
+-jbrout_0.3.284.tar.gz
+-jbrout.tar.bz2
+-/jbrout.tar.bz2
+-/jbrout.tar.xz
+diff --git a/dead.package b/dead.package
+new file mode 100644
+index 0000000..6975116
+--- /dev/null
++++ b/dead.package
+@@ -0,0 +1 @@
++Retired on 2014-07-06 due to lack of a maintainer in preparation to branch Fedora 21
+diff --git a/jbrout-Makefile b/jbrout-Makefile
+deleted file mode 100644
+index 56ef323..0000000
+--- a/jbrout-Makefile
++++ /dev/null
+@@ -1,10 +0,0 @@
+-DESTDIR=
+-PODIR=po
+-
+-all: build
+-
+-install:
+- ./install-script $(DESTDIR)
+-
+-build:
+- find $(PODIR) -name \*.po -exec msgfmt -vc '{}' \;
+diff --git a/jbrout-clean-SVN-checkout.sh b/jbrout-clean-SVN-checkout.sh
+deleted file mode 100644
+index 81ce06c..0000000
+--- a/jbrout-clean-SVN-checkout.sh
++++ /dev/null
+@@ -1,24 +0,0 @@
+-#!/bin/sh
+-set -x
+-
+-[ -n "$1" ] && REPACK="true"
+-
+-if [ -n "$REPACK" ] ; then
+- [ -d "jbrout" ] && rm -rf jbrout
+- tar xvf "$1"
+- cd jbrout
+-fi
+-
+-rm -rf dist
+-rm -rvf jbrout/plugins/multiexport/libs/picasaweb/{atom,gdata}/
+-
+-find . \( -name \*.exe -o -name \*.dll \) -print -delete
+-find . \( -name \*.py -o -name \*.glade -o -name \*.xsl \) -exec dos2unix -k '{}' \;
+-find . -type f -executable -exec chmod -x {} \;
+-find . -name \*.py -exec sed -i -e '/^#!\/usr.*\/bin\/.*python/d' '{}' \;
+-
+-if [ "x$REPACK" = "xtrue" ] ; then
+- cd ..
+- rm -fv "$1"
+- tar cvjf jbrout.tar.bz2 jbrout
+-fi
+diff --git a/jbrout-install.sh b/jbrout-install.sh
+deleted file mode 100644
+index 0284933..0000000
+--- a/jbrout-install.sh
++++ /dev/null
+@@ -1,19 +0,0 @@
+-#!/bin/sh
+-set -x
+-DESTDIR=$1
+-
+-install -m a+rx,u+w -d $DESTDIR/usr/share/jbrout/
+-cp -r plugins libs jbrout data $DESTDIR/usr/share/jbrout/
+-find po |while read NAME ; do \
+- if [ -d $NAME ] ; then \
+- install -m a+rx,u+w -d $DESTDIR/usr/share/locale/$NAME ;\
+- elif [ $NAME == *.mo ] ; then \
+- install -p -m a+r,u+w $NAME "$DESTDIR/usr/share/jbrout/locale/$NAME" ;\
+- fi ;\
+-done
+-chmod -R a+rX,u+w plugins $DESTDIR/usr/share/
+-install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ *.py
+-install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/gpl.txt
+-install -p -m a+r,u+w -t $DESTDIR/usr/share/jbrout/ data/jbrout.glade
+-chmod -x $DESTDIR/usr/share/jbrout/jbrout.py
+-
+diff --git a/jbrout-no-pyexiv2-warning.patch b/jbrout-no-pyexiv2-warning.patch
+deleted file mode 100644
+index 0d740d1..0000000
+--- a/jbrout-no-pyexiv2-warning.patch
++++ /dev/null
+@@ -1,30 +0,0 @@
+-Index: jbrout/jbrout/jbrout.py
+-===================================================================
+---- jbrout.orig/jbrout/jbrout.py
+-+++ jbrout/jbrout/jbrout.py
+-@@ -3117,9 +3117,6 @@ if __name__ == "__main__":
+- psyco.full()
+- except:
+- print "The psyco module does not seem to be installed. It is not necessary, however it can speed up performance."
+-- # Print pyexiv2-0.2+ warning if necessary
+-- from jbrout.pyexiv import Check
+-- Check()
+-
+- try:
+- parser = optparse.OptionParser(usage=USAGE, version=("JBrout "+__version__))
+-Index: jbrout/jbrout/jbrout/pyexiv.py
+-===================================================================
+---- jbrout.orig/jbrout/jbrout/pyexiv.py
+-+++ jbrout/jbrout/jbrout/pyexiv.py
+-@@ -269,11 +269,6 @@ def Image(f):
+- # pyexiv2 < 0.2
+- return Exiv1Metadata(f)
+-
+--def Check():
+-- if hasattr(pyexiv2,"ImageMetadata"):
+-- # pyexiv2 >= 0.2
+-- print "***WARNING*** : YOU ARE USING pyexiv2>0.2 (jbrout doesn't support very well this new version ! not fully tested ! some things are not implemented !!!)"
+--
+- if __name__ == "__main__":
+- t=Image("/home/manatlan/Documents/python/tests_libs_python/TestJPG/p20030830_130202 (copie).jpg")
+- #~ t=Image("/home/manatlan/Documents/python/tests_libs_python/TestJPG/p20030830_130202.jpg")
+diff --git a/jbrout-pillow.patch b/jbrout-pillow.patch
+deleted file mode 100644
+index e5c5574..0000000
+--- a/jbrout-pillow.patch
++++ /dev/null
+@@ -1,26 +0,0 @@
+-Index: jbrout/jbrout/jbrout.py
+-===================================================================
+---- jbrout.orig/jbrout/jbrout.py
+-+++ jbrout/jbrout/jbrout.py
+-@@ -2387,7 +2387,7 @@ class Window(GladeApp):
+- openURL(u"http://jbrout.free.fr/help/%s/" % lang)
+-
+- def on_a_propos_activate(self, widget, *args):
+-- import Image
+-+ from PIL import Image
+- 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
+- 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/)"
+-
+diff --git a/jbrout-purge-no-attribute-attrib.patch b/jbrout-purge-no-attribute-attrib.patch
+deleted file mode 100644
+index 074a08e..0000000
+--- a/jbrout-purge-no-attribute-attrib.patch
++++ /dev/null
+@@ -1,28 +0,0 @@
+-Index: jbrout/jbrout/jbrout/db.py
+-===================================================================
+---- jbrout.orig/jbrout/jbrout/db.py
+-+++ jbrout/jbrout/jbrout/db.py
+-@@ -14,6 +14,7 @@
+- ##
+-
+- 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):
+- real = property(__getReal)
+-
+- def __getFolder(self):
+-- na=dec(self.__node.getparent().attrib["name"])
+-+ try:
+-+ na=dec(self.__node.getparent().attrib["name"])
+-+ except Exception as exc:
+-+ print >>sys.stderr, "Catching exception e:\n%s" % exc
+-+ print >>sys.stderr, "self.__node = %s" % \
+-+ 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
+- return na
+- folder = property(__getFolder)
+diff --git a/jbrout-usr_bin b/jbrout-usr_bin
+deleted file mode 100644
+index 5012acc..0000000
+--- a/jbrout-usr_bin
++++ /dev/null
+@@ -1,11 +0,0 @@
+-#!/bin/sh
+-APPPATH=/usr/share/jbrout/jbrout.py
+-
+-PYTHON=`which python`
+-if [ $? != 0 ]; then
+- echo "jbrout requires Python >= 2.4 to be installed." >/dev/stderr
+- exit 1
+-fi
+-
+-cd $(dirname $APPPATH)
+-"$PYTHON" "$APPPATH" "$@"
+diff --git a/jbrout.desktop b/jbrout.desktop
+deleted file mode 100644
+index 5a55616..0000000
+--- a/jbrout.desktop
++++ /dev/null
+@@ -1,11 +0,0 @@
+-[Desktop Entry]
+-Encoding=UTF-8
+-Name=jBrout
+-GenericName=Photo Collection Manager
+-GenericName[cs]=Správce fotografické sbírky
+-Type=Application
+-Exec=/usr/bin/jbrout
+-Icon=/usr/share/jbrout/data/gfx/jbrout.png
+-Terminal=false
+-StartupNotify=true
+-Categories=GNOME;GTK;Graphics;2DGraphics;Viewer;RasterGraphics;Photography;
+diff --git a/jbrout.spec b/jbrout.spec
+deleted file mode 100644
+index a52c6c1..0000000
+--- a/jbrout.spec
++++ /dev/null
+@@ -1,258 +0,0 @@
+-%global svn_checkout 1
+-%global revno 338
+-
+-Name: jbrout
+-Version: 0.3.%{revno}
+-%if 0%{?svn_checkout}
+-Release: 0.10.svn%{revno}%{?dist}
+-%else
+-Release: 3%{?dist}
+-%endif
+-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/
+-Source0: %{name}.tar.xz
+-%else
+-Source0: http://jbrout.free.fr/download/sources/%{name}_%{version}.tar.gz
+-%endif
+-Source1: jbrout-Makefile
+-Source2: jbrout.desktop
+-Source3: jbrout-usr_bin
+-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
+-BuildArch: noarch
+-Requires: python >= 2.4, python-lxml, pygtk2 >= 2.6
+-Requires: python-imaging, pyexiv2 >= 0.1.2, fbida
+-Requires: python-gdata
+-# required due to exiftool
+-Requires: perl-Image-ExifTool
+-BuildRequires: gettext, desktop-file-utils,
+-
+-%description
+-jBrout is able to :
+- * manage albums/photos (= folders/files)
+- * tag photos with IPTC keywords
+- * use internal jpeg thumbnail
+- * comment photos (with jpeg comment) and album (textfile in
+- folder)
+- * rotate loss-less jpeg (and internal jpeg thumbnail)
+- use EXIF info (date, size ..)
+- * search pictures (tags, comment, date, ...)
+- * use plugins (to export to html/gallery, to act like
+- a httpserver, to export pictures to be mailed, ...)
+- * work without database ! (just a xmlfile which can be rebuild
+- from scratch)
+- * handle a lot of photos (jbrout's author claims to have more than 20000
+- of them)
+- * upload photos to a flickr account
+- * ...
+-
+-%prep
+-%setup -q -n %{name}
+-%patch0 -p1 -b .noAttributeAttrib
+-%patch1 -p1 -b .noPyexiv2Warn
+-%patch2 -p1 -b .compat-pillow
+-sh %{SOURCE5}
+-install -p %{SOURCE1} jbrout/Makefile
+-install -p -m a+rx,u+w %{SOURCE4} jbrout/install-script
+-
+-%build
+-cd %{name}
+-ls
+-make PODIR=po
+-
+-%install
+-cd %{name}
+-make DESTDIR=%{buildroot} install
+-
+-install -D -m a+rx,u+w %{SOURCE3} %{buildroot}%{_bindir}/%{name}
+-install -D -p -m a+rx,u+w %{SOURCE2} %{buildroot}%{_datadir}/applications/%{name}.desktop
+-
+-desktop-file-install \
+- --dir %{buildroot}%{_datadir}/applications \
+- --add-category=X-Fedora \
+- --delete-original \
+- %{buildroot}%{_datadir}/applications/%{name}.desktop
+-
+-%files
+-%doc %{name}/data/gpl.txt
+-%{_bindir}/jbrout
+-%{_datadir}/jbrout/
+-%exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
+-%lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo
+-%lang(it) %{_datadir}/jbrout/plugins/*/po/it/LC_MESSAGES/plugin.mo
+-%{_datadir}/applications/jbrout.desktop
+-
+-%changelog
+-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.10.svn338
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+-
+-* Sun Sep 01 2013 Peter Lemenkov <lemenkov at gmail.com> - 0.3.338-0.9.svn338
+-- Compress wih xz and remove win32-related binaties from the source tarball
+-- Remove RHEL6-related bits. We can't use jbroun in RHEL6 (see rhbz #749473)
+-
+-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.8.svn338
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+-
+-* Mon Feb 4 2013 Toshio Kuratomi <toshio at fedoraproject.org> - 0.3.338-0.7.svn338
+-- Compatibility with python-pillow
+-
+-* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.6.svn338
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+-
+-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.338-0.5.svn338
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+-
+-* Thu Oct 27 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.4.svn338
+-- fix find cleaning .exe and .dll (closes #749425)
+-
+-* Mon Oct 24 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.3
+-- yet another new version of exiv2 library.
+-
+-* Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.2
+-- Rebuilt against new libraries.
+-
+-* Sat Jul 30 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1.1
+-- Rebuilt against new libraries.
+-
+-* Sun Jul 10 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.338-0.svn338.1
+-- New upstream snapshot (GPL version fixed and one more issue resolved)
+-- Eliminate again non-sensical pyexiv2 warning.
+-
+-* Wed Jul 06 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.336-0.svn336.1
+-- All our patches were applied upstream, new SVN checkout
+-
+-* Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.329-3
+-- remove obsolete jbrout-allow-Exif-Orientation-zero.patch
+-
+-* Tue Jul 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.329-2
+-- new upstream checkout (r329)
+-- refresh eliminate-metadata-exiftool patch (upstream #129)
+-- fix crash with weird iconsize and more recent Gtk (upstream
+- #186)
+-- fix import of tags from Xmp.dc.subject (upstream also #129)
+-- add more diagnostics for investigating weird crash with
+- getParent being None sometimes
+-- use Freedesktop directories instead of ~/.jbrout (upstream
+- #56)
+-
+-* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.323-0.svn323.5.1
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+-
+-* Wed Jan 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.5
+-- Add patch to survive bad thumbnail (upstream #179)
+-
+-* Tue Jan 04 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.4
+-- Eliminate exiftool for metadata, make more robust (upstream #129)
+-
+-* Mon Dec 20 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-3
+-- apply patch improving Download plugin (upstream #155)
+-
+-* Mon Dec 20 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-2
+-- patch for ExifOrientation == 0 (upstream #177)
+-
+-* Sat Dec 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.1
+-- Reapply my patch allowing non-standard values of Exif.Orientation.
+-- Make it configurable whether we build from a checkout or tarball.
+-
+-* Thu Dec 09 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.284-2
+-- Fix the build and make AutoQA happy.
+-
+-* Mon Aug 16 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.284-1
+-- New upstream release (rhbz#624467)
+-
+-* Wed Aug 11 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.282-0.3.20100124svn282
+-- recompiling .py files against Python 2.7 (rhbz#623324)
+-
+-* Sun Jan 24 2010 Peter Lemenkov <lemenkov at gmail.com> 0.3.282-0.2.20100124svn282
+-- Added BR for exiftool (thanks, Rahul Sundaram <sundaram at fedoraproject.org>)
+-
+-* Sun Jan 24 2010 Peter Lemenkov <lemenkov at gmail.com> 0.3.282-0.1.20100124svn282
+-- Updated to svn ver. 282
+-- Fixed #558151
+-- Added BR python-gdata
+-
+-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.174-4.0.20090714svn223.1
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+-
+-* Tue Jul 14 2009 Matěj Cepl <mcepl at redhat.com> 0.3.174-3.0.20090714svn223.1
+-- Attempt to build a new upstream SVN checkout. Fixes bug 510642
+-- Remove unneeded files (*.exe, *.c)
+-
+-* Mon Jul 13 2009 Matěj Cepl <mcepl at redhat.com> - 0.3.174-2
+-- Use hashlib if possible.
+-
+-* Sat Mar 21 2009 Matej Cepl <mcepl at redhat.com> 0.3.174-1
+-- New upstream release
+-
+-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.159-3
+-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+-
+-* Tue Feb 17 2009 Matěj Cepl <mcepl at redhat.com> - 0.3.159-2
+-- add fbida as Requires
+-
+-* Thu Jan 15 2009 Matěj Cepl <mcepl at redhat.com> 0.3.159-1
+-- New upstream release and this should go to Fedora.
+-
+-* Sun Jan 11 2009 Matěj Cepl <mcepl at redhat.com> 0.3.151-0.5
+-- Fixed building and installing lang files.
+-
+-* Thu Jan 01 2009 Matěj Cepl <mcepl at redhat.com> 0.3.131-0.1.f10only
+-- Testing build of the new upstream release (because of broken upgrade
+- build).
+-
+-* Thu Jun 26 2008 Matěj Cepl <mcepl at redhat.com> 0.2.201-2
+-- Fixing packaging bugs mentioned in the package review.
+-
+-* Fri Jun 20 2008 Matěj Cepl <mcepl at redhat.com> 0.2.201-1
+-- New upstream release.
+-
+-* Wed Jun 27 2007 Matej Cepl <mcepl at redhat.com> - 0.2.182-1
+-- New upstream version (finally!)
+-
+-* Wed Jun 13 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn172-3
+-- Fix locales
+-
+-* Wed May 23 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn172-2
+-- New SVN checkout.
+-- Working on Fedora package review.
+-- We have svn export so no .svn directories, so no need to remove them
+-- Fix Makefile -- DESTDIR should be / per default and don't
+- remove during the installation process
+-- Fixed fixing of file permissions -- we did too much and in too
+- many places; consolidated to %%prep stage.
+-
+-* Mon May 21 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn169-1
+-- New SVN checkout
+-
+-* Thu May 10 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn162-1
+-- New SVN checkout
+-
+-* Tue Apr 3 2007 Matej Cepl <mcepl at redhat.com> - 0.2.114.svn148-2
+-- changed BuildRoot to more sane value, now it is allowed.
+-
+-* Mon Feb 26 2007 Matěj Cepl <mcepl at redhat.com> 0.2.114.svn148-1
+-- New upstream SVN
+-- encoding is back again with us
+-
+-* Tue Dec 19 2006 Matěj Cepl <mcepl at redhat.com> 0.2.114.svn145-1
+-- Changed to SVN source.
+-- Upstream fixed problems with too many shebang lines and encoding of GPL.
+-
+-* Tue Nov 7 2006 Matěj Cepl <mcepl at redhat.com> 0.2.114-0
+-- Initial build.
+diff --git a/sources b/sources
+deleted file mode 100644
+index 9f8af94..0000000
+--- a/sources
++++ /dev/null
+@@ -1 +0,0 @@
+-8d1266cf1cb7e330a9086dc1cd049834 jbrout.tar.xz
diff --git a/sources b/sources
new file mode 100644
index 0000000..9f8af94
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+8d1266cf1cb7e330a9086dc1cd049834 jbrout.tar.xz
More information about the scm-commits
mailing list