[teeworlds/f19] merge from master
Igor Gnatenko
ignatenkobrain at fedoraproject.org
Mon Nov 25 17:32:07 UTC 2013
commit bed85fefcb9b7392e3726c503abcbe9c28d68b95
Author: Igor Gnatenko <i.gnatenko.brain at gmail.com>
Date: Mon Nov 25 21:31:28 2013 +0400
merge from master
Signed-off-by: Igor Gnatenko <i.gnatenko.brain at gmail.com>
server_ctf.cfg | 4 +-
server_dm.cfg | 6 ++--
server_tdm.cfg | 34 +++++++++++++++++++++++++++++++++
teeworlds.spec | 57 +++++++++++++++++++++++++++++++++++++------------------
4 files changed, 77 insertions(+), 24 deletions(-)
---
diff --git a/server_ctf.cfg b/server_ctf.cfg
index 72df031..6a252ff 100644
--- a/server_ctf.cfg
+++ b/server_ctf.cfg
@@ -19,7 +19,7 @@ sv_timelimit 0# Time limit of the game (in case of equal points there
sv_gametype ctf# Gametype (dm/ctf/tdm) (This setting needs the map to be reloaded in order to take effect)
sv_maprotation ctf5,ctf7# The maps to be rotated
sv_rounds_per_map 1# Number of rounds before changing to next map in rotation
-sv_motd Welcome to Fedora default CTF server!# Message of the day, shown in server info and when joining a server
+sv_motd Welcome to Fedora CTF default server!# Message of the day, shown in server info and when joining a server
sv_spectator_slots 0# Number of clients that can only be spectators
sv_teambalance_time 1# Time in minutes after the teams are uneven, to auto balance
sv_spamprotection 1# Enable spam filter
@@ -31,4 +31,4 @@ sv_vote_kick 1# Enable kick voting
sv_vote_kick_bantime 5# Time in minutes to ban a player if kicked by voting (0 equals only kick)
sv_vote_kick_min 3# Minimum number of players required to start a kick vote
sv_inactivekick_time 3# Time in minutes after an inactive player will be taken care of
-sv_inactivekick 2# How to deal with inactive players (0 = move to spectator, 1 = move to free spectator slot/kick, 2 = kick)
+sv_inactivekick 1# How to deal with inactive players (0 = move to spectator, 1 = move to free spectator slot/kick, 2 = kick)
diff --git a/server_dm.cfg b/server_dm.cfg
index fce8938..d0ca200 100644
--- a/server_dm.cfg
+++ b/server_dm.cfg
@@ -14,12 +14,12 @@ sv_map dm1# Map to use
sv_rcon_max_tries 3# Maximum number of tries for remote console authetication
sv_rcon_bantime 5# Time (in minutes) a client gets banned if remote console authentication fails (0 makes it just use kick)
sv_warmup 0# Warmup time between rounds
-sv_scorelimit 1000# Score limit of the game (0 disables it)
+sv_scorelimit 20# Score limit of the game (0 disables it)
sv_timelimit 0# Time limit of the game (in case of equal points there will be sudden death)
sv_gametype dm# Gametype (dm/ctf/tdm) (This setting needs the map to be reloaded in order to take effect)
sv_maprotation dm1,dm9# The maps to be rotated
sv_rounds_per_map 1# Number of rounds before changing to next map in rotation
-sv_motd Welcome to Fedora default DM server!# Message of the day, shown in server info and when joining a server
+sv_motd Welcome to Fedora DM default server!# Message of the day, shown in server info and when joining a server
sv_spectator_slots 0# Number of clients that can only be spectators
sv_teambalance_time 1# Time in minutes after the teams are uneven, to auto balance
sv_spamprotection 1# Enable spam filter
@@ -31,4 +31,4 @@ sv_vote_kick 1# Enable kick voting
sv_vote_kick_bantime 5# Time in minutes to ban a player if kicked by voting (0 equals only kick)
sv_vote_kick_min 3# Minimum number of players required to start a kick vote
sv_inactivekick_time 3# Time in minutes after an inactive player will be taken care of
-sv_inactivekick 2# How to deal with inactive players (0 = move to spectator, 1 = move to free spectator slot/kick, 2 = kick)
+sv_inactivekick 1# How to deal with inactive players (0 = move to spectator, 1 = move to free spectator slot/kick, 2 = kick)
diff --git a/server_tdm.cfg b/server_tdm.cfg
new file mode 100644
index 0000000..94fccaf
--- /dev/null
+++ b/server_tdm.cfg
@@ -0,0 +1,34 @@
+# More info: https://www.teeworlds.com/?page=docs&wiki=ServerSettings
+sv_name Fedora TDM default server# Name of the server
+sv_port 8305# Port the server will listen on
+sv_external_port 0# Port to report to the master servers (e.g. in case of a firewall rename)
+sv_max_clients 12# Number of clients that can be connected to the server at the same time
+sv_max_clients_per_ip 2# Number of clients with the same ip that can be connected to the server at the same time
+sv_high_bandwidth 0# Use high bandwidth mode, for LAN servers only
+sv_register 1# Register on the master servers
+sv_map dm1# Map to use
+#sv_rcon_password # Password to access the remote console (if not set, rcon is disabled)
+#password # Password to connect to the server
+#logfile # Path to a logfile
+#console_output_level # Adjust the amount of messages in the console
+sv_rcon_max_tries 3# Maximum number of tries for remote console authetication
+sv_rcon_bantime 5# Time (in minutes) a client gets banned if remote console authentication fails (0 makes it just use kick)
+sv_warmup 0# Warmup time between rounds
+sv_scorelimit 50# Score limit of the game (0 disables it)
+sv_timelimit 0# Time limit of the game (in case of equal points there will be sudden death)
+sv_gametype tdm# Gametype (dm/ctf/tdm) (This setting needs the map to be reloaded in order to take effect)
+sv_maprotation dm1,dm9# The maps to be rotated
+sv_rounds_per_map 1# Number of rounds before changing to next map in rotation
+sv_motd Welcome to Fedora TDM default server!# Message of the day, shown in server info and when joining a server
+sv_spectator_slots 0# Number of clients that can only be spectators
+sv_teambalance_time 1# Time in minutes after the teams are uneven, to auto balance
+sv_spamprotection 1# Enable spam filter
+sv_tournament_mode 1# Players will automatically join as spectator
+sv_respawn_delay_tdm 3# Time in seconds needed to respawn in the tdm gametype
+sv_teamdamage 1# Enable friendly fire
+sv_powerups 1# Enable powerups (katana)
+sv_vote_kick 1# Enable kick voting
+sv_vote_kick_bantime 5# Time in minutes to ban a player if kicked by voting (0 equals only kick)
+sv_vote_kick_min 3# Minimum number of players required to start a kick vote
+sv_inactivekick_time 3# Time in minutes after an inactive player will be taken care of
+sv_inactivekick 2# How to deal with inactive players (0 = move to spectator, 1 = move to free spectator slot/kick, 2 = kick)
diff --git a/teeworlds.spec b/teeworlds.spec
index c01f210..8108af4 100644
--- a/teeworlds.spec
+++ b/teeworlds.spec
@@ -1,7 +1,7 @@
%global _hardened_build 1
Name: teeworlds
Version: 0.6.2
-Release: 2%{?dist}
+Release: 7%{?dist}
Summary: Online multi-player platform 2D shooter
Group: Amusements/Games
@@ -14,9 +14,9 @@ Source2: %{name}.desktop
Source3: %{name}-server at .service
# example configs file for server
Source4: server_dm.cfg
-Source5: server_ctf.cfg
+Source5: server_tdm.cfg
+Source6: server_ctf.cfg
Patch0: %{name}-0.6.2-extlibs-optflags.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: mesa-libGLU-devel
BuildRequires: bam >= 0.4.0
@@ -41,10 +41,10 @@ Summary: Server for %{name}
Group: Amusements/Games
Requires: %{name}-data
Requires(pre): shadow-utils
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-BuildRequires: systemd-units
+Requires(post): systemd
+Requires(preun): systemd
+Requires(postun): systemd
+BuildRequires: systemd
%description server
Server for %{name}, an online multi-player platform 2D shooter.
@@ -101,49 +101,68 @@ desktop-file-install \
%if 0%{?rhel}
--vendor="" \
%endif
- --dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+ --dir=%{buildroot}%{_datadir}/applications \
%{SOURCE2}
mkdir -p %{buildroot}%{_unitdir}/
-install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}-server at .service
-mkdir -p %{buildroot}%{_sysconfdir}/%{name}/
-install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/dm.cfg
-install -m 0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/%{name}/ctf.cfg
+
+install -m 0644 %{SOURCE3} %{buildroot}%{_unitdir}/%{name}-server at .service
+install -d -m 0775 %{buildroot}%{_sysconfdir}/%{name}/
+install -m 0664 %{SOURCE4} %{buildroot}%{_sysconfdir}/%{name}/dm.cfg
+install -m 0664 %{SOURCE5} %{buildroot}%{_sysconfdir}/%{name}/tdm.cfg
+install -m 0664 %{SOURCE6} %{buildroot}%{_sysconfdir}/%{name}/ctf.cfg
%post server
%systemd_post %{name}-server at dm.service
+%systemd_post %{name}-server at tdm.service
%systemd_post %{name}-server at ctf.service
%preun server
%systemd_preun %{name}-server at dm.service
+%systemd_preun %{name}-server at tdm.service
%systemd_preun %{name}-server at ctf.service
%postun server
%systemd_postun_with_restart %{name}-server at dm.service
+%systemd_postun_with_restart %{name}-server at tdm.service
%systemd_postun_with_restart %{name}-server at ctf.service
-%clean
-rm -rf %{buildroot}
-
%files
-%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}
%{_datadir}/pixmaps/%{name}.png
%{_datadir}/applications/%{name}.desktop
%files data
-%defattr(-,root,root,-)
%{_datadir}/%{name}/
%files server
-%defattr(-,root,root,-)
%doc readme.txt license.txt
%{_bindir}/%{name}-srv
%{_unitdir}/%{name}-server at .service
-%attr(-,teeworlds, teeworlds)%{_sysconfdir}/%{name}/
+%attr(-,teeworlds,teeworlds)%{_sysconfdir}/%{name}/
%changelog
+* Mon Nov 25 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-7
+- fix permissions (allow access from teeworlds group to server cfgs)
+
+* Sat Aug 17 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-6
+- Fixed port in example tdm server cfg
+
+* Tue Jul 30 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-5
+- Typo fix in source list in server cfgs
+
+* Tue Jul 23 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-4
+- Add sample tdm server config
+- Few fixes in existing server configs
+- Droped BuildRoot target (since Fedora 18 was deprecated)
+- Dropped %clean section (since Fedora 18 was deprecated)
+- Dropped %defattr directives (since Fedora 18 was deprecated)
+- %{buildroot} instead of $RPM_BUILD_ROOT
+
+* Fri Jul 5 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-3
+- systemd instead of systemd-units in spec file
+
* Wed Jul 3 2013 Igor Gnatenko <i.gnatenko.brain at gmail.com> - 0.6.2-2
- Update systemd daemon for multiple server configs
- Some fixes in spec
More information about the scm-commits
mailing list