Accepting request 947668 from home:seijikun:branches:games:tools

Hey, this is my attempt at updating to Mumble 1.4.230. I cleaned up the spec-file in the process. * Ported specfile to CMake build-system * Use cmake install instead of manual as much as possible * Disabled ICE for now (depends on unavailable lib) * bonjour is no longer optional * Removed init.d script and enabled systemd I removed a lot of branches for other distros or old versions - I hope that was okay. The package builds fine for every repo of the devel-package's build targets. I tested client and server, and both seem to work for me. OBS-URL: https://build.opensuse.org/request/show/947668 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=139
2022-01-20 15:27:42 +00:00 · 2022-01-20 15:27:42 +00:00 · 681d22d19b
commit 681d22d19b
parent f305cac1f7
10 changed files with 88 additions and 298 deletions
--- a/mumble-1.3.4.tar.gz
+++ b/mumble-1.3.4.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:615f4ebfc3385d945163f369efd3e910c8b6d0f025797a7eed541515fccb6093
-size 8592741
--- a/mumble-1.3.4.tar.gz.sig
+++ b/mumble-1.3.4.tar.gz.sig
@ -1,7 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iHUEABYIAB0WIQRqJNIlquAt1jUsPSafF5tr9IrfJQUCYCOPHAAKCRCfF5tr9Irf
-JcwnAQCaltV6WirKImcJ/lLLUwPZvvkmRLGDFLzmWeV3qTrt/QD/QYzvjHiwOHNq
-jgnFFH8XFFGqns6Eg0i8xSmZsz7B8w0=
-=sVnB
-----END PGP SIGNATURE-----
--- a/mumble-1.4.230.tar.gz
+++ b/mumble-1.4.230.tar.gz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b67d82b4e6cc5834b965c5bc25339e456534bbd5b9dda6c8c95cf9cb80e434b0
+size 9441667
--- a/mumble-1.4.230.tar.gz.sig
+++ b/mumble-1.4.230.tar.gz.sig
@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+
+iHUEABYIAB0WIQQe3r4qk8uX+pkD1S4l9jxmJF38YAUCYeYSsQAKCRAl9jxmJF38
+YHpdAQCzpcwRS1i73yVR+iYzce7kanCZxw2siQcORfq4RhMulwEA3bR+PiB8MNxe
+zrQhs/lH3y3U/UEu6SpQxDymOJqH2wg=
+=gtrl
+-----END PGP SIGNATURE-----
--- a/mumble-server.init
+++ b/mumble-server.init
@ -1,77 +0,0 @@
-#! /bin/bash
-#
-### BEGIN INIT INFO
-# Provides:             mumble-server
-# Required-Start:       $network $local_fs $remote_fs dbus
-# Required-Stop:	$network $local_fs $remote_fs dbus
-# Should-Start:		mysql
-# Should-Stop:		mysql
-# Default-Start:        3 5
-# Default-Stop:         0 1 2 6
-# Short-Description:    Mumble VoIP Server
-### END INIT INFO
-
-PATH=/sbin:/bin:/usr/sbin:/usr/bin
-NAME=mumble-server
-PIDDIR=/var/run/$NAME
-PIDFILE=$PIDDIR/$NAME.pid
-DAEMON=/usr/sbin/murmurd
-USER=mumble-server
-GROUP=mumble-server
-
-INIFILE=/etc/mumble-server.ini
-DAEMON_OPTS="-ini $INIFILE"
-
-# Include murmur defaults if available
-if [ -f /etc/default/$NAME ] ; then
-	. /etc/default/$NAME
-fi
-
-. /etc/rc.status
-
-case "$1" in
-  start)
-	echo -n "Starting $NAME "
-	test -d $PIDDIR || /usr/bin/install -d -m 0755 -o mumble-server -g mumble-server $PIDDIR
-	/sbin/start_daemon -p $PIDFILE $DAEMON $DAEMON_OPTS
-	rc_status -v
-	;;
-  stop)
-	echo -n "Shutting down $NAME "
-	killproc -p $PIDFILE -TERM $DAEMON
-	rc_status -v
-	;;
-  try-restart|condrestart)
-	$0 status
-	if test $? = 0; then
-		$0 restart
-	else
-		rc_reset	# Not running is not a failure.
-	fi
-	# Remember status and be quiet
-	rc_status
-	;;
-  restart)
-	$0 stop
-	$0 start
-	rc_status
-	;;
-  force-reload)
-	$0 try-restart
-	rc_status
-	;;
-  reload)
-	rc_failed 3
-	rc_status -v
-	;;
-  status)
-	echo -n "Checking for service $NAME "
-	/sbin/checkproc $DAEMON
-	rc_status -v
-	;;
-  *)
-	echo "Usage: $0 {start|stop|status|try-restart|restart|force-reload|reload}"
-	exit 1
-	;;
-esac
-rc_exit
--- a/mumble-server.service
+++ b/mumble-server.service
@ -29,7 +29,7 @@ RestrictRealtime=true
 # end of automatic additions 
 User=mumble-server
 Group=mumble-server
