[pgp-tools] Fix dependency issue agains perl(for) (#1184547)
Jochen Schmitt
s4504kr at fedoraproject.org
Wed Jan 21 18:38:04 UTC 2015
commit 1316cfda4d366f1b07b76a2f90fdbd8cd3779c9e
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date: Sat Jan 10 12:46:46 2015 +0100
Fix dependency issue agains perl(for) (#1184547)
.gitignore | 1 +
pgp-tools-1.1-drop-pgpring.patch | 26 --------------------------
pgp-tools-1.1.10-drop-pgpring.patch | 24 ++++++++++++++++++++++++
pgp-tools-1.1.4-paper.patch | 14 --------------
pgp-tools-1.1.5-caff.patch | 13 -------------
pgp-tools-1.1.5-key2ps.patch | 12 ------------
pgp-tools.spec | 24 ++++++++++++------------
sources | 2 +-
8 files changed, 38 insertions(+), 78 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1e54e8b..ca1a7fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ signing-party_1.1.orig.tar.gz
/signing-party_1.1.3.orig.tar.gz
/signing-party_1.1.4.orig.tar.gz
/signing-party_1.1.5.orig.tar.gz
+/signing-party_1.1.10.orig.tar.gz
diff --git a/pgp-tools-1.1.10-drop-pgpring.patch b/pgp-tools-1.1.10-drop-pgpring.patch
new file mode 100644
index 0000000..f23637a
--- /dev/null
+++ b/pgp-tools-1.1.10-drop-pgpring.patch
@@ -0,0 +1,24 @@
+diff -up signing-party-1.1.10/keyanalyze/Makefile.pgpring signing-party-1.1.10/keyanalyze/Makefile
+--- signing-party-1.1.10/keyanalyze/Makefile.pgpring 2015-01-10 12:13:05.959828171 +0100
++++ signing-party-1.1.10/keyanalyze/Makefile 2015-01-10 12:20:05.449803428 +0100
+@@ -1,18 +1,12 @@
+ LDLIBS=-lpthread
+ CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+
+-all: keyanalyze process_keys pgpring/pgpring
++all: keyanalyze process_keys
+
+ keyanalyze: keyanalyze.o
+ process_keys: process_keys.o
+
+-pgpring/pgpring:
+- cd pgpring && touch AUTHORS ChangeLog INSTALL NEWS README && automake-1.11 --add-missing && automake-1.11
+- cd pgpring && autoconf && CFLAGS="${CFLAGS}" ./configure
+- make -C pgpring pgpring
+-
+-install:
+- install pgpring/pgpring $(DESTDIR)/usr/bin
++ install:
+ install keyanalyze $(DESTDIR)/usr/bin
+ install process_keys $(DESTDIR)/usr/bin
+
diff --git a/pgp-tools.spec b/pgp-tools.spec
index c8541e8..aed9600 100644
--- a/pgp-tools.spec
+++ b/pgp-tools.spec
@@ -1,18 +1,16 @@
%global tarballname signing-party
-%global debian_version 1.1.5
+%global debian_version 1.1.10
+%global __requires_exclude perl\\\(for\\\)
+
Name: pgp-tools
Version: %{debian_version}
-Release: 7%{?dist}
+Release: 2%{?dist}
Summary: Collection of several utilities related to OpenPGP
Group: Applications/System
License: BSD and GPLv2+
URL: http://pgp-tools.alioth.debian.org/
Source0: http://ftp.debian.org/debian/pool/main/s/%{tarballname}/%{tarballname}_%{debian_version}.orig.tar.gz
-# Drop pgpring, because there is a better copy in mutt, not upstreamable
-Patch0: %{name}-1.1-drop-pgpring.patch
-Patch1: %{name}-1.1.4-paper.patch
-Patch2: %{name}-1.1.5-key2ps.patch
-Patch3: %{name}-1.1.5-caff.patch
+Patch0: %{name}-1.1.10-drop-pgpring.patch
# for gpgdir test suite
%if 0%{?fedora} > 18
BuildRequires: perl-podlators
@@ -48,13 +46,10 @@ This is a collection of several projects relating to OpenPGP.
In other distributions this package is called 'signing-party':
%prep
-%setup -q -n %{tarballname}-%{version}
+%setup -q -c -n %{tarballname}-%{version}
# 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
-%patch2 -p1
-%patch3 -p1
%build
make %{?_smp_mflags}
@@ -116,11 +111,16 @@ exit $RC
%defattr(-,root,root,-)
%{_bindir}/*
%{_mandir}/man1/*
-%{_datadir}/signing-party
%doc README COPYING
%doc __fedora_docs/*
%changelog
+* Wed Jan 21 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.10-2
+- Fix dependency issue agains perl(for) (#1184547)
+
+* Sat Jan 10 2015 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.10-1
+- New upstream release
+
* Sun Dec 7 2014 Jochen Schmitt <Jochen herr-schmitt de> - 1.1.5-7
- Add reference to 'signing-party' in the package description (#1171393)
diff --git a/sources b/sources
index 5803d4a..47acddc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1373575599dc08f07827d2cc4d030d5a signing-party_1.1.5.orig.tar.gz
+2f8a5b706bbfd53c45d82e176bc2a894 signing-party_1.1.10.orig.tar.gz
More information about the scm-commits
mailing list