Accepting request 348890 from home:susnux:branches:games:tools

Fixed wrong .desktop file, some spec cleanup.

OBS-URL: https://build.opensuse.org/request/show/348890
OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=75

mumble-1.1.4-sle10glx.diff

@@ -1,14 +0,0 @@
-Index: mumble-1.2.2/overlay_gl/overlay.c
-===================================================================
---- mumble-1.2.2.orig/overlay_gl/overlay.c
-+++ mumble-1.2.2/overlay_gl/overlay.c
-@@ -54,6 +54,9 @@
- #include <math.h>
- #include <errno.h>
- 
-+/* hack for sle10 */
-+typedef void (*__GLXextFuncPtr)(void);
-+
- typedef unsigned char bool;
- #define true 1
- #define false 0

mumble-1.2.11-desktop_fix.diff

@@ -0,0 +1,14 @@
+Index: mumble-1.2.11/scripts/mumble.desktop
+===================================================================
+--- mumble-1.2.11.orig/scripts/mumble.desktop
++++ mumble-1.2.11/scripts/mumble.desktop
+@@ -13,7 +13,7 @@ Icon=mumble
+ Terminal=false
+ Type=Application
+ StartupNotify=false
+-MimeType=x-scheme-handler/mumble
++MimeType=x-scheme-handler/mumble;
+ Categories=Network;Chat;Qt;
+-Keywords=VoIP;Messaging;Voice Chat;Secure Communication
++Keywords=VoIP;Messaging;Voice Chat;Secure Communication;
+ Version=1.0

mumble.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Dec  14 20:49:12 UTC 2015 - rpm@fthiessen.de
+
+- Removed unneeded patch for SLE10: mumble-1.1.4-sle10glx.diff
+- Added patch from RandyBB (roman@priesol.net) to fix missing
+  semicolons in desktop file: mumble-1.2.11-desktop_fix.diff
+- Removed parts for outdated openSUSE versions, older then openSUSE
+  12.2 or SLE 11, from spec file
+
 -------------------------------------------------------------------
 Mon Dec 14 14:06:32 UTC 2015 - astieger@suse.com
 

mumble.spec

@@ -25,13 +25,11 @@
 %bcond_with pulseaudio
 %endif
 %endif
-
 %if 0%{?fedora_version} > 11
 %bcond_without ice
 %else
 %bcond_with ice
 %endif
-
 %if 0%{?suse_version} && 0%{?suse_version} < 1230
 %bcond_with systemd
 %else
@@ -42,9 +40,7 @@
 %bcond_without speechd
 %endif
 %endif
-
 %bcond_with     mumble11x
-
 %bcond_without  bonjour
 # mumble must be able to talk to other clients which may use
 # differnt versions of celt. Since each celt release is
@@ -52,14 +48,33 @@
 # versions.
 %bcond_with     system_celt
 %bcond_without  system_speex
-
 Name:           mumble
+Version:        1.2.11%{?snapshot:_%{snapshot}}
+Release:        0
+Summary:        Voice Communication Client for Gamers
+License:        BSD-3-Clause
+Group:          Productivity/Multimedia/Sound/Utilities
+Url:            http://mumble.sourceforge.net/
+Source2:        mumble-server.init
+Source3:        murmur.apparmor
+# http://mumble.info/gpg/gpg.txt
+Source4:        %{name}.keyring
+Source5:        mumble-server.service
+Source6:        baselibs.conf
+Patch0:         mumble-1.2.2-buildcompare.diff
+# PATCH-FIX-UPSTREAM mumble-1.2.11-desktop_fix.diff -- https://github.com/mumble-voip/mumble/pull/1960
+Patch1:         mumble-1.2.11-desktop_fix.diff
+BuildRequires:  boost-devel
+BuildRequires:  gcc-c++
+BuildRequires:  libcap-devel
+BuildRequires:  libogg-devel
+BuildRequires:  libsndfile-devel
 BuildRequires:  protobuf-devel
+Requires:       lsb-release
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %{with bonjour}
 %if 0%{?suse_version}
-%if 0%{?suse_version} > 1010
 BuildRequires:  avahi-compat-mDNSResponder-devel
