[pgp-tools/f13/master] - New upstream release - Get Source from http://ftp.debian.org - Upstream tarball contains verbain l

[Jochen Schmitt]

commit a2fa7b7e96334f22d3db383d7f3d9dd259195407
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Tue Sep 7 19:58:53 2010 +0200

    - New upstream release
    - Get Source from http://ftp.debian.org
    - Upstream tarball contains verbain license text

 .gitignore     |    1 +
 pgp-tools.spec |   37 ++++++++++++++++---------------------
 sources        |    2 +-
 3 files changed, 18 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f1ba79b..71c47bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 signing-party_1.1.orig.tar.gz
+/signing-party_1.1.3.orig.tar.gz
diff --git a/pgp-tools.spec b/pgp-tools.spec
index a202d22..0ceb705 100644
--- a/pgp-tools.spec
+++ b/pgp-tools.spec
@@ -1,25 +1,13 @@
 %define tarballname signing-party
-%define debian_version 1.1
+%define debian_version 1.1.3
 Name:           pgp-tools
-Version:        1.1
-Release:        4%{?dist}
+Version:        %{debian_version}
+Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 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
-# 
-# svn co svn://svn.debian.org/pgp-tools/tags/debian-version-1.0-2 signing-party-%{version}
-Source0:        %{tarballname}_%{debian_version}.orig.tar.gz
-# from svn debian/copyright, not included in tarballs.
-Source1:        copyright
+Source0:        http://ftp.debian.org/debian/pool/main/s/%{tarballname}/%{tarballname}_%{debian_version}.orig.tar.gz
 Patch0:         %{name}-1.1-drop-pgpring.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # for gpgdir test suite
@@ -52,10 +40,9 @@ This is a collection of several projects relating to OpenPGP.
 
 %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
+patch0 -p1
 
 %build
 make %{?_smp_mflags}
@@ -106,7 +93,6 @@ rm -rf __fedora_docs/gpglist
 rm -rf __fedora_docs/gpgparticipants
 mv __fedora_docs/keylookup/COPYING .
 
-
 %check
 pushd gpgdir/test
 ./gpgdir_test.pl
@@ -123,10 +109,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/*
 %{_mandir}/man1/*
 %{_datadir}/signing-party
-%doc README COPYING copyright
+%doc README COPYING
 %doc __fedora_docs/*
 
 %changelog
+* 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
+
+>>>>>>> 814d941... - New upstream release
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.1-4
 - rebuild against perl 5.10.1
 
@@ -163,7 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 * 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.
-  - Mention in manpage that keyserver-options is a useful setting in
+  - Mentioxn in manpage that keyserver-options is a useful setting in
     .caff/gnupghome/gpg.conf (Closes: debian #392811).
   - q-p-encode From: header (Closes: debian #366745).
 
diff --git a/sources b/sources
index 1bf4158..1eefedd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz
+7d0207ce9415c1687b610be14da0b048  signing-party_1.1.3.orig.tar.gz