Hello community, here is the log from the commit of package mumble for openSUSE:Factory checked in at 2014-08-11 10:07:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mumble (Old) and /work/SRC/openSUSE:Factory/.mumble.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mumble" Changes: -------- --- /work/SRC/openSUSE:Factory/mumble/mumble.changes 2014-06-23 09:24:15.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.mumble.new/mumble.changes 2014-08-11 10:07:16.000000000 +0200 @@ -1,0 +2,11 @@ +Tue Jul 29 10:49:24 UTC 2014 - [email protected] + +- 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. + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mumble.spec ++++++ --- /var/tmp/diff_new_pack.I4zsir/_old 2014-08-11 10:07:17.000000000 +0200 +++ /var/tmp/diff_new_pack.I4zsir/_new 2014-08-11 10:07:17.000000000 +0200 @@ -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 @@ -112,6 +118,7 @@ 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 @@ -169,7 +176,9 @@ 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 @@ -263,6 +272,9 @@ %if !%{with pulseaudio} CONFIG*=no-pulseaudio \ %endif +%if 0%{?suse_version} == 1110 + CONFIG*=no-xinput2 \ +%endif CONFIG*=no-crash-report \ -recursive # @@ -326,11 +338,17 @@ # # 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 <<EOF +d /var/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 +%else install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server -%else -ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmumble-server %endif install -D -m 0644 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd %if 0%{?suse_version} < 1220 @@ -371,12 +389,6 @@ mkdir -p %{buildroot}%{_docdir}/%{name} cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name} # -mkdir -p %buildroot/usr/lib/tmpfiles.d -cat >> %buildroot/usr/lib/tmpfiles.d/mumble-server.conf <<EOF -d /var/run/mumble-server 0755 mumble-server mumble-server - -EOF -# -install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service %clean %{?buildroot:%__rm -rf "%{buildroot}"} @@ -387,24 +399,27 @@ /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 +446,16 @@ %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 +463,5 @@ %{_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 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
