summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick Uiterwijk <puiterwijk@gmail.com>2013-09-02 21:18:02 +0200
committerPatrick Uiterwijk <puiterwijk@gmail.com>2013-09-02 21:18:02 +0200
commit0a5247f641e28e8fc3737b9346f2a02e08dd1541 (patch)
tree298c9f69c90844a8e529855c1bafc5b9f4973eb0
parentf56610cab66320391dd4362fe78a01ca2228e630 (diff)
Rebase to upstream 0.3.6
-rw-r--r--.gitignore1
-rw-r--r--monkeysphere.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index ac4fe15..a962157 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/monkeysphere_0.35.orig.tar.gz
+/monkeysphere_0.36.orig.tar.gz
diff --git a/monkeysphere.spec b/monkeysphere.spec
index 4dca75b..acb617d 100644
--- a/monkeysphere.spec
+++ b/monkeysphere.spec
@@ -2,7 +2,7 @@
Name: monkeysphere
Summary: Use the OpenPGP web of trust to verify SSH connections
-Version: 0.35
+Version: 0.36
Release: 8%{?dist}
License: GPLv3+
Group: Applications/Internet
@@ -93,6 +93,9 @@ exit 0
%changelog
+* Mon Sep 02 2013 Patrick Uiterwijk <patrick@puiterwijk.org> - 0.36-1
+- Rebase to upstream 0.3.6
+
* 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/sources b/sources
index 98825ec..cc295d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-481ac14c9fdef0ccd1944c593bd4f517 monkeysphere_0.35.orig.tar.gz
+5ee59527f7386b6670ec2979d3576b8e monkeysphere_0.36.orig.tar.gz