[jbrout] Compress wih xz and remove win32-related binaties from the source tarball

[Peter Lemenkov]

commit 8dd6a24ffc7f5379cb91478034f2856fe37d7c90
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Sun Sep 1 15:47:51 2013 +0400

    Compress wih xz and remove win32-related binaties from the source tarball
    
    Signed-off-by: Peter Lemenkov <lemenkov at gmail.com>

 .gitignore  |    1 +
 jbrout.spec |   34 +++++++++++++++++-----------------
 sources     |    2 +-
 3 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e54821b..60eae5f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ 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.spec b/jbrout.spec
index 6092674..54a69b1 100644
--- a/jbrout.spec
+++ b/jbrout.spec
@@ -4,7 +4,7 @@
 Name:           jbrout
 Version:        0.3.%{revno}
 %if 0%{?svn_checkout}
-Release:        0.8.svn%{revno}%{?dist}
+Release:        0.9.svn%{revno}%{?dist}
 %else
 Release:        2%{?dist}
 %endif
@@ -14,8 +14,10 @@ License:        GPLv2
 URL:            http://jbrout.manatlan.com/
 %if 0%{?svn_checkout}
 # svn export -r %{revno} http://jbrout.googlecode.com/svn/trunk/ jbrout
-# tar cvjf jbrout.tar.bz2 jbrout/
-Source0:        %{name}.tar.bz2
+# 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
@@ -34,7 +36,6 @@ Patch1:         jbrout-no-pyexiv2-warning.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=895287
 Patch2: jbrout-pillow.patch
 BuildArch:      noarch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires:       python >= 2.4, python-lxml, pygtk2 >= 2.6
 Requires:       python-imaging, pyexiv2 >= 0.1.2, fbida
 Requires:       python-gdata
@@ -76,26 +77,21 @@ ls
 make PODIR=po
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cd %{name}
-make DESTDIR=$RPM_BUILD_ROOT install
+make DESTDIR=%{buildroot} 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
+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 $RPM_BUILD_ROOT%{_datadir}/applications \
+    --dir %{buildroot}%{_datadir}/applications \
     --add-category=X-Fedora \
     --delete-original \
-    $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+    %{buildroot}%{_datadir}/applications/%{name}.desktop
 
 %files
-%defattr(-,root,root,-)
-%{_bindir}/jbrout
 %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
@@ -103,6 +99,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/jbrout.desktop
 
 %changelog
+* 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
 
@@ -151,7 +151,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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
 
-* Tue Jan 05 2011 Matěj Cepl <mcepl at redhat.com> - 0.3.323-0.svn323.5
+* 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
@@ -160,7 +160,7 @@ rm -rf $RPM_BUILD_ROOT
 * Mon Dec 20 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-3
 - apply patch improving Download plugin (upstream #155)
 
-* Mon Dec 11 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.323-2
+* 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
diff --git a/sources b/sources
index 8214037..9f8af94 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6472144ab748287f61f8dd79b8cdbce3  jbrout.tar.bz2
+8d1266cf1cb7e330a9086dc1cd049834  jbrout.tar.xz