-%endif
 %else
 BuildRequires:  avahi-compat-libdns_sd-devel
 %endif
@@ -68,15 +83,10 @@ BuildRequires:  avahi-compat-libdns_sd-devel
 BuildRequires:  libcelt-devel
 Requires:       libcelt0 > 0.7.0
 %endif
-BuildRequires:  libcap-devel
-BuildRequires:  libogg-devel
-BuildRequires:  libsndfile-devel
 %if %{with system_speex}
 BuildRequires:  speex-devel
 BuildRequires:  pkgconfig(speexdsp)
 %endif
-BuildRequires:  boost-devel
-BuildRequires:  gcc-c++
 %if 0%{?suse_version}
 BuildRequires:  alsa-devel
 BuildRequires:  libqt4-devel
@@ -114,39 +124,13 @@ BuildRequires:  pulseaudio-devel
 %if %{with speechd}
 BuildRequires:  libspeechd-devel
 %endif
-Version:        1.2.11%{?snapshot:_%snapshot}
-Release:        0
 %if 0%{!?snapshot:1}
 Source:         https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz
 Source1:        https://github.com/mumble-voip/mumble/releases/download/%{version}/%{name}-%{version}.tar.gz.sig
 %endif
-Source2:        mumble-server.init
-Source3:        murmur.apparmor
-# http://mumble.info/gpg/gpg.txt
-Source4:        %{name}.keyring
-Source5:        mumble-server.service
-Source6:        baselibs.conf
-Patch50:        mumble-1.2.2-buildcompare.diff
-# hack, no clue about glx so no idea to fix this properly
-Patch99:        mumble-1.1.4-sle10glx.diff
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Url:            http://mumble.sourceforge.net/
-Summary:        Voice Communication Client for Gamers
-License:        BSD-3-Clause
-Group:          Productivity/Multimedia/Sound/Utilities
-Requires:       lsb-release
 %if 0%{?suse_version}
 Requires:       qt-sql-sqlite
-%if 0%{?suse_version} == 1030
+%else
-#XXX: qt4 bug on 10.3 (bnc#370942)
-Requires:       libqt4 > 4.3.1-23
-%endif # 10.3
-%if 0%{?suse_version} == 1100
-# the version shipped on 11.0 is insufficient
-Requires:       libspeex > 1.1.99.3
-%endif # 11.0
-%endif # suse_version
-%if 0%{?fedora_version}
 Requires:       qt4-sqlite
 %endif
 %if 0%{?suse_version} > 1010
@@ -161,8 +145,8 @@ Conflicts:      %{name}-64bit < %{version}
 %endif
 #
 %if 0%{?snapshot:1}
-Conflicts:      mumble < %version
+Conflicts:      mumble < %{version}
-Provides:       mumble = %version
+Provides:       mumble = %{version}
 #
 %endif
 #
@@ -178,10 +162,10 @@ Summary:        Voice Communication Server for Gamers
 Group:          Productivity/Multimedia/Sound/Utilities
 Requires:       lsb-release
 Requires:       qt-sql-sqlite
-PreReq:         /usr/sbin/useradd
+Requires(pre):  %{_sbindir}/useradd
 %if 0%{?snapshot:1}
-Conflicts:      mumble-server < %version
+Conflicts:      mumble-server < %{version}
-Provides:       mumble-server = %version
+Provides:       mumble-server = %{version}
 %endif
 %if %{with systemd}
 %{?systemd_requires}
@@ -195,15 +179,12 @@ won't be audible to other players.
 
 %prep
 %setup -q
-
+%patch0 -p1
-%patch50 -p1
+%patch1 -p1
-%if 0%{?suse_version} && 0%{?suse_version} < 1020
-%patch99 -p1
-%endif
 %if !%{with system_celt}
 %if 0%{?snapshot:1}
-tar -xzf %SOURCE50
+tar -xzf %{SOURCE50}
-tar -xzf %SOURCE51
+tar -xzf %{SOURCE51}
 for v in 0.7.0 0.11.0; do
 	rmdir celt-$v-src
 	mv celt-$v celt-$v-src
