[soundmodem] new upstream release

[Lucian Langa]

commit 08b3aefc31cb57c8615ebd66317f67fe804d7daf
Author: Lucian Langa <cooly at gnome.eu.org>
Date:   Sun Oct 14 23:33:58 2012 +0200

    new upstream release

 .gitignore                   |    1 +
 soundmodem-0.16-dirfix.patch |   19 +++++++++++++++++++
 soundmodem.service           |   10 ++++++++++
 soundmodem.spec              |   37 +++++++++++++++++++++++--------------
 sources                      |    2 +-
 5 files changed, 54 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f9bde9d..192a9d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 soundmodem-0.14.tar.gz
 /soundmodem-0.15.tar.gz
+/soundmodem-0.16.tar.gz
diff --git a/soundmodem-0.16-dirfix.patch b/soundmodem-0.16-dirfix.patch
new file mode 100644
index 0000000..cd09079
--- /dev/null
+++ b/soundmodem-0.16-dirfix.patch
@@ -0,0 +1,19 @@
+--- soundmodem-0.16/configapp/src/main.c	2010-10-30 18:49:09.000000000 +0200
++++ soundmodem-0.16-mod/configapp/src/main.c	2012-10-14 22:43:56.626890193 +0200
+@@ -11,6 +11,7 @@
+ 
+ #include "getopt.h"
+ 
++#include <glib/gstdio.h>
+ #include <gtk/gtk.h>
+ 
+ #include "interface.h"
+@@ -655,6 +656,8 @@
+ 	gtk_main();
+ #ifdef WIN32
+ #else /* WIN32 */
++	if (!g_file_test(g_path_get_dirname(cfgfile), G_FILE_TEST_IS_DIR))
++			g_mkdir_with_parents(g_path_get_dirname(cfgfile), 0755);
+ 	if (!xmlSaveFormatFile(cfgfile, doc, 1)) 
+ 	    g_printerr("SoundModem Config: error saving configuration file %s\n", cfgfile);
+         xmlFreeDoc(doc);
diff --git a/soundmodem.service b/soundmodem.service
new file mode 100644
index 0000000..3b803da
--- /dev/null
+++ b/soundmodem.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Soundcard Packet Radio Modem
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/soundmodem --daemonize
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/soundmodem.spec b/soundmodem.spec
index b38b709..b0619ba 100644
--- a/soundmodem.spec
+++ b/soundmodem.spec
@@ -1,21 +1,23 @@
 Name: soundmodem
-Version: 0.15
-Release: 5%{?dist}
+Version: 0.16
+Release: 1%{?dist}
 Summary: Soundcard Packet Radio Modem
 Group: Applications/Communications
 License: GPLv2+
 URL: http://www.baycom.org/~tom/ham/soundmodem/
 Source: http://www.baycom.org/~tom/ham/soundmodem/%{name}-%{version}.tar.gz
+Source1: soundmodem.service
+Patch1: %{name}-%{version}-dirfix.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # Requires: /sbin/ifconfig /sbin/route /sbin/arp
 BuildRequires: gtk2-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: libxml2-devel
 BuildRequires: audiofile-devel
-Requires (preun): chkconfig
-Requires (preun): initscripts
-Requires (post): chkconfig
-Requires(postun): initscripts
+BuildRequires: hamlib-devel
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
 
 
 %description
@@ -35,6 +37,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch1 -p1 -b .dirfix
 
 %build
 #autoreconf -if
@@ -46,9 +49,9 @@ rm -rf %{buildroot}
 %makeinstall
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 mkdir -p %{buildroot}%{_sysconfdir}
-mkdir -p %{buildroot}%{_sysconfdir}/{ax25,rc.d/init.d}
-sed -i -e "s/# chk.*/# chkconfig: - 50 50/g" soundmodem.initscript
-install -p -m 755 soundmodem.initscript %{buildroot}%{_sysconfdir}/rc.d/init.d/soundmodem
+mkdir -p %{buildroot}%{_sysconfdir}/ax25
+mkdir -p %{buildroot}%{_unitdir}
+install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}/soundmodem.service
 mkdir -p %{buildroot}%{_includedir}/%{name}
 mv %{buildroot}%{_includedir}/modem.h %{buildroot}%{_includedir}/%{name}
 mv %{buildroot}%{_includedir}/simd.h %{buildroot}%{_includedir}/%{name}
@@ -58,17 +61,17 @@ mv %{buildroot}%{_includedir}/simd.h %{buildroot}%{_includedir}/%{name}
 rm -rf %{buildroot}
 
 %post
-/sbin/chkconfig --add soundmodem
+/usr/bin/systemctl enable soundmodem.service
 
 %preun
 if [ $1 = 0 ]; then
- /sbin/service soundmodem stop > /dev/null 2>&1
- /sbin/chkconfig --del soundmodem
+ /usr/bin/systemctl -q stop soundmodem.service
+ /usr/bin/systemctl -q disable soundmodem.service
 fi
 
 %postun
 if [ "$1" -ge "1" ] ; then
- /sbin/service soundmodem condrestart >/dev/null 2>&1 || :
+ /usr/bin/systemctl -q condrestart soundmodem.service
 fi
 
 
@@ -77,7 +80,7 @@ fi
 %{_sbindir}/*
 %{_bindir}/*
 %{_mandir}/*/*
-%{_initddir}/soundmodem
+%{_unitdir}/soundmodem.service
 %doc AUTHORS COPYING ChangeLog NEWS README newqpsk/README.newqpsk
 
 %files devel
@@ -85,6 +88,12 @@ fi
 %{_includedir}/%{name}
 
 %changelog
+* Mon Sep 24 2012 Lucian Langa <cooly at gnome.eu.org> - 0.16-1
+- add patch to fix ax25 config directory
+- build against hamlib
+- add systemd migration from Alan Crosswell (fixes #854046)
+- new upstream release
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.15-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 7a4e871..599e5c7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5d808e3b97d9779aae7663006aa4add8  soundmodem-0.15.tar.gz
+a2047a7adee52a37feacc188b3d56dfc  soundmodem-0.16.tar.gz