[mumble] Rebuild against new ice package

[Christian Krause]

commit af753e195cf8e064a505b73c6d41c0a12006a487
Author: Christian Krause <chkr at fedoraproject.org>
Date:   Wed Feb 6 23:52:35 2013 +0100

    Rebuild against new ice package
    
    - Updated Ice version in patch0
    - Use new systemd-rpm macros (BZ 850218)

 mumble-1.2.3-slice2cpp.patch |    2 +-
 mumble.spec                  |   24 +++++++++---------------
 2 files changed, 10 insertions(+), 16 deletions(-)
---
diff --git a/mumble-1.2.3-slice2cpp.patch b/mumble-1.2.3-slice2cpp.patch
index 79cc1d0..86e32e7 100644
--- a/mumble-1.2.3-slice2cpp.patch
+++ b/mumble-1.2.3-slice2cpp.patch
@@ -6,7 +6,7 @@ diff -aur mumble-1.2.3.orig/src/murmur/murmur.pro mumble-1.2.3/src/murmur/murmur
  		slice.commands = slice2cpp --checksum -I\"$$ICE_PATH/slice\" Murmur.ice
  	} else {
 -		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ Murmur.ice
-+		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ Murmur.ice
++		slice.commands = slice2cpp --checksum -I/usr/local/share/Ice -I/usr/share/Ice/slice -I/usr/share/slice -I/usr/share/Ice-3.4.1/slice/ -I/usr/share/Ice-3.3.1/slice/ -I/usr/share/Ice-3.4.2/slice/ -I/usr/share/Ice-3.5/slice/ Murmur.ice
  	}
  
  	slice.depends = Murmur.ice
diff --git a/mumble.spec b/mumble.spec
index 5daf42b..e5fe8c6 100644
--- a/mumble.spec
+++ b/mumble.spec
@@ -1,6 +1,6 @@
 Name:		mumble
 Version:	1.2.3
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	Voice chat suite aimed at gamers
 
 Group:		Applications/Internet
@@ -215,24 +215,13 @@ fi
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null ||:
 
 %post -n murmur
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
+%systemd_post murmur.service
 
 %preun -n murmur
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable murmur.service > /dev/null 2>&1 || :
-    /bin/systemctl stop murmur.service > /dev/null 2>&1 || :
-fi
+%systemd_preun murmur.service
 
 %postun -n murmur
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart murmur.service >/dev/null 2>&1 || :
-fi
+%systemd_postun_with_restart murmur.service
 
 # For migration to systemd
 %triggerun -n murmur -- murmur < 1.2.3-8
@@ -296,6 +285,11 @@ fi
 %{_datadir}/kde4/services/mumble.protocol
 
 %changelog
+* Wed Feb 06 2013 Christian Krause <chkr at fedoraproject.org> - 1.2.3-11
+- Rebuild against new ice package
+- Updated Ice version in patch0
+- Use new systemd-rpm macros (BZ 850218)
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild