diff --git a/.gitignore b/.gitignore index 926b7c3..5eac514 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ crossfire-1.11.0.arch.tar.gz /crossfire-1.60.0.tar.gz /crossfire-1.70.0.tar.gz /crossfire-1.70.0.arch.tar.gz +/crossfire-1.71.0.arch.tar.bz2 +/crossfire-1.71.0.tar.bz2 diff --git a/crossfire-1.71.0-snprintf-formatting.patch b/crossfire-1.71.0-snprintf-formatting.patch new file mode 100644 index 0000000..988ef87 --- /dev/null +++ b/crossfire-1.71.0-snprintf-formatting.patch @@ -0,0 +1,11 @@ +--- server/c_chat.c~ 2014-04-05 17:30:49.000000000 -0500 ++++ server/c_chat.c 2016-03-01 10:15:58.576275572 -0600 +@@ -645,7 +645,7 @@ + + if (*params == '\0') { + if (emotion > EMOTE_FIRST && emotion < EMOTE_LAST && single_emotes[emotion - 1][0] != NULL) { +- snprintf(buf, sizeof(buf), single_emotes[emotion - 1][0]); ++ snprintf(buf, sizeof(buf), "%s", single_emotes[emotion - 1][0]); + snprintf(buf2, sizeof(buf2), single_emotes[emotion - 1][1], op->name); + } else { + snprintf(buf, sizeof(buf), "You are a nut."); diff --git a/crossfire.spec b/crossfire.spec index 6befeca..0040338 100644 --- a/crossfire.spec +++ b/crossfire.spec @@ -8,15 +8,15 @@ %define logwatch_scripts %{logwatch_root}/scripts Name: crossfire -Version: 1.70.0 -Release: 11%{?dist} +Version: 1.71.0 +Release: 1%{?dist} Summary: Server for hosting crossfire games Group: Amusements/Games # All files GPLv2+ except server/daemon.c which also has MIT attributions License: GPLv2+ and MIT URL: http://crossfire.real-time.com -Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.gz -Source1: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.gz +Source0: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.tar.bz2 +Source1: http://downloads.sourceforge.net/crossfire/%{name}-%{version}.arch.tar.bz2 Source2: crossfire.service Source3: crossfire.sysconfig Source4: crossfire.logrotate @@ -28,6 +28,7 @@ Source9: logwatch.script.crossfire Source10: logwatch.serviceconf.crossfire #Patch0: crossfire-1.10.0-log-login.patch #Patch1: crossfire-1.11.0-curl.patch +Patch2: crossfire-1.71.0-snprintf-formatting.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: crossfire-maps BuildRequires: checkpolicy selinux-policy-devel hardlink @@ -35,6 +36,7 @@ BuildRequires: libXt-devel BuildRequires: libXext-devel BuildRequires: libXaw-devel BuildRequires: python-devel +BuildRequires: autoconf flex Requires: %{name}-plugins #Requires(post): /sbin/chkconfig @@ -46,7 +48,8 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units Requires(post): systemd-sysv - +Provides: crossfire-devel = %{version}-%{release} +Obsoletes: crossfire-devel < %{version}-%{release} %description Crossfire is a highly graphical role-playing adventure game with @@ -65,12 +68,12 @@ Group: Documentation %description doc Documentation files for the crossfire game. -%package devel -Summary: Development files for writing crossfire plugins -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -%description devel -Development files for writing crossfire plugins. +#%package devel +#Summary: Development files for writing crossfire plugins +#Group: Development/Libraries +#Requires: %%{name} = %%{version}-%%{release} +#%description devel +#Development files for writing crossfire plugins. %package plugins Summary: Plugin modules for the crossfire game server @@ -108,10 +111,11 @@ Requires: %{name} = %{version}-%{release} logwatch logwatch scripts for the Crossfire game server %prep -%setup -q -%setup -q -a 1 +%setup -qn crossfire-server-%{version} +%setup -q -a 1 -n crossfire-server-%{version} #%%patch0 -p0 #%patch1 -p0 +%patch2 -p0 mkdir SELinux cp %{SOURCE5} %{SOURCE6} %{SOURCE7} SELinux @@ -133,7 +137,8 @@ mv arch/ lib/ # in agreement with the FHS. %configure --localstatedir=%{_var}/games --disable-static -make %{?_smp_mflags} +#make %%{?_smp_mflags} # parallel build is broken +make CFLAGS="$RPM_OPT_FLAGS" # Build the selinux policy file pushd SELinux @@ -167,7 +172,7 @@ install -pD -m 0755 %{SOURCE2} $RPM_BUILD_ROOT%{_unitdir}/crossfire.service mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This utility restarts crossfire at periodic intervals. -mv $RPM_BUILD_ROOT%{_bindir}/crossloop.pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools +#mv $RPM_BUILD_ROOT%{_bindir}/crossloop,pl $RPM_BUILD_ROOT%{_datadir}/%{name}/tools # This submits core files to the developers. mv $RPM_BUILD_ROOT%{_bindir}/crossloop.web $RPM_BUILD_ROOT%{_datadir}/%{name}/tools @@ -337,17 +342,16 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man6/* #%%{_initrddir}/%%{name} %{_unitdir}/%{name}.service -%doc README NEWS DEVELOPERS AUTHORS COPYING +%doc README NEWS AUTHORS COPYING %files doc %defattr(-,root,root,-) -%doc doc/*.doc doc/*.ps doc/SurvivalGuide -%doc doc/PlayerStats doc/RunTimeCommands doc/spellcasters_guide_to_runes +%doc doc/Developers doc/playbook* doc/scripts doc/spell-docs doc/spoiler doc/spoiler-html doc/*.txt -%files devel -%defattr(-,root,root,-) -%{_bindir}/crossfire-config -%doc doc/plugins +#%files devel +#%defattr(-,root,root,-) +#%%{_bindir}/crossfire-config +#%doc doc/plugins %files plugins %defattr(-,root,root,-) @@ -370,6 +374,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 19 2016 Jon Ciesla - 1.71.0-1 +- 1.71.0, BZ 1310012. +- Obsolete devel subpackage. + * Wed Feb 03 2016 Fedora Release Engineering - 1.70.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 7d424b0..5bcc0a5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f35165d1a551dc278722fd7a85dbf0b0 crossfire-1.70.0.tar.gz -65d9aed276bdabedacaf1142c7c17731 crossfire-1.70.0.arch.tar.gz +284a269840492e45761ea786a86e48ec crossfire-1.71.0.arch.tar.bz2 +bc58e01b1266785e85c58f6710ccc13f crossfire-1.71.0.tar.bz2