-ExecStart=/usr/sbin/murmurd -fg -ini /etc/mumble-server.ini
+ExecStart=/usr/bin/mumble-server -fg -ini /etc/mumble-server.ini

 [Install]
 WantedBy=multi-user.target
--- a/mumble.changes
+++ b/mumble.changes
@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Thu Jan 20 00:10:28 UTC 2022 - Markus Ebner <info@ebner-markus.de>
+
+- Update to Mumble 1.4.230
+  * qmake build-system removed
+  * New extended plugin framework
+  * Support for stereo playback
+  * Support for local naming (nicknames)
+  * Markdown support for chat
+  * UI indication for access restriction
+  * New non-gaming oriented TalkingUI
+  * Channel listeners
+  * Search dialog for users in a server
+- Cleanup of the specfile
+  * Ported specfile to CMake build-system
+  * Use cmake install instead of manual as much as possible
+  * Disabled ICE for now (depends on unavailable lib)
+  * Removed a lot of obsolete logical branches
+  * bonjour is no longer optional
+  * Removed init.d script and enabled systemd
+
 -------------------------------------------------------------------
 Wed Nov 10 00:49:17 UTC 2021 - Mia Herkt <mia@0x0.st>

--- a/mumble.keyring
+++ b/mumble.keyring
@ -1,14 +1,14 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-mDMEYCL9uhYJKwYBBAHaRw8BAQdAey6LVgABUakMMn3tUiBE2alMmfS/WYc43EyU
-5OVwzqW0T011bWJsZSBBdXRvbWF0aWMgQnVpbGQgSW5mcmFzdHJ1Y3R1cmUgMjAy
-MSA8bXVtYmxlLWF1dG8tYnVpbGQtMjAyMUBtdW1ibGUuaW5mbz6IlgQTFggAPhYh
-BGok0iWq4C3WNSw9Jp8Xm2v0it8lBQJgIv26AhsDBQkBrckABQsJCAcCBhUKCQgL
-AgQWAgMBAh4BAheAAAoJEJ8Xm2v0it8lvQgA/j9g6OBMQRW5lZdt4C6B89we3s7z
-yQqAZctPoNAP/nnxAQDftpiraixqktC3KL3tO4a5yLKytMlGs5bUTpLYVJ+eB7g4
-BGAi/boSCisGAQQBl1UBBQEBB0CZh3DV8jl7dzWoC1ab/xOO/QRFYnzeGMd8sjpW
-t1jqFwMBCAeIfgQYFggAJhYhBGok0iWq4C3WNSw9Jp8Xm2v0it8lBQJgIv26AhsM
-BQkBrckAAAoJEJ8Xm2v0it8lvK4A/0wb9C3qc6gP3ZRnNbgBpPea1fhz7U3/KLRj
-+/OoHu0EAP9b/KV3OkbcEJ7/r1aX5xPREKb52aS9u+y3c3lMgLPbAQ==
-=fxqt
+mDMEYc+ZpRYJKwYBBAHaRw8BAQdAQ2CMVy22HgodygMg6PdMKN/k9mmgBnwk8PYh
+tbFQ8H20T011bWJsZSBBdXRvbWF0aWMgQnVpbGQgSW5mcmFzdHJ1Y3R1cmUgMjAy
+MiA8bXVtYmxlLWF1dG8tYnVpbGQtMjAyMkBtdW1ibGUuaW5mbz6IlgQTFggAPhYh
+BB7eviqTy5f6mQPVLiX2PGYkXfxgBQJhz5mlAhsDBQkB4oUABQsJCAcCBhUKCQgL
+AgQWAgMBAh4BAheAAAoJECX2PGYkXfxg9tQBAONPZDuPtEPvORzSCj+GSrJuUQs9
+otoKM4Kaw95gicqeAP9gZPQiMEtLdaFSCTrHyX81ThlFc743TfV0rnQjStssAbg4
+BGHPmaUSCisGAQQBl1UBBQEBB0CqFAKH11vICUmxDUihx1EQe/knrhAEhKbTGvkw
+yuP/YAMBCAeIfgQYFggAJhYhBB7eviqTy5f6mQPVLiX2PGYkXfxgBQJhz5mlAhsM
+BQkB4oUAAAoJECX2PGYkXfxgvEMBAKEuOsFq6DXryTfK0JmigF7sZPx9o+ADmior
+3CSS+OZZAP41mncTcTdKkCirrjdFX2mm3W1Pb0tjx07HnxUMUEo1Dw==
+=CCBp
 -----END PGP PUBLIC KEY BLOCK-----
