rpms/pgp-tools/F-11 pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 pgp-tools.spec, 1.11, 1.12
Matt Domsch
mdomsch at fedoraproject.org
Sat Apr 18 13:14:30 UTC 2009
Author: mdomsch
Update of /cvs/extras/rpms/pgp-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25276
Modified Files:
pgp-tools.spec
Added Files:
pgp-tools-1.1-drop-pgpring.patch
Log Message:
add BRs for %check; drop included pgpring, use mutt's copy instead
pgp-tools-1.1-drop-pgpring.patch:
--- NEW FILE pgp-tools-1.1-drop-pgpring.patch ---
diff -urNp --exclude-from=/home/mdomsch/excludes --minimal signing-party-1.1.orig/keyanalyze/Makefile signing-party-1.1/keyanalyze/Makefile
--- signing-party-1.1.orig/keyanalyze/Makefile 2009-02-21 04:30:01.000000000 -0600
+++ signing-party-1.1/keyanalyze/Makefile 2009-04-18 00:04:14.000000000 -0500
@@ -1,21 +1,16 @@
LDLIBS=-lpthread
CFLAGS=-O2 -W -Wall -g
-all: keyanalyze process_keys pgpring/pgpring
+all: keyanalyze process_keys
keyanalyze: keyanalyze.o
process_keys: process_keys.o
-pgpring/pgpring:
- cd pgpring && CFLAGS="${CFLAGS}" ./configure && make pgpring
-
install:
- install pgpring/pgpring $(DESTDIR)/usr/bin
install keyanalyze $(DESTDIR)/usr/bin
install process_keys $(DESTDIR)/usr/bin
clean:
- -(cd pgpring && make distclean)
-rm -f *.o core *~ keyanalyze process_keys
-rm -f test.pre preprocess.keys keyanalyze.out all.keys
-rm -rf output
Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/pgp-tools.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- pgp-tools.spec 18 Apr 2009 04:57:32 -0000 1.11
+++ pgp-tools.spec 18 Apr 2009 13:14:00 -0000 1.12
@@ -2,7 +2,7 @@
%define debian_version 1.1
Name: pgp-tools
Version: 1.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Collection of several utilities related to OpenPGP
Group: Applications/System
License: BSD and GPLv2+
@@ -17,15 +17,18 @@
# 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
+Source0: %{tarballname}_%{debian_version}.orig.tar.gz
# from svn debian/copyright, not included in tarballs.
-Source1: copyright
+Source1: copyright
+Patch0: %{name}-1.1-drop-pgpring.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
-Requires: perl(Class::MethodMaker), perl(Term::ReadKey)
+# for gpgdir test suite
+BuildRequires: gpg, perl(GnuPG::Interface), perl(Term::ReadKey), perl(Class::MethodMaker)
+Requires: gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires: mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+Requires: perl(Class::MethodMaker), perl(Term::ReadKey)
# for pgpring
-Requires: mutt
+Requires: mutt
%description
@@ -52,6 +55,7 @@
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
%build
make %{?_smp_mflags}
@@ -78,11 +82,10 @@
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
-# nuke private copy of pgpring
-rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+# nuke our copy of pgpring manpage
rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
@@ -124,6 +127,11 @@
%doc __fedora_docs/*
%changelog
+* 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
More information about the scm-commits
mailing list