Hello community, here is the log from the commit of package mumble for openSUSE:Factory checked in at 2013-08-07 20:45:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-01-21 17:40:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.mumble.new/mumble.changes 2013-08-07 20:45:50.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Aug 1 09:23:58 UTC 2013 - [email protected] + +- clean up old macros + +------------------------------------------------------------------- +Thu Jun 6 18:19:15 UTC 2013 - [email protected] + +- update to 1.2.4: http://mumble.sourceforge.net/1.2.4 + Obsoleted patches: + 0001-fix-build-error-with-capability.h.diff + 0001-fix-user-switching.diff + 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff + 0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff + 0001-remove-CAP_NET_ADMIN.diff + 0001-fix-bonjour-support-using-avahi-compat-lib.diff + mumble-1.2.3-nohardcodedcas.diff + 0001-Explicitly-remove-file-permissions-for-settings-and-D.diff + +- systemd service file + +------------------------------------------------------------------- Old: ---- 0001-Explicitly-remove-file-permissions-for-settings-and-D.diff 0001-fix-bonjour-support-using-avahi-compat-lib.diff 0001-fix-build-error-with-capability.h.diff 0001-fix-user-switching.diff 0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff 0001-remove-CAP_NET_ADMIN.diff mumble-1.2.3-nohardcodedcas.diff mumble-1.2.3.tar.gz mumble-1.2.3.tar.gz.sig New: ---- mumble-1.2.4.tar.gz mumble-1.2.4.tar.gz.sig mumble-server.service ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mumble.spec ++++++ --- /var/tmp/diff_new_pack.kliZa1/_old 2013-08-07 20:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.kliZa1/_new 2013-08-07 20:45:51.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package mumble # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ %bcond_with ice %endif -%bcond_without mumble11x +%bcond_with mumble11x %bcond_without bonjour # mumble must be able to talk to other clients which may use @@ -102,7 +102,7 @@ %if %{with pulseaudio} BuildRequires: pulseaudio-devel %endif -Version: 1.2.3%{?snapshot:_%snapshot} +Version: 1.2.4%{?snapshot:_%snapshot} Release: 0 %if 0%{!?snapshot:1} Source: http://downloads.sourceforge.net/project/mumble/Mumble/%{version}/mumble-%{version}.tar.gz @@ -111,14 +111,7 @@ Source2: mumble-server.init Source3: murmur.apparmor Source4: %{name}.keyring -Patch0: 0001-fix-build-error-with-capability.h.diff -Patch1: 0001-fix-user-switching.diff -Patch2: 0001-open-log-file-early-so-log-dir-can-be-root-owned.diff -Patch3: 0001-if-service-name-is-empty-don-t-pass-an-empty-string.diff -Patch4: 0001-remove-CAP_NET_ADMIN.diff -Patch5: 0001-fix-bonjour-support-using-avahi-compat-lib.diff -Patch6: mumble-1.2.3-nohardcodedcas.diff -Patch7: 0001-Explicitly-remove-file-permissions-for-settings-and-D.diff +Source5: mumble-server.service 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 @@ -176,6 +169,7 @@ Conflicts: mumble-server < %version Provides: mumble-server = %version %endif +%{?systemd_requires} %description server Low-latency, high-quality voice communication for gamers. Includes game @@ -184,19 +178,11 @@ won't be audible to other players. %prep -%if 0%{?gpg_verify:1} -%gpg_verify %{S:1} -%endif +#if 0%{?gpg_verify:1} +#gpg_verify %{S:1} +#endif %setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -# + %patch50 -p1 %if 0%{?suse_version} && 0%{?suse_version} < 1020 %patch99 -p1 @@ -303,7 +289,7 @@ for i in mumble murmur; do make -C src/$i -f Makefile.Release compiler_pb_make_all done -make %{?jobs:-j%{jobs}} +make %{?_smp_mflags} %endif %install @@ -320,10 +306,6 @@ 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.16x16.png "%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/mumble.png" -#install -D -m 0644 icons/mumble.32x32.png "%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/mumble.png" -#install -D -m 0644 icons/mumble.48x48.png "%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/mumble.png" -#install -D -m 0644 icons/mumble.64x64.png "%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/mumble.png" install -D -m 0644 icons/mumble.svg "%{buildroot}%{_datadir}/icons/hicolor/scalable/apps/mumble.svg" # install -d -m0755 "%{buildroot}%{_libdir}/mumble" @@ -339,12 +321,15 @@ install -D -m 0755 release/mumble11x %{buildroot}%{_bindir}/mumble11x %else # XXX -/bin/rm "%{buildroot}%{_mandir}"/man1/mumble11x* +/bin/rm -f "%{buildroot}%{_mandir}"/man1/mumble11x* %endif # # server install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd" +%if 0%{?suse_version} < 1310 install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server +ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server +%endif install -D -m 0644 %{SOURCE3} %{buildroot}/etc/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 @@ -353,7 +338,6 @@ # 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 -ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server install -D -m 0644 scripts/murmur.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/mumble-server.conf install -D -m 0644 scripts/murmur.ini %{buildroot}%{_sysconfdir}/mumble-server.ini # fix up config file @@ -385,25 +369,15 @@ mkdir -p %{buildroot}%{_docdir}/%{name} cp -a scripts LICENSE README README.Linux %{buildroot}%{_docdir}/%{name} # -%if 0%{?suse_version} >= 1130 -%if 0%{?suse_version} == 1130 -mkdir %buildroot/etc/tmpdirs.d/ -cat >> %buildroot/etc/tmpdirs.d/50_mumble-server <<EOF -#!/bin/sh -while read t f m o g xxx; do - [ "$t" = d ] || continue - install -d -m $m -o $o -g $g $f -done < /usr/lib/tmpfiles.d/mumble-server.conf -EOF -%endif 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 -%endif +# +install -D -m 0644 %{SOURCE5} %{buildroot}%{_unitdir}/mumble-server.service %clean -rm -rf "%{buildroot}" +%{?buildroot:%__rm -rf "%{buildroot}"} %pre server getent group mumble-server >/dev/null || groupadd -r mumble-server || : @@ -411,15 +385,24 @@ /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} +%if 0%{?suse_version} < 1310 %stop_on_removal mumble-server %endif +%service_del_preun mumble-server.service + +%post server +systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true +%if 0%{?suse_version} < 1310 +%fillup_and_insserv mumble-server +%endif +%service_add_post mumble-server.service %postun server -%if 0%{?suse_version} +%if 0%{?suse_version} < 1310 %restart_on_update mumble-server %insserv_cleanup %endif +%service_del_postun mumble-server.service %files %defattr(-, root, root) @@ -446,10 +429,12 @@ %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 /etc/init.d/mumble-server +%{_sbindir}/rcmumble-server +%endif %dir /etc/apparmor.d /etc/apparmor.d/usr.sbin.murmurd -%{_sbindir}/rcmumble-server %{_sbindir}/murmurd %{_bindir}/murmurd %{_bindir}/murmur-user-wrapper @@ -457,14 +442,8 @@ %{_mandir}/man1/murmur-user-wrapper.* %dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server %dir /var/log/mumble-server -%if 0%{?suse_version} < 1130 -%dir %attr(-,mumble-server,mumble-server) /var/run/mumble-server -%else -%if 0%{?suse_version} == 1130 -%config /etc/tmpdirs.d/50_mumble-server -%endif %dir /usr/lib/tmpfiles.d -%config /usr/lib/tmpfiles.d/mumble-server.conf -%endif +/usr/lib/tmpfiles.d/mumble-server.conf +%{_unitdir}/mumble-server.service %changelog ++++++ mumble-1.2.3.tar.gz -> mumble-1.2.4.tar.gz ++++++ ++++ 281994 lines of diff (skipped) ++++++ mumble-server.service ++++++ # This file is part of package mumble-server. # # Copyright (c) 2013 Pascal Bleser <[email protected]> # Author: Pascal Bleser # # Description: # # Used to start the Mumble server (murmurd) # [Unit] Description=Mumble Server (murmur) Requires=var-run.mount network.target remote-fs.target syslog.target time-sync.target After=var-run.mount network.target remote-fs.target syslog.target time-sync.target mysql.target [Service] ExecStart=/usr/sbin/murmurd -fg -ini /etc/mumble-server.ini [Install] WantedBy=multi-user.target -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
