rpms/pgp-tools/F-11 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.10, 1.11 sources, 1.9, 1.10

[Matt Domsch]

Author: mdomsch

Update of /cvs/extras/rpms/pgp-tools/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28598

Modified Files:
	.cvsignore pgp-tools.spec sources 
Log Message:
update to 1.1


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	20 May 2008 16:23:10 -0000	1.9
+++ .cvsignore	18 Apr 2009 04:57:32 -0000	1.10
@@ -1 +1 @@
-signing-party_1.0-2.orig.tar.gz
+signing-party_1.1.orig.tar.gz


Index: pgp-tools.spec
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/pgp-tools.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- pgp-tools.spec	26 Feb 2009 19:48:53 -0000	1.10
+++ pgp-tools.spec	18 Apr 2009 04:57:32 -0000	1.11
@@ -1,8 +1,8 @@
 %define tarballname signing-party
-%define debian_version 1.0-2
+%define debian_version 1.1
 Name:           pgp-tools
-Version:        1.0
-Release:        2%{?dist}
+Version:        1.1
+Release:        1%{?dist}
 Summary:        Collection of several utilities related to OpenPGP
 Group:          Applications/System
 License:        BSD and GPLv2+
@@ -21,9 +21,11 @@
 # 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)
+Requires:	perl(Class::MethodMaker), perl(Term::ReadKey)
+# for pgpring
+Requires: mutt
 
 
 %description
@@ -34,17 +36,22 @@
 * 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 debian-version-%{debian_version}
+%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
 
 %build
 make %{?_smp_mflags}
@@ -53,40 +60,74 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
-DIRS="$(find . -maxdepth 1 -type d | sed -e 's:^.$::' -e 's:^./::')"
-
-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
 done
 
+# nuke private copy of pgpring
+rm ${RPM_BUILD_ROOT}/%{_bindir}/pgpring
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
+
 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+%{_bindir}/*
+%{_mandir}/man1/*
+%{_datadir}/signing-party
 %doc README COPYING copyright
 %doc __fedora_docs/*
-%{_bindir}/*
-%{_mandir}/*/*
-
 
 %changelog
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-11/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	20 May 2008 16:23:10 -0000	1.9
+++ sources	18 Apr 2009 04:57:32 -0000	1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6  signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df  signing-party_1.1.orig.tar.gz