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
This commit is contained in:
parent
9a42fb3ae8
commit
1dd2b4823a
@ -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
|
Sat Jun 14 15:27:40 UTC 2014 - mailaender@opensuse.org
|
||||||
|
|
||||||
|
55
mumble.spec
55
mumble.spec
@ -32,6 +32,12 @@
|
|||||||
%bcond_with ice
|
%bcond_with ice
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if 0%{?suse_version} && 0%{?suse_version} < 1230
|
||||||
|
%bcond_with systemd
|
||||||
|
%else
|
||||||
|
%bcond_without systemd
|
||||||
|
%endif
|
||||||
|
|
||||||
%bcond_with mumble11x
|
%bcond_with mumble11x
|
||||||
|
|
||||||
%bcond_without bonjour
|
%bcond_without bonjour
|
||||||
@ -169,7 +175,9 @@ PreReq: /usr/sbin/useradd
|
|||||||
Conflicts: mumble-server < %version
|
Conflicts: mumble-server < %version
|
||||||
Provides: mumble-server = %version
|
Provides: mumble-server = %version
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with systemd}
|
||||||
%{?systemd_requires}
|
%{?systemd_requires}
|
||||||
|
%endif
|
||||||
|
|
||||||
%description server
|
%description server
|
||||||
Low-latency, high-quality voice communication for gamers. Includes game
|
Low-latency, high-quality voice communication for gamers. Includes game
|
||||||
@ -262,6 +270,9 @@ qmake \
|
|||||||
%endif
|
%endif
|
||||||
%if !%{with pulseaudio}
|
%if !%{with pulseaudio}
|
||||||
CONFIG*=no-pulseaudio \
|
CONFIG*=no-pulseaudio \
|
||||||
|
%endif
|
||||||
|
%if 0%{?suse_version} == 1110
|
||||||
|
CONFIG*=no-xinput2 \
|
||||||
%endif
|
%endif
|
||||||
CONFIG*=no-crash-report \
|
CONFIG*=no-crash-report \
|
||||||
-recursive
|
-recursive
|
||||||
@ -326,11 +337,17 @@ install -D -m 0755 release/mumble11x %{buildroot}%{_bindir}/mumble11x
|
|||||||
#
|
#
|
||||||
# server
|
# server
|
||||||
install -D -m 0755 release/murmurd "%{buildroot}%{_sbindir}/murmurd"
|
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
|
install -D -m 0755 %{SOURCE2} %{buildroot}/etc/init.d/mumble-server
|
||||||
ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server
|
ln -s /etc/init.d/mumble-server %{buildroot}%{_sbindir}/rcmumble-server
|
||||||
%else
|
|
||||||
ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcmumble-server
|
|
||||||
%endif
|
%endif
|
||||||
install -D -m 0644 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
|
install -D -m 0644 %{SOURCE3} %{buildroot}/etc/apparmor.d/usr.sbin.murmurd
|
||||||
%if 0%{?suse_version} < 1220
|
%if 0%{?suse_version} < 1220
|
||||||
@ -371,12 +388,6 @@ sed -e '/^Name=/s/$/ 1.1.x/;/^Exec=/s/$/11x/' \
|
|||||||
mkdir -p %{buildroot}%{_docdir}/%{name}
|
mkdir -p %{buildroot}%{_docdir}/%{name}
|
||||||
cp -a scripts LICENSE README README.Linux %{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
|
%clean
|
||||||
%{?buildroot:%__rm -rf "%{buildroot}"}
|
%{?buildroot:%__rm -rf "%{buildroot}"}
|
||||||
@ -387,24 +398,27 @@ 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 || :
|
/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
|
%preun server
|
||||||
%if 0%{?suse_version} < 1310
|
%if %{with systemd}
|
||||||
|
%service_del_preun mumble-server.service
|
||||||
|
%else
|
||||||
%stop_on_removal mumble-server
|
%stop_on_removal mumble-server
|
||||||
%endif
|
%endif
|
||||||
%service_del_preun mumble-server.service
|
|
||||||
|
|
||||||
%post server
|
%post server
|
||||||
|
%if %{with systemd}
|
||||||
systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true
|
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
|
%fillup_and_insserv mumble-server
|
||||||
%endif
|
%endif
|
||||||
%service_add_post mumble-server.service
|
|
||||||
|
|
||||||
%postun server
|
%postun server
|
||||||
%if 0%{?suse_version} < 1310
|
%if %{with systemd}
|
||||||
|
%service_del_postun mumble-server.service
|
||||||
|
%else
|
||||||
%restart_on_update mumble-server
|
%restart_on_update mumble-server
|
||||||
%insserv_cleanup
|
%insserv_cleanup
|
||||||
%endif
|
%endif
|
||||||
%service_del_postun mumble-server.service
|
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(-, root, root)
|
%defattr(-, root, root)
|
||||||
@ -431,12 +445,16 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true
|
|||||||
%doc %{_docdir}/%{name}/scripts/murmur.ini
|
%doc %{_docdir}/%{name}/scripts/murmur.ini
|
||||||
%config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf
|
%config %{_sysconfdir}/dbus-1/system.d/mumble-server.conf
|
||||||
%config(noreplace) %{_sysconfdir}/mumble-server.ini
|
%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
|
/etc/init.d/mumble-server
|
||||||
%endif
|
%endif
|
||||||
%{_sbindir}/rcmumble-server
|
%{_sbindir}/rcmumble-server
|
||||||
%dir /etc/apparmor.d
|
%dir /etc/apparmor.d
|
||||||
/etc/apparmor.d/usr.sbin.murmurd
|
%config /etc/apparmor.d/usr.sbin.murmurd
|
||||||
%{_sbindir}/murmurd
|
%{_sbindir}/murmurd
|
||||||
%{_bindir}/murmurd
|
%{_bindir}/murmurd
|
||||||
%{_bindir}/murmur-user-wrapper
|
%{_bindir}/murmur-user-wrapper
|
||||||
@ -444,8 +462,5 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/mumble-server.conf || true
|
|||||||
%{_mandir}/man1/murmur-user-wrapper.*
|
%{_mandir}/man1/murmur-user-wrapper.*
|
||||||
%dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server
|
%dir %attr(-,mumble-server,mumble-server) /var/lib/mumble-server
|
||||||
%dir /var/log/mumble-server
|
%dir /var/log/mumble-server
|
||||||
%dir /usr/lib/tmpfiles.d
|
|
||||||
/usr/lib/tmpfiles.d/mumble-server.conf
|
|
||||||
%{_unitdir}/mumble-server.service
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
x
Reference in New Issue
Block a user