From 1dd2b4823a72cc2e648f08fd063ce5048659b4e0541b8e99bff80da87c11c296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Tue, 29 Jul 2014 19:58:30 +0000 Subject: [PATCH 1/2] Accepting request 242833 from home:darix:branches:games:tools Note: For really building it for SLE11 you would need libprotobuf in games:tools. If your project has it, the build works. - fix build for older distros like SLE 11 - disable xinput2 support on sle 11 - add a new bcond for systemd and use that throughout the spec file for guarding systemd usage instead of spreading out the if suse_version conditional all over the place. - some systemd pieces were also done on none systemd distros. move those into the systemd blocks. OBS-URL: https://build.opensuse.org/request/show/242833 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=57 --- mumble.changes | 11 ++++++++++ mumble.spec | 55 ++++++++++++++++++++++++++++++++------------------ 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/mumble.changes b/mumble.changes index 230b19d..67fc9a0 100644 --- a/mumble.changes +++ b/mumble.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 29 10:49:24 UTC 2014 - mrueckert@suse.de + +- fix build for older distros like SLE 11 + - disable xinput2 support on sle 11 + - add a new bcond for systemd and use that throughout the spec + file for guarding systemd usage instead of spreading out the + if suse_version conditional all over the place. + - some systemd pieces were also done on none systemd distros. + move those into the systemd blocks. + ------------------------------------------------------------------- Sat Jun 14 15:27:40 UTC 2014 - mailaender@opensuse.org diff --git a/mumble.spec b/mumble.spec index a86f331..7ab9698 100644 --- a/mumble.spec +++ b/mumble.spec @@ -32,6 +32,12 @@ %bcond_with ice %endif +%if 0%{?suse_version} && 0%{?suse_version} < 1230 +%bcond_with systemd +%else +%bcond_without systemd +%endif + %bcond_with mumble11x %bcond_without bonjour @@ -169,7 +175,9 @@ PreReq: /usr/sbin/useradd 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 @@ -262,6 +270,9 @@ qmake \ %endif %if !%{with pulseaudio} CONFIG*=no-pulseaudio \ +%endif +%if 0%{?suse_version} == 1110 + CONFIG*=no-xinput2 \ %endif CONFIG*=no-crash-report \ -recursive @@ -326,11 +337,17 @@ install -D -m 0755 release/mumble11x %{buildroot}%{_bindir}/mumble11x # # server install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd" -%if 0%{?suse_version} < 1310 +%if %{with systemd} +mkdir -p %buildroot/usr/lib/tmpfiles.d +cat >> %buildroot/usr/lib/tmpfiles.d/mumble-server.conf <> %buildroot/usr/lib/tmpfiles.d/mumble-server.conf </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 || : %preun server -%if 0%{?suse_version} < 1310 +%if %{with systemd} +%service_del_preun mumble-server.service +%else %stop_on_removal mumble-server %endif -%service_del_preun mumble-server.service %post server +%if %{with systemd} systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true -%if 0%{?suse_version} < 1310 +%service_add_post mumble-server.service +%else %fillup_and_insserv mumble-server %endif -%service_add_post mumble-server.service %postun server -%if 0%{?suse_version} < 1310 +%if %{with systemd} +%service_del_postun mumble-server.service +%else %restart_on_update mumble-server %insserv_cleanup %endif -%service_del_postun mumble-server.service %files %defattr(-, root, root) @@ -431,12 +445,16 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true %doc %{_docdir}/%{name}/scripts/murmur.ini %config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf %config(noreplace) %{_sysconfdir}/mumble-server.ini -%if 0%{?suse_version} < 1310 +%if %{with systemd} +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/mumble-server.conf +%{_unitdir}/mumble-server.service +%else /etc/init.d/mumble-server %endif %{_sbindir}/rcmumble-server %dir /etc/apparmor.d -/etc/apparmor.d/usr.sbin.murmurd +%config /etc/apparmor.d/usr.sbin.murmurd %{_sbindir}/murmurd %{_bindir}/murmurd %{_bindir}/murmur-user-wrapper @@ -444,8 +462,5 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true %{_mandir}/man1/murmur-user-wrapper.* %dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server %dir /var/log/mumble-server -%dir /usr/lib/tmpfiles.d -/usr/lib/tmpfiles.d/mumble-server.conf -%{_unitdir}/mumble-server.service %changelog From bbd7385febf87a970eee4dde9b44a0150796cfa664253cf8e4b11a7f8f07c0fc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 8 Aug 2014 08:33:15 +0000 Subject: [PATCH 2/2] Accepting request 243443 from home:Mailaender:branches:games:tools add baselibs.conf to spec file to fix a factory bot check OBS-URL: https://build.opensuse.org/request/show/243443 OBS-URL: https://build.opensuse.org/package/show/games:tools/mumble?expand=0&rev=58 --- mumble.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mumble.spec b/mumble.spec index 7ab9698..139e2ad 100644 --- a/mumble.spec +++ b/mumble.spec @@ -118,6 +118,7 @@ Source2: mumble-server.init Source3: murmur.apparmor 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