[cyphesis] New upstream version 0.6.2, fix bogus changelog dates, spec cleanup

[Filipe Rosset]

commit 033387e9a675432f689d1b16457506796cdb6ecd
Author: Filipe Rosset <rosset.filipe at gmail.com>
Date:   Fri May 23 19:20:47 2014 -0300

    New upstream version 0.6.2, fix bogus changelog dates, spec cleanup
    
    - Fixes rhbz #875746, #925216 and #991888

 .gitignore               |    1 +
 cyphesis-socketdir.patch |    8 ++++----
 cyphesis.spec            |   22 +++++++++-------------
 sources                  |    2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8d0d0d1..9e0bacc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cyphesis-0.5.21.tar.bz2
 /cyphesis-0.5.26.tar.bz2
 /cyphesis-0.6.0.tar.bz2
+/cyphesis-0.6.2.tar.bz2
diff --git a/cyphesis-socketdir.patch b/cyphesis-socketdir.patch
index 6342da6..2089af3 100644
--- a/cyphesis-socketdir.patch
+++ b/cyphesis-socketdir.patch
@@ -1,6 +1,6 @@
---- Makefile.am.orig	2012-11-19 23:34:50.530459142 -0600
-+++ Makefile.am	2012-11-19 23:35:18.922067569 -0600
-@@ -7,7 +7,7 @@
+--- Makefile.am.orig	2014-05-23 18:39:24.613568441 -0300
++++ Makefile.am	2014-05-23 18:39:44.283949547 -0300
+@@ -8,7 +8,7 @@
  
  rulesetdir = $(datadir)/cyphesis/rulesets
  
@@ -8,4 +8,4 @@
 +socketdir = $(localstatedir)/run/cyphesis
  socket_DATA =
  
- install-data-hook:
+ # FIXME Remove the mkdir hack if it gets fixed in a future automake
diff --git a/cyphesis.spec b/cyphesis.spec
index b292999..c523208 100644
--- a/cyphesis.spec
+++ b/cyphesis.spec
@@ -3,8 +3,8 @@
 %define logwatch_scripts %{logwatch_root}/scripts
 
 Name:           cyphesis
-Version:        0.6.0
-Release:        7%{?dist}
+Version:        0.6.2
+Release:        1%{?dist}
 Summary:        WorldForge game server
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -17,13 +17,11 @@ Source7:        logwatch.shared.applycyphesisdate
 Source8:        cyphesis-tmpfiles.conf
 Patch0:         cyphesis-0.5.19-init.patch
 Patch1:         cyphesis-0.5.11-logdir.patch
-Patch5:         cyphesis-0.5.21-dso-linking.patch
 Patch7:         cyphesis-socketdir.patch
 Patch8:         cyphesis-0.6.0-unversioned-docdir.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  python-devel libgcrypt-devel pkgconfig atlascpp-devel
 BuildRequires:  varconf-devel libsigc++20-devel mercator-devel skstream-devel
-BuildRequires:  postgresql-devel readline-devel avahi-devel
+BuildRequires:  postgresql-devel readline-devel avahi-devel bullet-devel
 BuildRequires:  autoconf automake boost-devel
 
 Requires:       postgresql-server
@@ -55,7 +53,6 @@ Logwatch scripts for the WorldForge game server.
 %setup -q
 %patch0 -p1
 %patch1 -p0
-%patch5 -p1 -b .dso.linking
 %patch7 -p0
 %patch8 -p1 -b .docdir
 
@@ -149,12 +146,8 @@ if [ "$1" -ge "1" ]; then
     /sbin/service cyphesis condrestart >/dev/null 2>&1
 fi
 
-%clean
-rm -rf %{buildroot}
-
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README NEWS THANKS TODO
 %{_bindir}/cy*
 %{_datadir}/%{name}
@@ -170,7 +163,6 @@ rm -rf %{buildroot}
 %attr(644,root,root) %{_sysconfdir}/tmpfiles.d/cyphesis.conf
 
 %files logwatch
-%defattr(-,root,root,-)
 %{logwatch_conf}/logfiles/%{name}.conf
 %{logwatch_conf}/services/%{name}.conf
 %{logwatch_scripts}/services/%{name}
@@ -178,6 +170,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri May 23 2014 Filipe Rosset <rosset.filipe at gmail.com> - 0.6.2-1
+- New upstream version 0.6.2, fix bogus changelog dates, spec cleanup
+- Fixes rhbz #875746, #925216 and #991888
+
 * Fri May 23 2014 Petr Machata <pmachata at redhat.com> - 0.6.0-7
 - Rebuild for boost 1.55.0
 
@@ -209,7 +205,7 @@ rm -rf %{buildroot}
 * Thu Feb 16 2012 Martin Preisler <mpreisle at redhat.com> 0.5.26-6
 - %ghost for /var/run/cyphesis, added tmpfiles.d
 
-* Mon Jan 22 2012 Bruno Wolff III <bruno at wolff.to> 0.5.26-5
+* Sun Jan 22 2012 Bruno Wolff III <bruno at wolff.to> 0.5.26-5
 - Rebuild for wfmath soname bump
 
 * Mon Jan 16 2012 Bruno Wolff III <bruno at wolff.to> 0.5.26-4
@@ -293,7 +289,7 @@ rm -rf %{buildroot}
 * Wed Jul 23 2008 Wart <wart at kobold.org> 0.5.16-1
 - Update to 0.5.16
 
-* Wed Apr 10 2008 Wart <wart at kobold.org> 0.5.15-7
+* Thu Apr 10 2008 Wart <wart at kobold.org> 0.5.15-7
 - Remove selinux subpackage; it's been merged into the main
   selinux-policy package.
 - Add patch for using a full socket path in cyphesis.vconf
diff --git a/sources b/sources
index 4e01135..a47dffb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22f725a39a7a80fb2e1f5c124f54b583  cyphesis-0.6.0.tar.bz2
+bd26b7ddf691ec5ac5df92c718c37a6e  cyphesis-0.6.2.tar.bz2