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

Marcin Garski mgarski at fedoraproject.org
Tue May 26 22:48:19 UTC 2009


Author: mgarski

Update of /cvs/pkgs/rpms/xscorch/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4173

Modified Files:
	.cvsignore sources xscorch.desktop xscorch.spec 
Removed Files:
	xscorch-0.2.0-stack-smash.patch 
Log Message:
- Update to 0.2.1-pre1
- Remove stack-smash and 64bit patches (merged upstream)
- Update .desktop file



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	27 Aug 2005 16:25:12 -0000	1.2
+++ .cvsignore	26 May 2009 22:47:48 -0000	1.3
@@ -1,2 +1 @@
-xscorch-0.2.0-64bit.patch.gz
-xscorch-0.2.0.tar.gz
+xscorch-0.2.1-pre1.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	27 Aug 2005 16:25:13 -0000	1.2
+++ sources	26 May 2009 22:47:48 -0000	1.3
@@ -1,2 +1 @@
-00c6b5e67683ac8562488547659a72f3  xscorch-0.2.0-64bit.patch.gz
-42862dbde1d0ebf87be30f7e04462a66  xscorch-0.2.0.tar.gz
+d0db577a496f80eb948cc58b2bcde737  xscorch-0.2.1-pre1.tar.gz


Index: xscorch.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/devel/xscorch.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- xscorch.desktop	22 Jun 2007 14:47:51 -0000	1.2
+++ xscorch.desktop	26 May 2009 22:47:48 -0000	1.3
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Application
-Encoding=UTF-8
 Name=xscorch
 Comment=A Scorched Earth clone
 Exec=xscorch
-Icon=xscorch-icon.xpm
+Icon=xscorch-icon
 Categories=Game;


Index: xscorch.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xscorch/devel/xscorch.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xscorch.spec	26 Feb 2009 12:02:15 -0000	1.13
+++ xscorch.spec	26 May 2009 22:47:49 -0000	1.14
@@ -1,19 +1,19 @@
+%define	pre	pre1
+
 Name:		xscorch
-Version:	0.2.0
-Release:	14%{?dist}
+Version:	0.2.1
+Release:	0.1.%{pre}%{?dist}
 Summary:	A Scorched Earth clone
 
 Group:		Amusements/Games
 License:	GPLv2
 URL:		http://www.xscorch.org/
-Source0:	http://www.xscorch.org/releases/%{name}-%{version}.tar.gz
+Source0:	http://www.xscorch.org/releases/%{name}-%{version}%{?pre:-%{pre}}.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
+Patch0:		xscorch-0.2.0-termcap.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:	libX11-devel libXpm-devel gtk2-devel >= 2.4.0 desktop-file-utils
+BuildRequires:	libX11-devel gtk2-devel >= 2.12.0 desktop-file-utils
 #BuildRequires:	readline-devel
 
 %description
@@ -23,21 +23,17 @@ weapons, you target the enemy by adjusti
 power, and you hope to destroy their tank before they destroy yours.
 
 %prep
-%setup -q
-%patch0 -p0
-%patch1 -p1 -b .stack
+%setup -q -n %{name}-%{version}%{?pre:-%{pre}}
 # We need this patch to get readline to link (once networkplay becomes stable).
-#%patch2 -p1 -b .termcap
+#%patch0 -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
+%configure --disable-network --disable-sound
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" \
 	--dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
@@ -55,12 +51,12 @@ do
 done
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc/AI AUTHORS ChangeLog COPYING doc/make_text_data.pl doc/NETWORK NEWS
-%doc doc/NOTES README TODO
+%doc doc/NOTES README
 %{_bindir}/xscorch
 %{_datadir}/applications/xscorch.desktop
 %{_mandir}/man6/xscorch.6*
@@ -68,6 +64,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xscorch/
 
 %changelog
+* Wed May 27 2009 Marcin Garski <mgarski[AT]post.pl> 0.2.1-0.1.pre1
+- Update to 0.2.1-pre1
+- Remove stack-smash and 64bit patches (merged upstream)
+- Update .desktop file
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.0-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


--- xscorch-0.2.0-stack-smash.patch DELETED ---




More information about the fedora-extras-commits mailing list