rpms/pgp-tools/F-9 pgp-tools-1.1-drop-pgpring.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 pgp-tools.spec, 1.9, 1.10 sources, 1.9, 1.10
Matt Domsch
mdomsch at fedoraproject.org
Sat Apr 18 14:04:51 UTC 2009
- Previous message (by thread): rpms/erlang/EL-5 otp-rpath.patch, 1.3, 1.4 .cvsignore, 1.9, 1.10 erlang.spec, 1.21, 1.22 import.log, 1.1, 1.2 otp-sslrpath.patch, 1.1, 1.2 sources, 1.9, 1.10
- Next message (by thread): rpms/gpscorrelate/devel gpscorrelate-1.6.0-icon.patch, NONE, 1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mdomsch
Update of /cvs/extras/rpms/pgp-tools/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1171
Modified Files:
.cvsignore pgp-tools.spec sources
Added Files:
pgp-tools-1.1-drop-pgpring.patch
Log Message:
update to 1.1; 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: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore 21 May 2008 01:31:49 -0000 1.9
+++ .cvsignore 18 Apr 2009 14:04:21 -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-9/pgp-tools.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- pgp-tools.spec 21 May 2008 01:31:49 -0000 1.9
+++ pgp-tools.spec 18 Apr 2009 14:04:21 -0000 1.10
@@ -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: 1%{?dist}
+Version: 1.1
+Release: 2%{?dist}
Summary: Collection of several utilities related to OpenPGP
Group: Applications/System
License: BSD and GPLv2+
@@ -17,13 +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)
-BuildArch: noarch
-Requires: gpg, perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-Requires: mktemp, sed, /usr/sbin/sendmail, perl(Locale::Recode)
+# 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
%description
@@ -34,17 +39,23 @@
* 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
+%patch0 -p1
%build
make %{?_smp_mflags}
@@ -53,18 +64,30 @@
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-
+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
+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 file in `find $DIRS -type f -perm +0111 -print`
+for man in `find $DIRS -type f -name "*.1" -print`
do
- install -p -m755 $file $RPM_BUILD_ROOT%{_bindir}
+ install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
done
-for man in `find $DIRS -type f -name "*.[0-9]" -print`
-do
- install -m644 $man $RPM_BUILD_ROOT%{_mandir}/man1
-done
+# nuke our copy of pgpring manpage
+rm ${RPM_BUILD_ROOT}/%{_mandir}/man1/pgpring.1
+
rm -rf __fedora_docs
mkdir __fedora_docs
@@ -72,21 +95,50 @@
# 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-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.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pgp-tools/F-9/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources 21 May 2008 01:31:49 -0000 1.9
+++ sources 18 Apr 2009 14:04:21 -0000 1.10
@@ -1 +1 @@
-614eaa73dea801f208e6e180caa69ac6 signing-party_1.0-2.orig.tar.gz
+2aa5ec82feb0f9d4679c76a1a65231df signing-party_1.1.orig.tar.gz
- Previous message (by thread): rpms/erlang/EL-5 otp-rpath.patch, 1.3, 1.4 .cvsignore, 1.9, 1.10 erlang.spec, 1.21, 1.22 import.log, 1.1, 1.2 otp-sslrpath.patch, 1.1, 1.2 sources, 1.9, 1.10
- Next message (by thread): rpms/gpscorrelate/devel gpscorrelate-1.6.0-icon.patch, NONE, 1.1 gpscorrelate-gui.svg, NONE, 1.1 gpscorrelate.spec, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list