--- a/mumble.spec
+++ b/mumble.spec
@ -1,7 +1,7 @@
 #
 # spec file for package mumble
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -16,16 +16,11 @@
 #


-%define ver 1.3.4
-%if 0%{?fedora_version}
+%define ver 1.4.230
+# requires libzeroc-ice, not available yet
 %bcond_without ice
-%else
-%bcond_with ice
-%endif
 %bcond_without jack
 %bcond_without pulseaudio
-%bcond_without systemd
-%bcond_without bonjour
 %bcond_without system_opus
 %bcond_without system_speex
 # mumble must be able to talk to other clients which may use
@ -44,12 +39,12 @@ Group:          Productivity/Multimedia/Sound/Utilities
 URL:            http://mumble.sourceforge.net/
 Source:         https://github.com/mumble-voip/mumble/releases/download/%{ver}%{?snapshot:-%{snapshot}}/%{name}-%{ver}%{?snapshot:-%{snapshot}}.tar.gz
 Source1:        https://github.com/mumble-voip/mumble/releases/download/%{ver}%{?snapshot:-%{snapshot}}/%{name}-%{ver}%{?snapshot:-%{snapshot}}.tar.gz.sig
-Source2:        mumble-server.init
 Source3:        murmur.apparmor
 # http://mumble.info/gpg/gpg.txt
-Source4:        https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2021.asc#/%{name}.keyring
+Source4:        https://raw.githubusercontent.com/mumble-voip/mumble-gpg-signatures/master/mumble-auto-build-2022.asc#/%{name}.keyring
 Source5:        mumble-server.service
 Source6:        baselibs.conf
+BuildRequires:  cmake >= 3.15
 BuildRequires:  gcc-c++
 BuildRequires:  libcap-devel
 BuildRequires:  libogg-devel
@ -57,18 +52,8 @@ BuildRequires:  libsndfile-devel
 BuildRequires:  libspeechd-devel
 BuildRequires:  protobuf-devel
 Requires:       lsb-release
-%if 0%{?suse_version} > 1325
 BuildRequires:  libboost_headers-devel
-%else
-BuildRequires:  boost-devel
-%endif
-%if %{with bonjour}
-%if 0%{?suse_version}
 BuildRequires:  pkgconfig(avahi-compat-libdns_sd)
-%else
-BuildRequires:  avahi-compat-libdns_sd-devel
-%endif
-%endif
 %if %{with system_celt}
 BuildRequires:  libcelt-devel
 Requires:       libcelt0 > 0.7.0
@ -80,10 +65,11 @@ BuildRequires:  pkgconfig(opus)
 BuildRequires:  pkgconfig(speex)
 BuildRequires:  pkgconfig(speexdsp)
 %endif
-%if 0%{?suse_version}
-BuildRequires:  libqt5-linguist
 BuildRequires:  pkgconfig
 BuildRequires:  update-desktop-files
+BuildRequires:  cmake(PocoZip)
+BuildRequires:  cmake(Qt5LinguistTools)
+BuildRequires:  pkgconfig(Qt5Concurrent)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Gui)
 BuildRequires:  pkgconfig(Qt5Network)
@ -96,40 +82,8 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(gl)
 BuildRequires:  pkgconfig(libopenssl)
 BuildRequires:  pkgconfig(xi)
-%endif
-%if 0%{?fedora_version}
-BuildRequires:  Mesa-libGL-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libQt5DBus-devel
-BuildRequires:  libQt5Gui-devel
-BuildRequires:  libQt5Network-devel
-BuildRequires:  libQt5Sql-devel
-BuildRequires:  libQt5Xml-devel
-BuildRequires:  libXevie-devel
-BuildRequires:  libXi-devel
-BuildRequires:  libqt5-linguist
-BuildRequires:  libqt5-qtsvg-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
-%endif
 %if %{with ice}
