[dmapd/f16] Update to 0.0.45

[mikep]

commit aa9f25b2ce526877fdbc1ae73e0a42653dd199ec
Author: W. Michael Petullo <mike at flyn.org>
Date:   Mon Dec 5 13:41:09 2011 -0600

    Update to 0.0.45

 .gitignore |    1 +
 dmapd.spec |   45 +++++++--------------------------------------
 sources    |    4 +---
 3 files changed, 9 insertions(+), 41 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6ce6610..3848c86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /dmapd-0.0.37.tar.gz
 /dmapd-systemd.patch
 /dmapd-0.0.37-with-vips-7.26.patch
+/dmapd-0.0.45.tar.gz
diff --git a/dmapd.spec b/dmapd.spec
index d05cef5..a5c2e3a 100644
--- a/dmapd.spec
+++ b/dmapd.spec
@@ -1,29 +1,19 @@
 Name: dmapd
-Version: 0.0.37
-Release: 3%{?dist}
+Version: 0.0.45
+Release: 1%{?dist}
 Summary: A server that provides DAAP and DPAP shares
 
 Group: Applications/Multimedia
 License: GPLv2+
 URL: http://www.flyn.org/projects/dmapd/
 Source0: http://www.flyn.org/projects/%name/%{name}-%{version}.tar.gz
-# FIXME: Remove once upgraded to 0.0.43.
-Patch0: dmapd-systemd.patch
-Patch1: dmapd-0.0.37-with-vips-7.26.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: libdmapsharing-devel >= 2.1.2, vips-devel, gstreamer-devel
 Requires(pre): shadow-utils
-# FIXME: Remove conditionals once Fedora 14 EOL'ed.
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
 Requires(post): systemd-units systemd-sysv
 Requires(preun): systemd-units
 Requires(postun): systemd-units
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig, initscripts
-Requires(postun): initscripts
-%endif
 
 %description 
 The dmapd project provides a GObject-based, Open Source implementation 
@@ -51,17 +41,13 @@ files.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %build
 # FIXME: Remove use of auto* once upgraded to 0.0.43.
 aclocal && autoconf && autoheader && libtoolize --force && automake -a
 %configure                                      \
-       --disable-static                         \
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
+	--disable-static                        \
 	--with-systemdsystemunitdir=%{_unitdir} \
-%endif
 
 make %{?_smp_mflags}
 
@@ -73,11 +59,6 @@ rm -f %{buildroot}%{_libdir}/dmapd/%{version}/modules/*.la
 rm -f %{buildroot}%{_sbindir}/dmapd-test
 mkdir -p %{buildroot}%{_localstatedir}/cache/dmapd
 mkdir -p %{buildroot}%{_localstatedir}/run/dmapd
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
-# NOOP: dmapd.service is universal so "make install" installs it.
-%else
-install -D -m 755 distro/dmapd.fedora %{buildroot}%{_initddir}/dmapd
-%endif
 install -D -m 644 distro/dmapd.conf %{buildroot}%{_sysconfdir}/dmapd.conf
 
 %clean
@@ -93,11 +74,7 @@ rm -rf %{buildroot}
 %attr(0700,dmapd,root) %{_localstatedir}/cache/dmapd
 %attr(0700,dmapd,root) %{_localstatedir}/run/dmapd
 %{_mandir}/*/*
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
 %{_unitdir}/dmapd.service
-%else
-%{_initddir}/dmapd
-%endif
 %doc AUTHORS COPYING ChangeLog INSTALL NEWS README FAQ 
 
 %pre
@@ -107,34 +84,22 @@ exit 0
 
 %post
 /sbin/ldconfig
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
 if [ $1 -eq 1 ] ; then 
        /bin/systemctl enable dmapd.service >/dev/null 2>&1 || :
 fi
-%else
-/sbin/chkconfig --add dmapd
-%endif
 
 %preun
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
 if [ $1 -eq 0 ] ; then
        /bin/systemctl --no-reload disable dmapd.service > /dev/null 2>&1 || :
        /bin/systemctl stop dmapd.service > /dev/null 2>&1 || :
 fi
-%else
-if [ $1 = 0 ]; then /sbin/service dmapd stop >/dev/null 2>&1; /sbin/chkconfig --del dmapd; fi
-%endif
 
 %postun
 /sbin/ldconfig
-%if %{?fedora}0 > 150 || %{?rhel}0 > 60
 /bin/systemctl daemon-reload >/dev/null 2>&1 || :
 if [ $1 -ge 1 ] ; then
        /bin/systemctl try-restart dmapd.service >/dev/null 2>&1 || :
 fi
-%else
-if [ "$1" -ge "1" ]; then /sbin/service dmapd condrestart >/dev/null 2>&1 || :; fi
-%endif
 
 # FIXME: Remove once Fedora 15 EOL'ed.
 # See http://fedoraproject.org/wiki/Packaging:ScriptletSnippets
@@ -162,6 +127,10 @@ resources needed for developing modules using dmapd's API.
 %ghost %attr(0600,root,root) %{_localstatedir}/lock/subsys/dmapd
 
 %changelog
+* Mon Dec 05 2011 W. Michael Petullo <mike[@]flyn.org> - 0.0.45-1
+- New upstream version
+- Remove systemd conditionals
+
 * Mon Sep 26 2011 W. Michael Petullo <mike[@]flyn.org> - 0.0.37-3
 - Patch to use VIPS 7.26
 
diff --git a/sources b/sources
index 7f54955..dfda60b 100644
--- a/sources
+++ b/sources
@@ -1,3 +1 @@
-9b4da89150d1223d49467e4ddfadb725  dmapd-0.0.37.tar.gz
-6a4a21ff77f6734e90cb5aaeee6fde26  dmapd-0.0.37-with-vips-7.26.patch
-d8bf94c178ddaa14edacdc0e2ddebbd0  dmapd-systemd.patch
+178982e32113e861a62189d340edea16  dmapd-0.0.45.tar.gz