@@ -219,14 +200,14 @@ sed -i -e '/QT_REQUIRE_VERSION/d' src/mumble/main.cpp src/mumble11x/main.cpp
 
 %build
 %if 0%{?fedora_version}
-ln -s /usr/bin/qmake-qt4 qmake
+ln -s %{_bindir}/qmake-qt4 qmake
-ln -s /usr/bin/lrelease-qt4 lrelease
+ln -s %{_bindir}/lrelease-qt4 lrelease
-ln -s /usr/bin/lupdate-qt4 lupdate
+ln -s %{_bindir}/lupdate-qt4 lupdate
 export PATH=$PATH:$PWD
 %endif
 %if 0%{?mandriva_version} > 2006
-export PATH=/usr/lib/qt4/bin:$PATH
+export PATH=%{_libexecdir}/qt4/bin:$PATH
-export QTDIR=%{_prefix}/lib/qt4/
+export QTDIR=%{_libexecdir}/qt4/
 %endif
 #
 #
@@ -237,7 +218,7 @@ touch release/mumble release/murmurd release/libmumble.so.1.1.1
 %else
 %if 0%{?mandriva_version}
 # HACK: mandriva forgot to package qt translations
-if [ ! -e /usr/lib/qt4/translations/qt_de.qm ]; then
+if [ ! -e %{_libexecdir}/qt4/translations/qt_de.qm ]; then
 	sed -i -e '/QMAKE_EXTRA_TARGETS/s/copytrans//;/PRE_TARGETDEPS/s/qt_de\.qm//' src/mumble/mumble.pro
 	sed -i -e '/qt_.*\.qm/d' src/mumble/mumble.qrc
 fi
@@ -249,7 +230,7 @@ qmake \
 	QMAKE_CFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \
 	QMAKE_CXXFLAGS_RELEASE="%{optflags} -Wall -fno-strict-aliasing" \
 	DEFINES*=NO_UPDATE_CHECK \
-	DEFINES*=MUMBLE_VERSION=%version \
+	DEFINES*=MUMBLE_VERSION=%{version} \
 	DEFINES*=PLUGIN_PATH=%{_libdir}/mumble/plugins \
 	CONFIG*=packaged \
 %if 0%{?suse_version}
@@ -285,18 +266,18 @@ qmake \
 	-recursive
 #
 ### XXX: hack for incomplete dependencies
-make qmake
+make %{?_smp_mflags} qmake
 %if 0
 # that translation stuff is just broken
 # copy the available ones manually
 %if 0%{?suse_version}
-cp /usr/share/qt4/translations/qt_*.qm src/mumble
+cp %{_datadir}/qt4/translations/qt_*.qm src/mumble
 # 10.3 doesn't have that one
 touch src/mumble/qt_pl.qm
 %endif
-make -C src/mumble mumble_en.qm
+make %{?_smp_mflags} -C src/mumble mumble_en.qm
 %if !0%{?mandriva_version}
-make -C src/mumble qt_de.qm
+make %{?_smp_mflags} -C src/mumble qt_de.qm
 %endif
 #
 %endif
@@ -347,20 +328,20 @@ install -D -m 0755 release/mumble11x %{buildroot}%{_bindir}/mumble11x
 # server
 install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd"
 %if %{with systemd}
-mkdir -p %buildroot/usr/lib/tmpfiles.d
+mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d
-cat >> %buildroot/usr/lib/tmpfiles.d/mumble-server.conf <<EOF
+cat >> %{buildroot}%{_libexecdir}/tmpfiles.d/mumble-server.conf <<EOF
-d /var/run/mumble-server 0755 mumble-server mumble-server -
+d %{_localstatedir}/run/mumble-server 0755 mumble-server mumble-server -
 EOF
 #
 install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service
-ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmumble-server
+ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rcmumble-server
 %else
-install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server
+install -D -m 0755 %{SOURCE2} %{buildroot}%{_initddir}/mumble-server
-ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server
+ln -s %{_initddir}/mumble-server %{buildroot}%{_sbindir}/rcmumble-server
 %endif
-install -D -m 0644 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.murmurd
 %if 0%{?suse_version} < 1220
