[pdfjam] - Update to 2.07

[Michel Alexandre Salim]

commit 3eb8efee30e212b581ecbd0446f47fe5bf65776a
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sun Nov 14 21:19:11 2010 +0100

    - Update to 2.07

 .gitignore                     |    2 +-
 pdfjam-2.07-no_user_conf.patch |   22 ++++++++++++++++++++++
 pdfjam.spec                    |   31 +++++++++++++++++++++++++------
 sources                        |    2 +-
 4 files changed, 49 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 146e9cd..a48ec00 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-pdfjam_1.21.tar.gz
+/pdfjam_207.tgz
diff --git a/pdfjam-2.07-no_user_conf.patch b/pdfjam-2.07-no_user_conf.patch
new file mode 100644
index 0000000..07320fc
--- /dev/null
+++ b/pdfjam-2.07-no_user_conf.patch
@@ -0,0 +1,22 @@
+--- pdfjam/tests/expected output/Prattled/test5.txt.no_user_conf	2010-11-13 17:43:38.000000000 +0100
++++ pdfjam/tests/expected output/Prattled/test5.txt	2010-11-14 20:48:57.518664741 +0100
+@@ -1,18 +1,7 @@
+           ----
+   pdfjam: This is pdfjam version 2.07.
+   pdfjam: Reading any site-wide or user-specific defaults...
+-              ## 
+-              ## From /home/david/.pdfjam.conf: 
+-              ##
+-              tempfileDir='/var/tmp'
+-              tidy='true'
+-              keepinfo='false'
+-              checkfiles='false'
+-              paper='a4paper'
+-              outFile="$pwd"
+-              suffix='-pdfjam'
+-              landscape='false'
+-              twoside='false'
++          (none found)
+   pdfjam: Effective call for this run of pdfjam:
+           ../bin/pdfjam --booklet 'true' --landscape --suffix book --signature '4' --suffix test5 --outfile actual output/PDF files --preamble '\usepackage{everyshi}
+           \makeatletter
diff --git a/pdfjam.spec b/pdfjam.spec
index 70327a0..9e9617d 100644
--- a/pdfjam.spec
+++ b/pdfjam.spec
@@ -1,16 +1,25 @@
+%global majver  2
+%global minver  07
+
 Name:           pdfjam
-Version:        1.21
-Release:        2%{?dist}
-Summary:        Utilities for join, rotate and align PDFs
+Version:        %{majver}.%{minver}
+Release:        1%{?dist}
+Summary:        Utilities for joining, rotating and aligning PDFs
 
 Group:          Applications/Publishing
 # No version specified.
 License:        GPL+
 URL:            http://go.warwick.ac.uk/pdfjam
-Source0:        http://www2.warwick.ac.uk/fac/sci/statistics/staff/academic/firth/software/pdfjam/pdfjam_%{version}.tar.gz
+Source0:        http://go.warwick.ac.uk/pdfjam/pdfjam_%{majver}%{minver}.tgz
+# test5 expected output erroneously created on a system with a specific
+# user configuration file
+Patch0:         pdfjam-2.07-no_user_conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
+# for testing
+BuildRequires:	tetex-latex
+
 Requires:       tetex-latex
 # for mktemp
 Requires:       coreutils
@@ -39,6 +48,8 @@ ps2pdf" (in the author's experience).
 
 %prep
 %setup -q -n pdfjam
+unzip tests.zip
+%patch0 -p1 -b .no_user_conf
 
 %build
 
@@ -46,21 +57,29 @@ ps2pdf" (in the author's experience).
 rm -rf $RPM_BUILD_ROOT
 
 install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install -p -m 755 scripts/* $RPM_BUILD_ROOT%{_bindir}/
+install -p -m 755 bin/* $RPM_BUILD_ROOT%{_bindir}/
 install -p -m 644 man1/* $RPM_BUILD_ROOT%{_mandir}/man1/
 
+%check
+cd tests
+./run.sh | tee testlog.txt
+[ `grep ^OK testlog.txt | wc -l` == 5 ]
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING PDFjam-README.html pdfdroplets.png
+%doc COPYING PDFjam-README.html pdfdroplets.png pdfjam.conf
 %{_bindir}/*
 %{_mandir}/man1/*
 
 
 %changelog
+* Sun Nov 14 2010 Michel Salim <salimma at fedoraproject.org> - 2.07-1
+- Update to 2.07
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 078887c..bd84cd5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-71d2d664777d32ec4154ab4c2e5965dc  pdfjam_1.21.tar.gz
+3cd43a6719de4f4dc96286738315eff8  pdfjam_207.tgz