From: Bernie Innocenti <bernie@codewiz.org>
Date: Tue, 30 Mar 2010 23:45:45 +0000 (-0300)
Subject: Improve RPM packaging
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=598dcc966aa985361102fc8816aaf70dfb6b17d7

Improve RPM packaging

With these changes, version 0.29 builds cleanly in Fedora 12 and passes
rpmlint.
---

diff --git a/packaging/rpm/monkeysphere.spec b/packaging/rpm/monkeysphere.spec
index 9e32837..87c9d5f 100644
--- a/packaging/rpm/monkeysphere.spec
+++ b/packaging/rpm/monkeysphere.spec
@@ -1,13 +1,19 @@
 Name: monkeysphere
-Summary: use the OpenPGP web of trust to verify ssh connections
-Version: 0.22~pre
+Summary: Use the OpenPGP web of trust to verify ssh connections
+Version: 0.29
 Release: 1
-License: GPLv3
-Group: net
+License: GPLv3+
+Group: Applications/Internet
 URL: http://web.monkeysphere.info/
 
 Source: http://archive.monkeysphere.info/debian/pool/monkeysphere/m/monkeysphere/monkeysphere_%{version}.orig.tar.gz
 
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Requires: gnupg
+Requires: openssh-clients
+
+
 %description
 SSH key-based authentication is tried-and-true, but it lacks a true
 Public Key Infrastructure for key certification, revocation and
@@ -15,19 +21,15 @@ expiration.  Monkeysphere is a framework that uses the OpenPGP web of
 trust for these PKI functions.  It can be used in both directions: for
 users to get validated host keys, and for hosts to authenticate users.
 
-Monkeysphere is free software released under the GNU General Public
-License (GPL).
-
 %prep
 %setup -q
 
 %build
-%{__make}
+%{__make} %{?_smp_mflags}
 
 %install
 %{__rm} -rf %{buildroot}
-Prefix=%{buildroot}/usr
-%makeinstall
+make DESTDIR=%{buildroot} install
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -35,6 +37,29 @@ Prefix=%{buildroot}/usr
 %files
 %defattr(-, root, root, 0755)
 
+%config(noreplace) %{_sysconfdir}/monkeysphere/monkeysphere-authentication.conf
+%config(noreplace) %{_sysconfdir}/monkeysphere/monkeysphere-host.conf
+%config(noreplace) %{_sysconfdir}/monkeysphere/monkeysphere.conf
+%{_bindir}/monkeysphere
+%{_bindir}/openpgp2ssh
+%{_bindir}/pem2openpgp
+%{_sbindir}/monkeysphere-authentication
+%{_sbindir}/monkeysphere-host
+%doc %{_docdir}/monkeysphere/Changelog
+%doc %{_docdir}/monkeysphere/MonkeySpec
+%doc %{_docdir}/monkeysphere/TODO
+%doc %{_docdir}/monkeysphere/getting-started-admin.mdwn
+%doc %{_docdir}/monkeysphere/getting-started-user.mdwn
+%{_mandir}/man1/*
+%{_mandir}/man7/*
+%{_mandir}/man8/*
+%{_datadir}/monkeysphere/*
+
+
 %changelog
-* Sat Nov 22 2008 - 
+* Tue Mar 30 2010 Bernie Innocenti <bernie@codewiz.org> - 0.28
+- Update to 0.28.
+- Various fixes for Fedora.
+
+* Sat Nov 22 2008 Anonymous Coward <anonymous@example.com> - 0.22
 - Initial release.