[ocserv/f20] updated to 0.8.4 and removed unused file

[Nikos Mavrogiannopoulos]

commit 7835115cacb509c3d55a74a038b8290709258c95
Author: Nikos Mavrogiannopoulos <nmav at redhat.com>
Date:   Thu Aug 28 11:14:20 2014 +0200

    updated to 0.8.4 and removed unused file
    
    Conflicts:
    	ocserv.spec

 .gitignore                |    2 ++
 ocserv.spec               |    8 ++++----
 org.infradead.ocserv.conf |   14 --------------
 sources                   |    4 ++--
 4 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3d40924..c4b2660 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@
 /ocserv-0.8.1.tar.xz.sig
 /ocserv-0.8.2.tar.xz
 /ocserv-0.8.2.tar.xz.sig
+/ocserv-0.8.4.tar.xz
+/ocserv-0.8.4.tar.xz.sig
diff --git a/ocserv.spec b/ocserv.spec
index 72a19fb..c3b8379 100644
--- a/ocserv.spec
+++ b/ocserv.spec
@@ -1,5 +1,5 @@
 Name:		ocserv
-Version:	0.8.2
+Version:	0.8.4
 Release:	1%{?dist}
 Summary:	OpenConnect SSL VPN server
 
@@ -12,7 +12,6 @@ Source1:	ocserv.conf
 Source2:	ocserv.service
 Source3:	ocserv-pamd.conf
 Source4:	PACKAGE-LICENSING
-Source5:	org.infradead.ocserv.conf
 Source6:	ftp://ftp.infradead.org/pub/ocserv/%{name}-%{version}.tar.xz.sig
 
 # Taken from upstream:
@@ -131,8 +130,6 @@ mkdir -p %{buildroot}/%{_sysconfdir}/pam.d/
 mkdir -p %{buildroot}/%{_sysconfdir}/ocserv/
 install -p -m 644 %{SOURCE3} %{buildroot}/%{_sysconfdir}/pam.d/ocserv
 install -p -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/ocserv/
-mkdir -p %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
-install -p -m 644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/dbus-1/system.d/
 mkdir -p %{buildroot}/%{_unitdir}
 install -p -m 644 %{SOURCE2} %{buildroot}/%{_unitdir}
 mkdir -p %{buildroot}%{_localstatedir}/lib/ocserv/
@@ -164,6 +161,9 @@ rm -rf %{buildroot}
 %{_localstatedir}/lib/ocserv/profile.xml
 
 %changelog
+* Thu Aug 28 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 0.8.4-1
+- New upstream release
+
 * Mon Jul 28 2014 Nikos Mavrogiannopoulos <nmav at redhat.com> - 0.8.2-1
 - New upstream release
 
diff --git a/sources b/sources
index e9ded37..a00d33a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-fd890e121445dfe8bb514da67c91c675  ocserv-0.8.2.tar.xz
-d7fb256c6b4c9837ffc16c9844ded77f  ocserv-0.8.2.tar.xz.sig
+3eb452fddebda887eaa5f6412dab634c  ocserv-0.8.4.tar.xz
+bd84f29bc6fb278c37275d1eca420145  ocserv-0.8.4.tar.xz.sig