rpms/abe/FC-4 .cvsignore, 1.2, 1.3 abe.spec, 1.8, 1.9 sources, 1.2, 1.3 abe-1.0-datapath.patch, 1.1, NONE abe-1.0-gcc4.patch, 1.1, NONE abe-1.0-misc-fixes.patch, 1.1, NONE abe-1.0-tmppath.patch, 1.1, NONE

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/abe/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22439

Modified Files:
	.cvsignore abe.spec sources 
Removed Files:
	abe-1.0-datapath.patch abe-1.0-gcc4.patch 
	abe-1.0-misc-fixes.patch abe-1.0-tmppath.patch 
Log Message:
Update to 1.1




Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-4/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	8 Nov 2004 04:01:10 -0000	1.2
+++ .cvsignore	4 Mar 2006 23:10:55 -0000	1.3
@@ -1 +1 @@
-abe-1_0.tar.gz
+abe-1.1.tar.gz


Index: abe.spec
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-4/abe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- abe.spec	12 Apr 2005 14:33:30 -0000	1.8
+++ abe.spec	4 Mar 2006 23:10:55 -0000	1.9
@@ -1,17 +1,13 @@
 Name:           abe
-Version:        1.0
-Release:        5
+Version:        1.1
+Release:        1%{?dist}
 
 Summary:        Scrolling, platform-jumping, ancient pyramid exploring game
 Group:          Amusements/Games
 License:        GPL
 URL:            http://abe.sourceforge.net/
-Source0:        http://download.sourceforge.net/abe/abe-1_0.tar.gz
+Source0:        http://dl.sourceforge.net/abe/abe-1.1.tar.gz
 Source1:        %{name}.png
-Patch0:         %{name}-%{version}-datapath.patch
-Patch1:         %{name}-%{version}-tmppath.patch
-Patch2:         %{name}-%{version}-gcc4.patch
-Patch3:         %{name}-%{version}-misc-fixes.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL-devel >= 1.2.3, SDL_mixer-devel >= 1.2.3
@@ -22,29 +18,22 @@
 vaguely in the style of similar games for the Commodore+4.
 
 %prep
-%setup -q -n %{name}-1_0
-# Abe assumes it runs from its build directory and thus assumes everything
-# is writable there etc.. ugh:
-# Hardcode /usr/share/abe/ paths
-%patch0 -p1 -b .datapath
-# Write temporary image files into home directory, not data directory
-%patch1 -p1 -b .tmppath
-%patch2 -p1 -b .gcc4
-%patch3 -p1 -b .miscfix
+%setup -q
 
 %build
-%configure
+%configure --with-data-dir=%{_datadir}/%{name}
 make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+
+# make install does not copy the game data files.
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/%{name}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications/
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 cp -p -r images maps sounds $RPM_BUILD_ROOT/%{_datadir}/%{name}
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/pixmaps/
-install -p -m 755 %{name} $RPM_BUILD_ROOT/%{_bindir}/
 
 cat << EOF > %{name}.desktop
 [Desktop Entry]
@@ -74,6 +63,9 @@
 %{_datadir}/pixmaps/*
 
 %changelog
+* Sat Mar 4 2006 Wart <wart at kobold.org> 1.1-1
+- Update to 1.1
+
 * Mon Apr 11 2005 Panu Matilainen <pmatilai at welho.com> 0:1.0-5
 - fix build on gcc4
 - patch to fix issues in #149362


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/abe/FC-4/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	8 Nov 2004 04:01:10 -0000	1.2
+++ sources	4 Mar 2006 23:10:55 -0000	1.3
@@ -1 +1 @@
-a7e44d5e605b2d32fffdf46f019f7119  abe-1_0.tar.gz
+5537920e1746708e1a631d84d3500f5c  abe-1.1.tar.gz


--- abe-1.0-datapath.patch DELETED ---


--- abe-1.0-gcc4.patch DELETED ---


--- abe-1.0-misc-fixes.patch DELETED ---


--- abe-1.0-tmppath.patch DELETED ---