[pgp-tools/el5] Perl 5.18 rebuild
Jochen Schmitt
s4504kr at fedoraproject.org
Thu Sep 12 18:39:30 UTC 2013
commit ecbedb7e2855b483eb6abcf2fcd3de490983a65c
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Thu Sep 12 20:39:16 2013 +0200
Perl 5.18 rebuild
pgp-tools-1.1.4-paper.patch | 14 +++
pgp-tools.spec | 201 ++++++++++++++++++++++++++++++++++---------
sources | 2 +-
3 files changed, 176 insertions(+), 41 deletions(-)
---
diff --git a/pgp-tools-1.1.4-paper.patch b/pgp-tools-1.1.4-paper.patch
new file mode 100644
index 0000000..174650d
--- /dev/null
+++ b/pgp-tools-1.1.4-paper.patch
@@ -0,0 +1,14 @@
+diff -up signing-party-1.1.4/gpg-key2ps/gpg-key2ps.paper signing-party-1.1.4/gpg-key2ps/gpg-key2ps
+--- signing-party-1.1.4/gpg-key2ps/gpg-key2ps.paper 2013-06-16 16:30:54.643953002 +0200
++++ signing-party-1.1.4/gpg-key2ps/gpg-key2ps 2013-06-16 16:33:36.937227454 +0200
+@@ -89,8 +89,8 @@ usage(\*STDERR, 1) unless scalar @ARGV >
+ # determine the paper size through the paperconf tool
+ my $w; my $h;
+ if ( `which paperconf` && $? == 0 ) {
+- $w=`paperconf -w`;
+- $h=`paperconf -h`;
++ $w=`paperconf -w | tr "," "."`;
++ $h=`paperconf -h` | tr "," "."`;
+ chomp($w);
+ chomp($h);
+ } else {
diff --git a/pgp-tools.spec b/pgp-tools.spec
index c2efe11..ce48b66 100644
--- a/pgp-tools.spec
+++ b/pgp-tools.spec
@@ -1,27 +1,28 @@
-%define tarballname signing-party
+%global tarballname signing-party
+%global debian_version 1.1.4
Name: pgp-tools
-Version: 0.4.9
-Release: 1%{?dist}
+Version: %{debian_version}
+Release: 3%{?dist}
Summary: Collection of several utilities related to OpenPGP
Group: Applications/System
-License: BSD, GPL
+License: BSD and GPLv2+
URL: http://pgp-tools.alioth.debian.org/
-# To check out the source tree from subversion, use this:
-# svn co svn://svn.debian.org/pgp-tools/trunk/ pgp-tools
-# or to get a particular revision:
-# svn co svn://svn.debian.org/pgp-tools/tags/release-%{version} signing-party-%{version}
-# Then to make the tarball, use:
-# tar cvzf signing-party_%{version}.orig.tar.gz --exclude=.svn --exclude=debian signing-party-%{version}/
-# For some releases you may also find source tarballs posted at
-# http://alioth.debian.org/project/showfiles.php?group_id=30435
-Source0: http://alioth.debian.org/download.php/1688/%{tarballname}_%{version}.orig.tar.gz
-# from svn debian/copyright, not included in tarballs.
-Source1: copyright
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
-Requires: gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
-
+Source0: http://ftp.debian.org/debian/pool/main/s/%{tarballname}/%{tarballname}_%{debian_version}.orig.tar.gz
+Patch0: %{name}-1.1-drop-pgpring.patch
+Patch1: %{name}-1.1.4-paper.patch
+# for gpgdir test suite
+%if 0%{?fedora} > 18
+BuildRequires: perl-podlators
+%endif
+BuildRequires: gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+BuildRequires: perl(Digest::MD5)
+Requires: gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: coreutils, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires: perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires: mutt
+# for gpg-key2ps
+Requires: libpaper
%description
This is a collection of several projects relating to OpenPGP.
@@ -31,52 +32,172 @@ This is a collection of several projects relating to OpenPGP.
* pgp-fixkey: removes broken packets from keys
* gpg-mailkeys: simply mail out a signed key to its owner
* gpg-key2ps: generate PostScript file with fingerprint paper strips
+* gpgdir: recursive directory encryption tool
* gpglist: show who signed which of your UIDs
* gpgsigs: annotates list of GnuPG keys with already done signatures
* keylookup: ncurses wrapper around gpg --search
+* gpgparticipants: create list of party participants for the organiser
+* gpgwrap: a passphrase wrapper
+* keyanalyze: minimum signing distance (MSD) analysis on keyrings
+* sig2dot: converts a list of GnuPG signatures to a .dot file
+* springgraph: creates a graph from a .dot file
%prep
%setup -q -n %{tarballname}-%{version}
-cp %SOURCE1 .
+# fix gpgdir library path lookup as we're using system-provided libraries
+sed -i -e "s,/usr/lib/gpgdir,," gpgdir/gpgdir
+%patch0 -p1
+%patch1 -p1
%build
make %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-DIRS="caff gpg-key2ps gpglist gpg-mailkeys gpgsigs keylookup"
-
-for file in `find $DIRS -type f -perm +0111 -print`
-do
- install -p -m755 $file $RPM_BUILD_ROOT%{_bindir}
+make install DESTDIR=$RPM_BUILD_ROOT || :
+# apps with no 'make install'
+for f in caff pgp-clean pgp-fixkey ; do
+install -m 755 caff/$f $RPM_BUILD_ROOT%{_bindir}/
done
-
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
+install -m 755 gpg-key2ps/gpg-key2ps $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgdir/gpgdir $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpglist/gpglist $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgwrap/bin/gpgwrap $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpg-mailkeys/gpg-mailkeys $RPM_BUILD_ROOT%{_bindir}/
+install -m 755 gpgparticipants/gpgparticipants $RPM_BUILD_ROOT%{_bindir}/
+
+# nuke apps creating their own docs dir
+rm -rf ${RPM_BUILD_ROOT}/usr/share/doc
+# find all manpages wherever they are hiding
+DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
+for man in `find $DIRS -type f -name "*.1" -print`
do
- install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
+ install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
done
-# cleanup to leave docs only...
-find . -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
-mv keylookup/COPYING .
+# nuke our copy of pgpring manpage
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
-%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf __fedora_docs
+mkdir __fedora_docs
+cp -a $DIRS __fedora_docs/
+
+# cleanup to leave docs only...
+find __fedora_docs/ -type f \( -perm +0111 -o -name Makefile -o -name "*.[1-9]" \) -print | xargs rm -f
+find __fedora_docs -type d -name src -exec rm -rf \{\} \; || :
+rm -rf __fedora_docs/keyanalyze/pgpring
+rm -rf __fedora_docs/keyanalyze/*.[cho]
+rm __fedora_docs/gpgdir/INSTALL
+rm -rf __fedora_docs/gpgdir/packaging
+rm -rf __fedora_docs/gpgdir/test
+rm -rf __fedora_docs/gpgwrap/{bin,doc}
+rm -rf __fedora_docs/gpglist
+rm -rf __fedora_docs/gpgparticipants
+mv __fedora_docs/keylookup/COPYING .
+
+%check
+pushd gpgdir/test
+./gpgdir_test.pl
+RC=0
+grep "STATUS: fail" output/*.test > /dev/null 2>&1 && RC=1
+popd
+exit $RC
%files
%defattr(-,root,root,-)
-%doc README TODO COPYING copyright
-%doc caff gpg-key2ps gpg-mailkeys gpgsigs keylookup
%{_bindir}/*
-%{_mandir}/*/*
-
+%{_mandir}/man1/*
+%{_datadir}/signing-party
+%doc README COPYING
+%doc __fedora_docs/*
%changelog
+* Sun Aug 04 2013 Petr Pisar <ppisar at redhat.com> - 1.1.4-3
+- Perl 5.18 rebuild
+
+* Sat Aug 3 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.4-2
+- Rebuilt for perl-5.18.0
+
+* Sun Jun 16 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.4.1-1
+- New upstream release
+- Add Req libpaper for gpg-key2ps
+- Fix local issue with the paper size (#831211)
+
+* Sun Feb 17 2013 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.3-11
+- Add perl-podlators as a BR
+- Remove BuildRoot definition
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Fri Jun 22 2012 Petr Pisar <ppisar at redhat.com> - 1.1.3-8
+- Perl 5.16 rebuild
+
+* Mon Apr 30 2012 Paul Howarth <paul at city-fan.org> - 1.1.3-7
+- Fix dependency declaration for Digest::MD5
+
+* Mon Apr 30 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 1.1.3-6
+- Add missing perl module to fix FTBFS
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 1.1.3-4
+- Perl mass rebuild
+
+* Tue Jul 19 2011 Petr Sabata <contyk at redhat.com> - 1.1.3-3
+- Perl mass rebuild
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Sep 7 2010 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.3-1
+- New upstream release
+- Get Source from http://ftp.debian.org
+- Upstream tarball contains verbain license text
+
+* Tue Jun 01 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.1-5
+- Mass rebuild with perl-5.12.0
+
+* Mon Dec 7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-4
+- rebuild against perl 5.10.1
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-2
+- add BRs so %%check succeeds
+- drop upstream's outdated copy of pgpring. mutt provides a newer
+ version, so require mutt.
+
+* Fri Apr 17 2009 Matt Domsch <mdomsch at fedoraproject.org> - 1.1-1
+- update to 1.1
+ adds gpgdir, gpgwrap, keyanalyze
+
+* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Tue May 20 2008 Matt Domsch <Matt_Domsch at dell.com> 1.0-1
+- upgrade to 1.0-1
+ - gpgsigs: Implement support for LaTeX output and photo ids.
+ (Closes: debian #412433, #430607)
+ - gpg-key2ps: Mention http://www.debian.org/events/materials/business-cards/
+ as an alternative. (Closes: debian #439510)
+ - add sig2dot and springgraph
+
+* Tue Feb 5 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.4.12-2
+- rebuild for new perl (and fix license tag)
+
+* Wed Sep 19 2007 Matt Domsch <Matt_Domsch at dell.com> 0.4.12-1
+- upgrade to 0.4.12
+- cleanup doc installation (BZ#246433)
+
* Thu Nov 02 2006 Matt Domsch <Matt_Domsch at dell.com> 0.4.9-1
- upgrade to 0.4.9
- Fix a bug with checking if we have exactly one or more keys that failed downloading.
diff --git a/sources b/sources
index 8866e5c..a85e43e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-da6bc997b3b12bc504acee87001e8be1 signing-party_0.4.9.orig.tar.gz
+675f8f1edd01baa8b58a743927d13750 signing-party_1.1.4.orig.tar.gz
More information about the scm-commits
mailing list