[tntnet] new release

[Martin Gansser]

commit 809f36e477985f747f44a00359ec6acbe0220bcf
Author: Martin Gansser <mgansser at alice.de>
Date:   Fri May 3 21:53:30 2013 +0200

    new release
    
    - spec file cleanup

 tntnet.spec |   24 ++++++++++--------------
 1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/tntnet.spec b/tntnet.spec
index 8059de1..dcbead9 100644
--- a/tntnet.spec
+++ b/tntnet.spec
@@ -1,6 +1,6 @@
 Name:             tntnet
-Version:          2.1
-Release:          16%{?dist}
+Version:          2.2
+Release:          1%{?dist}
 Summary:          A web application server for web applications
 
 # GPLv2+: framework/common/gcryptinit.c
@@ -10,12 +10,9 @@ URL:              http://www.tntnet.org/
 Source0:          http://www.tntnet.org/download/%{name}-%{version}.tar.gz
 # http://sourceforge.net/tracker/?func=detail&aid=3542704&group_id=119301&atid=684050
 Source1:          %{name}.service
-# http://sourceforge.net/tracker/?func=detail&aid=3542910&group_id=119301&atid=684050
-Patch0:           %{name}-gcc47_fixes.patch
-# http://sourceforge.net/tracker/?func=detail&aid=3542913&group_id=119301&atid=684050
-Patch1:           %{name}-conf-fedora.patch
 
-BuildRequires:    kernel-headers openssl-devel zlib-devel cxxtools-devel zip systemd-units
+BuildRequires:    kernel-headers openssl-devel zlib-devel zip systemd-units
+BuildRequires:    cxxtools-devel >= 2.2
 Requires(pre):    shadow-utils
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
@@ -34,8 +31,6 @@ Development files for %{name}
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
 
 %build
 %configure --disable-static
@@ -76,8 +71,7 @@ exit 0
 %defattr (-, root, root)
 %doc AUTHORS ChangeLog COPYING README
 %dir %{_sysconfdir}/tntnet
-%config(noreplace) %{_sysconfdir}/%{name}/*.conf
-%config(noreplace) %{_sysconfdir}/%{name}/*.properties
+%config(noreplace) %{_sysconfdir}/%{name}/%{name}.xml
 %{_unitdir}/%{name}.service
 %{_bindir}/ecppc
 %{_bindir}/ecppl
@@ -85,12 +79,13 @@ exit 0
 %{_bindir}/tntnet
 %{_libdir}/libtntnet*.so.*
 %{_libdir}/tntnet/
+%{_datadir}/tntnet/tntnet-conf2xml.pl
 %{_mandir}/man1/ecppc.1.gz
 %{_mandir}/man1/ecppl.1.gz
 %{_mandir}/man1/ecppll.1.gz
 %{_mandir}/man1/tntnet-config.1.gz
 %{_mandir}/man7/ecpp.7.gz
-%{_mandir}/man7/tntnet.conf.7.gz
+%{_mandir}/man7/tntnet.xml.7.gz
 %{_mandir}/man7/tntnet.properties.7.gz
 %{_mandir}/man8/tntnet.8.gz
 
@@ -101,8 +96,9 @@ exit 0
 %{_includedir}/tnt/
 
 %changelog
-* Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-16
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+* Fri May 3 2013 Martin Gansser <<martinkg at fedoraproject.org> - 2.2-1
+- new release
+- spec file cleanup
 
 * Thu Aug 23 2012 Martin Gansser <linux4martin at gmx.de> - 2.1-15
 - fixed typos in tntnet spec file