-sed -i -e 's,/usr/bin/grep,/bin/grep,;s,/usr/bin/sed,/bin/sed,' %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
+sed -i -e 's,%{_bindir}/grep,/bin/grep,;s,%{_bindir}/sed,/bin/sed,' %{buildroot}%{_sysconfdir}/apparmor.d/usr.sbin.murmurd
 %endif
 install -d -m 0755 %{buildroot}%{_bindir}
 # can be launched as user too but apparmor profile doesn't make
@@ -371,28 +352,28 @@ install -D -m 0644 scripts/murmur.ini %{buildroot}%{_sysconfdir}/mumble-server.i
 # fix up config file
 sed -i -e 's/^dbus=session/dbus=system/' \
 	-e 's/#uname=/uname=mumble-server/' \
-	-e 's@#pidfile=@pidfile=/var/run/mumble-server/mumble-server.pid@' \
+	-e 's@#pidfile=@pidfile=%{_localstatedir}/run/mumble-server/mumble-server.pid@' \
-	-e 's@#logfile=@logfile=/var/log/mumble-server/@' \
+	-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/var/$i/mumble-server
+	install -d -m755 %{buildroot}%{_localstatedir}/$i/mumble-server
 done
 #
-install -d %buildroot/%_datadir/applications
+install -d %{buildroot}/%{_datadir}/applications
 %if 0%{?suse_version}
 sed 's/^Categories.*/Categories=X-SuSE-Core-Game;/' \
 	< scripts/mumble.desktop \
-	> %buildroot/%_datadir/applications/mumble.desktop
+	> %{buildroot}/%{_datadir}/applications/mumble.desktop
 %suse_update_desktop_file mumble
 %else
-install -m 644 scripts/mumble.desktop %buildroot/%_datadir/applications/mumble.desktop
+install -m 644 scripts/mumble.desktop %{buildroot}/%{_datadir}/applications/mumble.desktop
 %endif
 %if %{with mumble11x}
 sed -e '/^Name=/s/$/ 1.1.x/;/^Exec=/s/$/11x/' \
-	< %buildroot/%_datadir/applications/mumble.desktop \
+	< %{buildroot}/%{_datadir}/applications/mumble.desktop \
-	> %buildroot/%_datadir/applications/mumble11x.desktop
+	> %{buildroot}/%{_datadir}/applications/mumble11x.desktop
 %endif
 mkdir -p %{buildroot}%{_docdir}/%{name}
 cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name}
@@ -401,7 +382,7 @@ cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name}
 %pre server
 getent group mumble-server >/dev/null || groupadd -r mumble-server || :
 getent passwd mumble-server >/dev/null || \
-	/usr/sbin/useradd -r -d /var/lib/mumble-server -s /bin/false -c "Mumble VoIP Server" -g mumble-server mumble-server 2> /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
@@ -415,7 +396,7 @@ getent passwd mumble-server >/dev/null || \
 
 %post server
 %if %{with systemd}
-systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true
+systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/mumble-server.conf || true
 %service_add_post mumble-server.service
 %else
 %fillup_and_insserv mumble-server
@@ -455,21 +436,21 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true
 %config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf
 %config(noreplace) %{_sysconfdir}/mumble-server.ini
 %if %{with systemd}
-%dir /usr/lib/tmpfiles.d
+%dir %{_libexecdir}/tmpfiles.d
-/usr/lib/tmpfiles.d/mumble-server.conf
+%{_libexecdir}/tmpfiles.d/mumble-server.conf
 %{_unitdir}/mumble-server.service
 %else
-/etc/init.d/mumble-server
+%{_initddir}/mumble-server
 %endif
 %{_sbindir}/rcmumble-server
-%dir /etc/apparmor.d
+%dir %{_sysconfdir}/apparmor.d
-%config /etc/apparmor.d/usr.sbin.murmurd
+%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) /var/lib/mumble-server
+%dir %attr(-,mumble-server,mumble-server) %{_localstatedir}/lib/mumble-server
-%dir /var/log/mumble-server
+%dir %{_localstatedir}/log/mumble-server
 
 %changelog