summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@redhat.com>2014-01-26 15:58:18 +0100
committerPatrick Uiterwijk <puiterwijk@redhat.com>2014-01-26 15:58:18 +0100
commit996b10bbfb93b876ce227545be4f9be81666309c (patch)
tree6e38cfcf810d27b709c50caf57455bf9de6b175d
parent0a5247f641e28e8fc3737b9346f2a02e08dd1541 (diff)
Rebase to upstream 0.3.6
- Update spec file to newest spec requirements
-rw-r--r--monkeysphere.spec12
-rw-r--r--monkeysphere.sutosudo.patch11
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@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@lists.fedoraproject.org> - 0.35-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/monkeysphere.sutosudo.patch b/monkeysphere.sutosudo.patch
deleted file mode 100644
index 6d5f5bd..0000000
--- a/monkeysphere.sutosudo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/share/common 2010-11-14 00:34:09.000000000 +0100
-+++ src/share/common 2012-07-18 13:11:35.614304738 +0200
-@@ -108,7 +108,7 @@ su_monkeysphere_user() {
-
- # if root, su command as monkeysphere user
- 'root')
-- su "$MONKEYSPHERE_USER" -c "$*"
-+ sudo -u "$MONKEYSPHERE_USER" $*
- ;;
-
- # otherwise, fail