[pdfshuffler] * Thu Jan 26 2012 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-0.1.20120126svn64 - Update to cur

[Fabian Affolter]

commit a56ffb3fb9fdb8ded78a0ec8683fe3df584a75f6
Author: Fabian Affolter <mail at fabian-affolter.ch>
Date:   Fri Mar 2 09:46:58 2012 +0100

    * Thu Jan 26 2012 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-0.1.20120126svn64
    - Update to current SVN snapshot

 .gitignore                    |    1 +
 pdfshuffler-svn-checkout.sh   |   10 ++++++++++
 pdfshuffler-ui-location.patch |   13 +++++++++++++
 pdfshuffler.spec              |   21 +++++++++++++++++----
 sources                       |    2 +-
 5 files changed, 42 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e227872..c5a6f8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 pdfshuffler-0.5.tar.gz
 /pdfshuffler-0.5.1.tar.gz
+/pdfshuffler-20120302svn.tar.xz
diff --git a/pdfshuffler-svn-checkout.sh b/pdfshuffler-svn-checkout.sh
new file mode 100644
index 0000000..5a85fe0
--- /dev/null
+++ b/pdfshuffler-svn-checkout.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+DATE=$(date +%Y%m%d)
+
+set -x
+
+rm -rf pdfshuffler
+svn export https://pdfshuffler.svn.sourceforge.net/svnroot/pdfshuffler/trunk pdfshuffler
+tar cJf pdfshuffler-${DATE}svn.tar.xz pdfshuffler
+
+rm -rf pershuffler
diff --git a/pdfshuffler-ui-location.patch b/pdfshuffler-ui-location.patch
new file mode 100644
index 0000000..a877a04
--- /dev/null
+++ b/pdfshuffler-ui-location.patch
@@ -0,0 +1,13 @@
+--- a/pdfshuffler-ui-location.patch	
++++ a/pdfshuffler-ui-location.patch	
+@@ -0,0 +1,12 @@ 
++diff -up ./pdfshuffler/pdfshuffler.py.orig ./pdfshuffler/pdfshuffler.py
++--- ./pdfshuffler/pdfshuffler.py.orig	2012-01-26 14:10:15.706139193 -0600
++@@ -110,7 +110,7 @@ class PdfShuffler:
++             print(_("Can't load icon. Application is not installed correctly."))
++ 
++         # Import the user interface file, trying different possible locations
++-        ui_path = '/usr/share/pdfshuffler/pdfshuffler.ui'
++         if not os.path.exists(ui_path):
++             ui_path = '/usr/local/share/applications/pdfshuffler/pdfshuffler.ui'
++             if not os.path.exists(ui_path):
diff --git a/pdfshuffler.spec b/pdfshuffler.spec
index 73a4446..2fc4c18 100644
--- a/pdfshuffler.spec
+++ b/pdfshuffler.spec
@@ -2,15 +2,22 @@
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %endif
 
+%global svndate 20120126
+%global svnrev  64
+
 Name:           pdfshuffler
-Version:        0.5.1
-Release:        2%{?dist}
+Version:        0.6.0
+#Release:        1%{?dist}
+Release:        0.1.%{svndate}svn%{svnrev}%{?dist}
 Summary:        PDF file merging, rearranging, and splitting
 
 Group:          Applications/Publishing
 License:        GPLv2+
 URL:            http://sourceforge.net/projects/pdfshuffler/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Source0:        pdfshuffler-%{svndate}svn.tar.xz
+Source1:        pdfshuffler-svn-checkout.sh
+Patch0:         pdfshuffler-ui-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)     
 BuildArch:      noarch
 
@@ -31,7 +38,8 @@ pages using an interactive and intuitive graphical interface.
 
 
 %prep
-%setup -q
+%setup -q -n pdfshuffler
+%patch0 -b .uilocation
 
 
 %build
@@ -55,12 +63,17 @@ rm -rf %{buildroot}
 %{_mandir}/man*/*.*
 %{_bindir}/%{name}
 %{_datadir}/applications/%{name}.desktop
+%{_datadir}/applications/%{name}/
 %{_datadir}/pixmaps/%{name}.png
 %{_datadir}/pixmaps/%{name}.svg
 %{python_sitelib}/%{name}*.egg-info
+%{python_sitelib}/%{name}/
 
 
 %changelog
+* Thu Jan 26 2012 Jason L Tibbitts III <tibbs at math.uh.edu> - 0.6.0-0.1.20120126svn64
+- Update to current SVN snapshot
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index d68339f..fec31e2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a63e4e37c822e6bd3932aed53ad3e070  pdfshuffler-0.5.1.tar.gz
+0d803aecb5be06d74a412a5edb627ad8  pdfshuffler-20120302svn.tar.xz