[monkeysphere] Rebase to upstream 0.3.6

Patrick Uiterwijk puiterwijk at fedoraproject.org
Sun Jan 26 14:58:00 UTC 2014


commit 996b10bbfb93b876ce227545be4f9be81666309c
Author: Patrick Uiterwijk <puiterwijk at redhat.com>
Date:   Sun Jan 26 15:58:18 2014 +0100

    Rebase to upstream 0.3.6
    
    - Update spec file to newest spec requirements

 monkeysphere.spec           |   12 ++----------
 monkeysphere.sutosudo.patch |   11 -----------
 2 files changed, 2 insertions(+), 21 deletions(-)
---
diff --git a/monkeysphere.spec b/monkeysphere.spec
index acb617d..a16ad34 100644
--- a/monkeysphere.spec
+++ b/monkeysphere.spec
@@ -3,13 +3,11 @@
 Name: monkeysphere
 Summary: Use the OpenPGP web of trust to verify SSH connections
 Version: 0.36
-Release: 8%{?dist}
+Release: 1%{?dist}
 License: GPLv3+
-Group: Applications/Internet
 URL: http://web.monkeysphere.info/
 
 Source: http://archive.monkeysphere.info/debian/pool/%{name}/m/%{name}/%{name}_%{version}.orig.tar.gz
-Patch0: %{name}.sutosudo.patch
 
 BuildArch: noarch
 
@@ -29,14 +27,12 @@ users to get validated host keys, and for hosts to authenticate users.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %{__make} %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_var}/lib/%{name}/authorized_keys
 rm -r %{buildroot}%{_datadir}/%{name}/transitions/
@@ -45,10 +41,6 @@ chmod -cR 0644 src/transitions/*
 chmod -cR 0755 %{buildroot}%{_var}/lib/%{name}/
 
 
-%clean
-rm -rf %{buildroot}
-
-
 %pre
 getent group %{name} >/dev/null || groupadd -r %{name}
 getent passwd %{name} >/dev/null || \
@@ -58,7 +50,6 @@ exit 0
 
 
 %files
-%defattr(-,root,root,-)
 %doc COPYING README Changelog src/transitions/
 %doc %dir %{_docdir}/%{name}
 %doc %{_docdir}/%{name}/Changelog
@@ -95,6 +86,7 @@ exit 0
 %changelog
 * Mon Sep 02 2013 Patrick Uiterwijk <patrick at puiterwijk.org> - 0.36-1
 - Rebase to upstream 0.3.6
+- Update spec file to newest spec requirements
 
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.35-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild


More information about the scm-commits mailing list