-BuildRequires:  ice-devel
-%endif
-%if 0%{?mandriva_version}
-BuildRequires:  -alsa-plugins
-BuildRequires:  Mesa-libGL-devel
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libQt5DBus-devel
-BuildRequires:  libQt5Gui-devel
-BuildRequires:  libQt5Network-devel
-BuildRequires:  libQt5Sql-devel
-BuildRequires:  libQt5Xml-devel
-BuildRequires:  libqt5-linguist
-BuildRequires:  libqt5-qtsvg-devel
-BuildRequires:  libxevie-devel
-BuildRequires:  libxi-devel
-BuildRequires:  openssl-devel
-BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(ice)
 %endif
 %if %{with pulseaudio}
 BuildRequires:  pulseaudio-devel
@ -137,8 +91,8 @@ BuildRequires:  pulseaudio-devel
 %if %{with jack}
 BuildRequires:  libjack-devel
 %endif
-%if 0%{?suse_version}
 %ifarch x86_64
+BuildRequires:  gcc-c++-32bit
 Recommends:     %{name}-32bit
 Conflicts:      %{name}-32bit < %{version}
 %endif
@ -146,7 +100,6 @@ Conflicts:      %{name}-32bit < %{version}
 Recommends:     %{name}-64bit
 Conflicts:      %{name}-64bit < %{version}
 %endif
-%endif
 #
 %if 0%{?snapshot:1}
 Conflicts:      mumble < %{version}
@ -163,18 +116,16 @@ won't be audible to other players.
 %package server
 Summary:        Voice Communication Server for Gamers
 Group:          Productivity/Multimedia/Sound/Utilities
-Requires:       libQt5Sql5-sqlite
 Requires:       lsb-release
 Requires(pre):  %{_sbindir}/useradd
+Recommends:     libQt5Sql5-sqlite
 Recommends:     libQt5Sql5-mysql
 Recommends:     libQt5Sql5-postgresql
 %if 0%{?snapshot:1}
 Conflicts:      mumble-server < %{version}
 Provides:       mumble-server = %{version}
 %endif
-%if %{with systemd}
 %{?systemd_requires}
-%endif

 %description server
 Low-latency, high-quality voice communication for gamers. Includes game
@ -183,168 +134,75 @@ characters, and has echo cancellation so the sound from your loudspeakers
 won't be audible to other players.

 %prep
