[jbrout] New upstream release.

[Matej Cepl]

commit 7f4b622b5b99cfdeb977f460cc5be9f88d6b6543
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Tue Aug 24 18:29:31 2010 -0400

    New upstream release.
    
    - rebuild %prep so that it cleans all mess correctly with the current
      layout of the unmodified upstream tarball
    - fix .desktop file
    - update %description

 jbrout-Makefile |    2 +-
 jbrout.desktop  |    2 +-
 jbrout.spec     |   47 ++++++++++++-----------------------------------
 3 files changed, 14 insertions(+), 37 deletions(-)
---
diff --git a/jbrout-Makefile b/jbrout-Makefile
index 80d841d..f138427 100644
--- a/jbrout-Makefile
+++ b/jbrout-Makefile
@@ -3,7 +3,7 @@ DESTDIR=
 all: build
 
 install:
-	./install-script $(DESTDIR)
+	../install-script $(DESTDIR)
 
 build:
 	find po -name \*.po -exec msgfmt -vc '{}' \;
diff --git a/jbrout.desktop b/jbrout.desktop
index f6e5687..5a55616 100644
--- a/jbrout.desktop
+++ b/jbrout.desktop
@@ -8,4 +8,4 @@ Exec=/usr/bin/jbrout
 Icon=/usr/share/jbrout/data/gfx/jbrout.png
 Terminal=false
 StartupNotify=true
-Categories=GNOME;GTK;Graphics;Viewer;RasterGraphics;Photography;
+Categories=GNOME;GTK;Graphics;2DGraphics;Viewer;RasterGraphics;Photography;
diff --git a/jbrout.spec b/jbrout.spec
index 2ff983c..b1e8a64 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -5,35 +5,7 @@ Summary:        Photo manager, written in python/pygtk
 Group:          Applications/Multimedia
 License:        GPLv2
 URL:            http://jbrout.python-hosting.com/wiki
-
-## in order to rebuild  Source0 I advice you to type something like
-## cat ../SPECS/jbrout.spec | grep ^# | grep -v "##" | sed s,^#,,g | bash
-
-# svn export -r 282 http://jbrout.googlecode.com/svn/trunk/jbrout jbrout-0.3.282
-# svn export -r 282 http://jbrout.googlecode.com/svn/trunk/readme.txt jbrout-0.3.282/readme.txt
-
-## remove duplicated system libraries
-# rm -rf jbrout-0.3.282/plugins/multiexport/libs/picasaweb/atom/
-# rm -rf jbrout-0.3.282/plugins/multiexport/libs/picasaweb/gdata/
-# rm -f jbrout-0.3.282/data/tools/*.exe
-
-## fix CRLF
-# dos2unix jbrout-0.3.282/plugins/__init__.py
-# dos2unix jbrout-0.3.282/plugins/multiexport/libs/__init__.py
-# dos2unix jbrout-0.3.282/libs/dict4ini.py
-
-## remove unneeded shebang
-# sed -i -e '1d' jbrout-0.3.282/plugins/multiexport/libs/picasaweb/__init__.py
-# sed -i -e '2d' jbrout-0.3.282/jbrout/folderselect.py
-# sed -i -e '1d' jbrout-0.3.282/jbrout/tools.py
-
-## drop executable bit
-# find jbrout-0.3.282 -type f -executable -exec chmod -x {} \;
-
-## compress the rest of the code
-# tar cfJ jbrout-0.3.282.tar.xz jbrout-0.3.282
-
-Source0:        %{name}-%{version}.tar.xz
+Source0:        %{name}_%{version}.tar.gz
 Source1:        jbrout-Makefile
 Source2:        jbrout.desktop
 Source3:        jbrout-usr_bin
@@ -56,8 +28,7 @@ jBrout is able to :
      folder)
    * rotate loss-less jpeg (and internal jpeg thumbnail)
      use EXIF info (date, size ..)
-   * search pictures (tags, comment, date, ...) (not implemented
-     yet)
+   * 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
@@ -68,16 +39,22 @@ jBrout is able to :
    * ...
 
 %prep
-%setup -q
+%setup -q -n %{name}
 install -p %{SOURCE1} Makefile
 install -p -m a+rx,u+w %{SOURCE4} install-script
+rm -rf jbrout/plugins/multiexport/libs/picasaweb/{atom,gdata}/
+find jbrout/ -type f -exec chmod -x '{}' \;
+find jbrout/plugins/ -type f -exec sed -i -e '/^#!.*python/d' '{}' \;
+sed -i -e '/^#!\/usr.*\/bin\/python/d' jbrout/jbrout/tools.py
 
 %build
-make
+cd jbrout
+make -f ../Makefile
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install
+cd jbrout
+make  -f ../Makefile DESTDIR=$RPM_BUILD_ROOT install
 
 install -D -m a+rx,u+w %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}
 install -D -p -m a+rx,u+w %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
@@ -94,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %{_bindir}/jbrout
-%doc readme.txt data/gpl.txt
+%doc jbrout/data/gpl.txt
 %{_datadir}/jbrout/
 %exclude %{_datadir}/jbrout/plugins/*/po/*/LC_MESSAGES/plugin.mo
 %lang(fr) %{_datadir}/jbrout/plugins/*/po/fr/LC_MESSAGES/plugin.mo