rpms/xscorch/devel xscorch-0.2.0-stack-smash.patch, NONE, 1.1 xscorch-0.2.0-termcap.patch, NONE, 1.1 xscorch.desktop, NONE, 1.1 xscorch.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Marcin Garski (mgarski) fedora-extras-commits at redhat.com
Sat Aug 27 16:25:15 UTC 2005


Author: mgarski

Update of /cvs/extras/rpms/xscorch/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20605/devel

Modified Files:
	.cvsignore sources 
Added Files:
	xscorch-0.2.0-stack-smash.patch xscorch-0.2.0-termcap.patch 
	xscorch.desktop xscorch.spec 
Log Message:
auto-import xscorch-0.2.0-4 on branch devel from xscorch-0.2.0-4.src.rpm

xscorch-0.2.0-stack-smash.patch:

--- NEW FILE xscorch-0.2.0-stack-smash.patch ---
Index: saddconf.c
===================================================================
RCS file: /fridge/cvs/xscorch/sgame/saddconf.c,v
retrieving revision 1.46
diff -u -r1.46 saddconf.c
--- xscorch-0.2.0.orig/sgame/saddconf.c	26 Feb 2004 06:34:54 -0000	1.46
+++ xscorch-0.2.0/sgame/saddconf.c	26 Aug 2005 16:28:19 -0000
@@ -178,8 +178,8 @@
    Read an economy scoring info and insert it into the registry. */
 
    sc_scoring_info *info;
-   char desc[SC_INVENTORY_MAX_DESC_LEN];
-   char name[SC_INVENTORY_MAX_NAME_LEN];
+   char desc[SC_ECONOMY_MAX_DESC_LEN];
+   char name[SC_ECONOMY_MAX_NAME_LEN];
 
    assert(ec != NULL);
    assert(reader != NULL);
@@ -224,7 +224,7 @@
    reg_get_boolean(reader, item, "fixed",         &info->fixed);
 
    /* Read in the scoring description if there is one. */
