[inadyn-mt/f15/master] New upstream release Rewriting systemd scriptlets

[Jochen Schmitt]

commit ab78d4f43234e5c535fcf4199e8aac4998fdf461
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Mon Mar 21 20:34:40 2011 +0100

    New upstream release
    Rewriting systemd scriptlets

 .gitignore     |    1 +
 inadyn-mt.spec |   55 +++++++++++++++++++++++++++++++++----------------------
 sources        |    2 +-
 3 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ff889a..fd915d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ inadyn-mt.v.02.18.36.tar.gz
 /inadyn-mt.v.02.20.44.tar.gz
 /inadyn-mt.v.02.24.06.tar.gz
 /inadyn-mt.v.02.24.24.tar.gz
+/inadyn-mt.v.02.24.30.tar.gz
diff --git a/inadyn-mt.spec b/inadyn-mt.spec
index 181a6ee..57f3c57 100644
--- a/inadyn-mt.spec
+++ b/inadyn-mt.spec
@@ -1,8 +1,7 @@
-
 Name:           inadyn-mt
 
-Version:        2.24.24
-Release: 	1%{?dist}
+Version:        2.24.30
+Release:        1%{?dist}
 
 Summary:        Dynamic DNS Client
 
@@ -11,21 +10,27 @@ License:        GPLv3
 URL:            http://inadyn-mt.sourceforge.net
 Source0:        http://prdownloads.sourceforge.net/inadyn-mt/inadyn-mt.v.0%{version}.tar.gz
 Source1:        inadyn-mt.conf
-Source2:	inadyn.service
-Source3:	inadyn-nm-dispatcher
+Source2:        inadyn.service
+Source3:        inadyn-nm-dispatcher
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libao-devel
+BuildRequires:  libao-devel
+
+Obsoletes:      inadyn < %{version}
+Provides:       inadyn = %{version}-%{release}
+
+BuildRequires:	systemd-units
 
-Obsoletes: 	inadyn < %{version}
-Provides:  	inadyn = %{version}-%{release}
+Requires(post):   systemd-units
+Requires(preun):  systemd-units
+Requires(postun): systemd-units
 
-Obsoletes:	inadyn-mt-units < %{version}-%{release}
-Provides:	inadyn-mi-units = %{version}-%{release}
+Obsoletes:      inadyn-mt-units < %{version}-%{release}
+Provides:       inadyn-mi-units = %{version}-%{release}
 
-Obsoletes:	inadyn-mt-sysvinit < %{version}-%{release}
-Provides:	inadyn-mt-sysvinit = %{version}-%{release}
+Obsoletes:      inadyn-mt-sysvinit < %{version}-%{release}
+Provides:       inadyn-mt-sysvinit = %{version}-%{release}
 
 
 %description
@@ -66,8 +71,8 @@ cp lang/* $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/lang
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/extra
 cp -R extra/* $RPM_BUILD_ROOT%{_datadir}/inadyn-mt/extra
 
-mkdir -p ${RPM_BUILD_ROOT}/lib/systemd/system
-install -p %{SOURCE2} ${RPM_BUILD_ROOT}/lib/systemd/system
+mkdir -p ${RPM_BUILD_ROOT}%{_unitdir}
+install -p %{SOURCE2} ${RPM_BUILD_ROOT}%{_unitdir}
 
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher
 install -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher/30-inadyn
@@ -76,32 +81,38 @@ install -p %{SOURCE3} ${RPM_BUILD_ROOT}%{_sysconfdir}/NetworkManager/dispatcher/
 rm -rf $RPM_BUILD_ROOT
 
 %post
-/usr/bin/systemd-install --realize=minimal enable inadyn.services >/dev/null 2>&1 || :
+if [ $1 -eq 1 ]; then
+   /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 
 %preun
-if [ $1 -eq 0]; then
-   /usr/bin/systemd-install --realize disable inadyn.services >/dev/null 2>&1 || :
+if [ $1 -eq 1 ]; then
+   /bin/systemctl --no-reload disable inadyn.service >/dev/null 2>&2 || :
+   /bin/systemctl stop inadyn.service >/dev/null 2>&1 || :
 fi
 
 %postun
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-        # Package upgrade, not uninstall
-        /bin/systemctl try-restart inadyn.service >/dev/null 2>&1 || :
+if [ $1 -qe 0 ]; then
+   /bin/systemctl try-restart inadyn.service >/dev/null 2>&1 || :
 fi
 
 %files 
 %defattr(-,root,root,-)
 %doc COPYING readme.html
 %{_sbindir}/inadyn
-/lib/systemd/system/inadyn.service
+%{_unitdir}/inadyn.service
 %{_mandir}/man*/*
 %config(noreplace) %{_sysconfdir}/%{name}.conf
 %config(noreplace) %{_sysconfdir}/NetworkManager/dispatcher/30-inadyn
 %{_datadir}/%{name}/
 
 %changelog
-* Wed Mar  2 2011 Jochen Schmitt <Jochen herr-schmitt de> - 2.24.24-1
+* Mon Mar 21 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.24.30-1
+- New upstream release
+- Rewriting systemd scriptlets
+
+* Wed Mar  2 2011 Jochen Schmitt <Jochen herr-schmitt de> 2.24.24-1
 - New upstream release
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.24.06-3
diff --git a/sources b/sources
index 0339c0d..e0e3e7d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58bfac7b3024738175cb886dc563b92a  inadyn-mt.v.02.24.24.tar.gz
+79d6a22cb134cabb1ffb2e43638d5fdc  inadyn-mt.v.02.24.30.tar.gz