-%setup -q -n %{name}-%{ver}
-rm -v scripts/*.bak
+%setup -q -n %{name}-%{ver}.src

 %build
-#
-#
-%if 0
-# for not having to wait for compile when testing packaging stuff..
-mkdir release
-touch release/mumble release/murmurd release/libmumble.so.1.1.1
-%endif
-%qmake5 \
-        QMAKE_CFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \
-        QMAKE_CXXFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \
-        QMAKE_LRELEASE="%{_bindir}/lrelease-qt5" \
-        DEFINES*=NO_UPDATE_CHECK \
-        DEFINES*=MUMBLE_VERSION=%{version} \
-        DEFINES*=PLUGIN_PATH=%{_libdir}/mumble/plugins \
-        CONFIG*=packaged \
-%if 0%{?suse_version}
-        DEFINES*=NO_SYSTEM_CA_OVERRIDE \
-%endif
-        CONFIG*=no-g15 \
-        CONFIG*=no-embed-qt-translations \
-%if !%{with ice}
-        CONFIG*=no-ice \
+%cmake .. \
+        -Dupdate:BOOL=OFF \
+        -Dsymbols:BOOL=ON \
+        -Dcrash-report:BOOL=OFF \
+        -DMUMBLE_INSTALL_PLUGINDIR=%{_libdir}/mumble/plugins \
+        -DCMAKE_MODULE_LINKER_FLAGS="" \
+        -DCMAKE_SHARED_LINKER_FLAGS="" \
+%if 1
+        -Dice=OFF \
 %endif
 %if %{with system_celt}
-        CONFIG*=no-bundled-celt \
+        -Dbundled-celt:BOOL=OFF \
 %endif
 %if %{with system_speex}
-        CONFIG*=no-bundled-opus \
+        -Dbundled-opus:BOOL=OFF \
 %endif
 %if %{with system_speex}
-        CONFIG*=no-bundled-speex \
-%endif
-%if !%{with bonjour}
-        CONFIG*=no-bonjour \
+        -Dbundled-speex:BOOL=OFF \
 %endif
 %if !%{with pulseaudio}
-        CONFIG*=no-pulseaudio \
+        -Dpulseaudio:BOOL=OFF \
 %endif
-        CONFIG*=no-crash-report \
-        -recursive
-#
-# Include is broken for openSUSE, so fix it.
-sed -i "s,<libspeechd.h>,<speech-dispatcher/libspeechd.h>," src/mumble/TextToSpeech_unix.cpp
-###
-#
-# deps for *.pb.cc are broken and fail for high -j so generate
-# them manually first
-for i in src/* ; do
-       grep -q compiler_pb_make_all $i/Makefile.Release || continue
-       %make_build -C $i -f Makefile.Release compiler_pb_make_all
-done

-%make_build
+# build fails for high -j so we overwrite with 1 here
+%make_build -j1

 %install
-# client
-install -d -m 0755 "%{buildroot}%{_bindir}"
-# hack to make loading libs from applicationDirPath work
-install -D -m 0755 release/mumble %{buildroot}%{_libdir}/mumble/mumble
-ln -s "%{_libdir}/mumble/mumble" "%{buildroot}%{_bindir}/mumble"
-#
-install -d -m 0755 "%{buildroot}%{_libdir}/mumble/plugins"
-install -m 0755 release/plugins/*.so "%{buildroot}%{_libdir}/mumble/plugins"
-install -m 755 scripts/mumble-overlay "%{buildroot}%{_bindir}/mumble-overlay"
-install -d -m 0755 "%{buildroot}%{_mandir}/man1"
-install -m 0644 man/*.1 "%{buildroot}%{_mandir}/man1"
-#
-install -D -m 0644 icons/mumble.xpm "%{buildroot}%{_datadir}/pixmaps/mumble.xpm"
-install -D -m 0644 icons/mumble.svg "%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/mumble.svg"
-#
-install -d -m0755 "%{buildroot}%{_libdir}/mumble"
-install -m0755 release/libmumble.so.*.*.* "%{buildroot}%{_libdir}/mumble"
-/sbin/ldconfig -n "%{buildroot}%{_libdir}/mumble"
-# do this after ldconfig as we don't need the links
-%if !%{with system_celt}
-install -m 644 release/libcelt0.so.0.*.* "%{buildroot}%{_libdir}/mumble"
-%endif
+%cmake_install

-#
-# server
-install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd"
-%if %{with systemd}
+install -D -m 0640 scripts/murmur.ini %{buildroot}%{_sysconfdir}/mumble-server.ini
+mkdir -p %{buildroot}%{_docdir}/%{name}
+cp -a scripts LICENSE README.md %{buildroot}%{_docdir}/%{name}
+find %{buildroot}%{_docdir}/%{name}/scripts -type f -name '*.py' -exec chmod -x {} \;
+find %{buildroot}%{_docdir}/%{name}/scripts -type f -name '*.rb' -exec chmod -x {} \;
+find %{buildroot}%{_docdir}/%{name}/scripts -type f -name '*.sh' -exec chmod -x {} \;
+find %{buildroot}%{_docdir}/%{name}/scripts -type f -name '*.bat' -exec chmod -x {} \;
+# Server
+##
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat >> %{buildroot}%{_tmpfilesdir}/mumble-server.conf <<EOF
 d %{_localstatedir}/run/mumble-server 0755 mumble-server mumble-server -
 EOF
-#
-install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service
-ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmumble-server
-%else
-install -D -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/mumble-server
-ln -s %{_initddir}/mumble-server %{buildroot}%{_sbindir}/rcmumble-server
-%endif
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.murmurd
-install -d -m 0755 %{buildroot}%{_bindir}
-# can be launched as user too but apparmor profile doesn't make
-# sense in that case. So use link to avoid the profile.
-ln -s %{_sbindir}/murmurd %{buildroot}%{_bindir}/murmurd
+install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service
 install -D -m 0644 scripts/murmur.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/mumble-server.conf
-install -D -m 0640 scripts/murmur.ini %{buildroot}%{_sysconfdir}/mumble-server.ini
-# fix up config file
-sed -i -e 's/^dbus=session/dbus=system/' \
-        -e 's/#uname=/uname=mumble-server/' \
-        -e 's@#pidfile=@pidfile=%{_localstatedir}/run/mumble-server/mumble-server.pid@' \
-        -e 's@#logfile=@logfile=%{_localstatedir}/log/mumble-server/@' \
-        %{buildroot}%{_sysconfdir}/mumble-server.ini
-install -D -m 0755 scripts/murmur-user-wrapper %{buildroot}%{_bindir}/murmur-user-wrapper
-sed -i -e '/^SYSDIR=/s@=.*@=%{_docdir}/%{name}/scripts@' %{buildroot}%{_bindir}/murmur-user-wrapper
-for i in log lib run; do
-        install -d -m755 %{buildroot}%{_localstatedir}/$i/mumble-server
-done
-#
-install -d %{buildroot}/%{_datadir}/applications
-install -m 644 scripts/mumble.desktop %{buildroot}/%{_datadir}/applications/mumble.desktop
-%if 0%{?suse_version}
-%suse_update_desktop_file mumble
-%endif
-
-mkdir -p %{buildroot}%{_docdir}/%{name}
-cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name}
-#
-mkdir -p %{buildroot}%{_datadir}/appdata/
-install -m 644 scripts/mumble.appdata.xml %{buildroot}%{_datadir}/appdata/mumble.appdata.xml
-#
+install -D -m 0644 scripts/murmur.ini %{buildroot}%{_sysconfdir}/mumble-server.ini

 %pre server
 getent group mumble-server >/dev/null || groupadd -r mumble-server || :
 getent passwd mumble-server >/dev/null || \
 	%{_sbindir}/useradd -r -d %{_localstatedir}/lib/mumble-server -s /bin/false -c "Mumble VoIP Server" -g mumble-server mumble-server 2> /dev/null || :
-%if %{with systemd}
 %service_add_pre mumble-server.service
-%endif

 %preun server
-%if %{with systemd}
 %service_del_preun mumble-server.service
-%else
-%stop_on_removal mumble-server
-%endif

 %post server
-%if %{with systemd}
 systemd-tmpfiles --create %{_tmpfilesdir}/mumble-server.conf || true
 %service_add_post mumble-server.service
-%else
-%fillup_and_insserv mumble-server
-%endif

 %postun server
-%if %{with systemd}
 %service_del_postun mumble-server.service
-%else
-%restart_on_update mumble-server
-%insserv_cleanup
-%endif

 %files
 %exclude %{_docdir}/%{name}/scripts/murmur.ini
+%exclude %{_docdir}/%{name}/scripts/org.mumble_voip.mumble.desktop
 %doc %{_docdir}/%{name}
 %{_bindir}/mumble
 %{_bindir}/mumble-overlay
@ -354,32 +212,20 @@ systemd-tmpfiles --create %{_tmpfilesdir}/mumble-server.conf || true
 %dir %{_datadir}/icons/hicolor/*
 %dir %{_datadir}/icons/hicolor/*/apps
 %{_datadir}/icons/hicolor/*/apps/mumble.*
-%{_datadir}/pixmaps/*
 %{_datadir}/applications/*
 %{_libdir}/mumble

 %files server
 %doc %{_docdir}/%{name}/scripts/murmur.ini
+%{_bindir}/mumble-server
 %config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf
 %config(noreplace) %{_sysconfdir}/mumble-server.ini
-%if %{with systemd}
 %{_tmpfilesdir}/mumble-server.conf
 %{_unitdir}/mumble-server.service
-%else
-%{_initddir}/mumble-server
-%endif
-%{_sbindir}/rcmumble-server
-%dir %{_sysconfdir}/apparmor.d
-%config %{_sysconfdir}/apparmor.d/usr.sbin.murmurd
-%{_sbindir}/murmurd
-%{_bindir}/murmurd
-%{_bindir}/murmur-user-wrapper
 %{_mandir}/man1/murmurd.*
 %{_mandir}/man1/murmur-user-wrapper.*
-%dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/lib/mumble-server
-%dir %{_localstatedir}/log/mumble-server
-%ghost %{_rundir}/mumble-server
-%dir %{_datadir}/appdata/
-%{_datadir}/appdata/mumble.appdata.xml
+%{_datadir}/metainfo/org.mumble_voip.mumble.appdata.xml
+%dir %{_sysconfdir}/apparmor.d
+%config %{_sysconfdir}/apparmor.d/usr.sbin.murmurd

 %changelog
--- a/murmur.apparmor
+++ b/murmur.apparmor
@ -38,5 +38,5 @@ profile murmurd /usr/sbin/murmurd {
    /usr/bin/lsb_release r,
    /etc/SuSE-release r,
  }
-  #include if exists <local/usr.sbin.murmurd>
+  #include if exists <local/usr.bin.mumble-server>
 }