-   if(!reg_get_string(reader, item, "description", desc, SC_INVENTORY_MAX_DESC_LEN) || desc[0] == '\0') {
+   if(!reg_get_string(reader, item, "description", desc, SC_ECONOMY_MAX_DESC_LEN) || desc[0] == '\0') {
       info->description = NULL;
    } else {
       info->description = (char *)malloc(strlenn(desc) + 1);
Index: seconomy.h
===================================================================
RCS file: /fridge/cvs/xscorch/sgame/seconomy.h,v
retrieving revision 1.8
diff -u -r1.8 seconomy.h
--- xscorch-0.2.0.orig/sgame/seconomy.h	26 Feb 2004 06:34:54 -0000	1.8
+++ xscorch-0.2.0/sgame/seconomy.h	26 Aug 2005 16:28:19 -0000
@@ -44,7 +44,7 @@
 #define  SC_ECONOMY_SELL_MARKUP     0.50        /* Percent markup to sell (<1, markdown) */
 
 #define  SC_ECONOMY_MAX_NAME_LEN    30          /* Longest allowed economy name */
-
+#define  SC_ECONOMY_MAX_DESC_LEN    80          /* Longest allowed economy description */
 
 /* Data on the various types of economy scorings */
 typedef struct _sc_scoring_info {

xscorch-0.2.0-termcap.patch:

--- NEW FILE xscorch-0.2.0-termcap.patch ---
--- xscorch-0.2.0/configure.termcap	2004-03-25 06:16:26.000000000 +0100
+++ xscorch-0.2.0/configure	2005-08-24 16:58:08.000000000 +0200
@@ -22307,7 +22307,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline  $LIBS"
+LIBS="-lreadline -ltermcap $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22670,7 +22670,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lreadline  $LIBS"
+LIBS="-lreadline -ltermcap $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
@@ -22737,12 +22737,12 @@
             echo "$as_me:$LINENO: checking whether readline works at runtime" >&5
 echo $ECHO_N "checking whether readline works at runtime... $ECHO_C" >&6
 templibs="$LIBS"
-LIBS="-lreadline "" $LIBS"
+LIBS="-lreadline -ltermcap"" $LIBS"
 if test "$cross_compiling" = yes; then
   echo "$as_me:$LINENO: result: unknown: cross-compiling" >&5
 echo "${ECHO_T}unknown: cross-compiling" >&6
    READLINE="1"
-   LIBREADLINE_LIBS="-lreadline"
+   LIBREADLINE_LIBS="-lreadline -ltermcap"
 else
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
@@ -22801,7 +22801,7 @@
   echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6
    READLINE="1"
-   LIBREADLINE_LIBS="-lreadline"
+   LIBREADLINE_LIBS="-lreadline -ltermcap"
 else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5


--- NEW FILE xscorch.desktop ---
[Desktop Entry]
Type=Application
Encoding=UTF-8
Name=xscorch
Comment=A Scorched Earth clone
Exec=xscorch
Icon=/usr/share/xscorch/images/xscorch-icon.xpm
Categories=X-Fedora;Application;Game;


--- NEW FILE xscorch.spec ---
Name:		xscorch
Version:	0.2.0
Release:	4%{?dist}
Summary:	A Scorched Earth clone

Group:		Amusements/Games
License:	GPL
URL:		http://www.xscorch.org/
Source0:	http://www.xscorch.org/releases/%{name}-%{version}.tar.gz
Source1:	xscorch.desktop
Patch0:		http://www.xscorch.org/releases/xscorch-0.2.0-64bit.patch.gz
Patch1:		xscorch-0.2.0-stack-smash.patch
Patch2:		xscorch-0.2.0-termcap.patch
BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)

BuildRequires:	xorg-x11-devel gtk2-devel >= 2.4.0 desktop-file-utils
#BuildRequires:	readline-devel

%description
xscorch is a clone of the classic DOS game, "Scorched Earth". The basic goal
is to annihilate enemy tanks using overpowered guns :). Basically, you buy
weapons, you target the enemy by adjusting the angle of your turret and firing
power, and you hope to destroy their tank before they destroy yours.

%prep
%setup -q
%patch0 -p0
%patch1 -p1 -b .stack
# We need this patch to get readline to link (once networkplay becomes stable).
#%patch2 -p1 -b .termcap

%build
# We need this with newer GTK+ 2.x versions because we use GtkCombo.
CFLAGS="%{optflags} -D__ALLOW_DEPRECATED_GTK__"
%configure --without-gtk-12 --disable-network --disable-sound
make %{?_smp_mflags}

%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT

desktop-file-install --vendor fedora \
	--dir $RPM_BUILD_ROOT%{_datadir}/applications \
	%{SOURCE1}

%clean
rm -rf $RPM_BUILD_ROOT

%files
%defattr(-, root, root)
%doc doc/AI AUTHORS ChangeLog COPYING doc/make_text_data.pl doc/NETWORK NEWS
%doc doc/NOTES README TODO
%{_bindir}/xscorch
%{_datadir}/xscorch/
%{_mandir}/man6/xscorch.6*
%{_datadir}/applications/*xscorch.desktop

%changelog
* Fri Aug 26 2005 Marcin Garski <mgarski at post.pl> 0.2.0-4
- Disable network
- Patch fixing stack smashing
- Patch fixing Readline detection

* Tue Aug 23 2005 Marcin Garski <mgarski at post.pl> 0.2.0-3
- Spec improvements for Fedora Extras

* Wed Jun 02 2004 Marcin Garski <mgarski at post.pl> 0.2.0-2.fc2
- Rebuild for Fedora Core 2

* Wed Mar 31 2004 Marcin Garski <mgarski at post.pl> 0.2.0-1
- Update to 0.2.0

* Wed Feb 11 2004 Marcin Garski <mgarski at post.pl> 0.1.16-2
- Disable sound that cause problems

* Sun Feb  1 2004 Marcin Garski <mgarski at post.pl> 0.1.16-1
- Update to 0.1.16

* Sat Jan 31 2004 Marcin Garski <mgarski at post.pl> 0.1.15-2
- Added xscorch.desktop

* Sat Jan 31 2004 Marcin Garski <mgarski at post.pl> 0.1.15-1
- Initial specfile


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	27 Aug 2005 16:24:03 -0000	1.1
+++ .cvsignore	27 Aug 2005 16:25:12 -0000	1.2
@@ -0,0 +1,2 @@
+xscorch-0.2.0-64bit.patch.gz
+xscorch-0.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xscorch/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	27 Aug 2005 16:24:03 -0000	1.1
+++ sources	27 Aug 2005 16:25:13 -0000	1.2
@@ -0,0 +1,2 @@
+00c6b5e67683ac8562488547659a72f3  xscorch-0.2.0-64bit.patch.gz
+42862dbde1d0ebf87be30f7e04462a66  xscorch-0.2.0.tar.gz




More information about the scm-commits mailing list