Thu Sep 15 23:04:24 CEST 2011

Author: jwrdegoede

Update of /cvs/nonfree/rpms/d1x/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13271

Modified Files:
	.cvsignore d1x.spec sources 
Added Files:
	d1x-rebirth-v0.57.1-desktop.patch 
	d1x-rebirth-v0.57.1-libmath.patch 
	d1x-rebirth-v0.57.1-physfs_v1.patch 
	d1x-rebirth-v0.57.1-split-regular-and-slide-invert.patch 
	d1x-rebirth.sh 
Removed Files:
	d1x-assert.patch d1x-config.patch d1x-cvs-fixes.patch 
	d1x-cvs-fixes2.patch d1x-fix-rebirth-ogl.patch d1x-fix.patch 
	d1x-fixc.patch d1x-gcc3.patch d1x-gcc34.patch d1x-gcc43.patch 
	d1x-gnuasm.patch d1x-help.patch d1x-joystick.patch 
	d1x-maths.patch d1x-miscfixes.patch d1x-music.patch 
	d1x-new-sdl.patch d1x-opt.patch d1x-paths.patch 
	d1x-playerfile-compat-fix.patch d1x-playerfile-compat.patch 
	d1x-post-rebirth-fixes.patch d1x-rebirth-fixes.patch 
	d1x-rebirth-highresbrief.patch d1x-rebirth-mode-handling.patch 
	d1x-rebirth-mouselook.patch d1x-rebirth-ogl.patch 
	d1x-shareware-fixes.patch d1x-store-res-in-plx.patch 
	d1x-types.patch d1x-unixify.patch d1x-use-reg-save-in-sw.patch 
Log Message:
* Thu Sep 15 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 1.43-9.rebirth_v0.57.1
- Update to latest d1x-rebirth release v0.57.1
- One binary now can now handle both the shareware and full versions:
  - Drop the -full subpackage
  - Put the engine in the main package
  - Make the main package obsolete the -full subpackage
  - Make the -shareware package only contain the shareware data files
- Add a desktop file and icon


d1x-rebirth-v0.57.1-desktop.patch:
 d1x-rebirth.desktop |   12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

--- NEW FILE d1x-rebirth-v0.57.1-desktop.patch ---
diff -up d1x-rebirth_v0.57.1-src/d1x-rebirth.desktop~ d1x-rebirth_v0.57.1-src/d1x-rebirth.desktop
--- d1x-rebirth_v0.57.1-src/d1x-rebirth.desktop~	2011-07-19 11:40:25.000000000 +0200
+++ d1x-rebirth_v0.57.1-src/d1x-rebirth.desktop	2011-09-15 21:46:06.042480436 +0200
@@ -1,13 +1,9 @@
 [Desktop Entry]
-Name=Descent
-Name[en_CA]=Descent
-Version=1.0
-Encoding=UTF-8
+Name=Descent 1
 Comment=DXX-Rebirth source port of Descent: First Strike from 1995...
 Exec=d1x-rebirth
-Icon=d1x-rebirth.xpm
+Icon=d1x-rebirth
 Terminal=false
 Type=Application
-Categories=Application;Game;
-StartupNotify=true
-
+Categories=Game;ActionGame;
+StartupNotify=false

d1x-rebirth-v0.57.1-libmath.patch:
 SConstruct |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE d1x-rebirth-v0.57.1-libmath.patch ---
diff -up d1x-rebirth_v0.57.1-src/SConstruct~ d1x-rebirth_v0.57.1-src/SConstruct
--- d1x-rebirth_v0.57.1-src/SConstruct~	2011-07-19 11:40:25.000000000 +0200
+++ d1x-rebirth_v0.57.1-src/SConstruct	2011-09-15 20:00:39.362419013 +0200
@@ -278,7 +278,7 @@ env.Append(CPPFLAGS = ['-Wall', '-funsig
 env.Append(CPPDEFINES = [('PROGRAM_NAME', '\\"' + str(PROGRAM_NAME) + '\\"'), ('D1XMAJOR', '\\"' + str(D1XMAJOR) + '\\"'), ('D1XMINOR', '\\"' + str(D1XMINOR) + '\\"'), ('D1XMICRO', '\\"' + str(D1XMICRO) + '\\"')])
 env.Append(CPPDEFINES = ['NETWORK', '_REENTRANT'])
 env.Append(CPPPATH = ['include', 'main', 'arch/include'])
-libs = ['physfs']
+libs = ['physfs', 'm']
 
 # Get traditional compiler environment variables
 if os.environ.has_key('CC'):

d1x-rebirth-v0.57.1-physfs_v1.patch:
 physfsx.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE d1x-rebirth-v0.57.1-physfs_v1.patch ---
diff -up d1x-rebirth_v0.57.1-src/misc/physfsx.c~ d1x-rebirth_v0.57.1-src/misc/physfsx.c
--- d1x-rebirth_v0.57.1-src/misc/physfsx.c~	2011-07-19 11:40:25.000000000 +0200
+++ d1x-rebirth_v0.57.1-src/misc/physfsx.c	2011-08-24 21:59:26.222033628 +0200
@@ -497,10 +497,10 @@ void PHYSFSX_addArchiveContent()
 		d_free(file[0]);
 		d_free(file[1]);
 	}
-#endif
 
 	PHYSFS_freeList(list);
 	list = NULL;
+#endif
 
 	if (content_updated)
 	{

d1x-rebirth-v0.57.1-split-regular-and-slide-invert.patch:
 kconfig.c |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

--- NEW FILE d1x-rebirth-v0.57.1-split-regular-and-slide-invert.patch ---
diff -up d1x-rebirth_v0.57.1-src/main/kconfig.c~ d1x-rebirth_v0.57.1-src/main/kconfig.c
--- d1x-rebirth_v0.57.1-src/main/kconfig.c~	2011-09-15 16:22:56.000000000 +0200
+++ d1x-rebirth_v0.57.1-src/main/kconfig.c	2011-09-15 16:27:57.113453673 +0200
@@ -1332,12 +1332,12 @@ void kconfig_read_controls(d_event *even
 		if ( Controls.pitch_forward_state ) Controls.vertical_thrust_time += speed_factor*FrameTime;
 		if ( Controls.pitch_backward_state ) Controls.vertical_thrust_time -= speed_factor*FrameTime;
 		// From joystick...
-		if ( !kc_joystick[14].value )		// If not inverted...
+		if ( !kc_joystick[20].value )		// If not inverted...
 			Controls.vertical_thrust_time += (Controls.joy_axis[kc_joystick[13].value]*PlayerCfg.JoystickSens[3])/8;
 		else
 			Controls.vertical_thrust_time -= (Controls.joy_axis[kc_joystick[13].value]*PlayerCfg.JoystickSens[3])/8;
 		// From mouse...
-		if ( !kc_mouse[14].value )		// If not inverted...
+		if ( !kc_mouse[20].value )		// If not inverted...
 			Controls.vertical_thrust_time -= (Controls.mouse_axis[kc_mouse[13].value]*PlayerCfg.MouseSens[3])/8;
 		else
 			Controls.vertical_thrust_time += (Controls.mouse_axis[kc_mouse[13].value]*PlayerCfg.MouseSens[3])/8;
@@ -1392,12 +1392,12 @@ void kconfig_read_controls(d_event *even
 		if ( Controls.heading_right_state ) Controls.sideways_thrust_time += speed_factor*FrameTime;
 		if ( Controls.heading_left_state ) Controls.sideways_thrust_time -= speed_factor*FrameTime;
 		// From joystick...
-		if ( !kc_joystick[16].value )		// If not inverted...
+		if ( !kc_joystick[18].value )		// If not inverted...
 			Controls.sideways_thrust_time += (Controls.joy_axis[kc_joystick[15].value]*PlayerCfg.JoystickSens[2])/8;
 		else
 			Controls.sideways_thrust_time -= (Controls.joy_axis[kc_joystick[15].value]*PlayerCfg.JoystickSens[2])/8;
 		// From mouse...
-		if ( !kc_mouse[16].value )		// If not inverted...
+		if ( !kc_mouse[18].value )		// If not inverted...
 			Controls.sideways_thrust_time += (Controls.mouse_axis[kc_mouse[15].value]*PlayerCfg.MouseSens[2])/8;
 		else
 			Controls.sideways_thrust_time -= (Controls.mouse_axis[kc_mouse[15].value]*PlayerCfg.MouseSens[2])/8;
@@ -1423,12 +1423,12 @@ void kconfig_read_controls(d_event *even
 		if ( Controls.heading_left_state ) Controls.bank_time += speed_factor*FrameTime;
 		if ( Controls.heading_right_state ) Controls.bank_time -= speed_factor*FrameTime;
 		// From joystick...
-		if ( !kc_joystick[16].value )		// If not inverted...
+		if ( !kc_joystick[22].value )		// If not inverted...
 			Controls.bank_time -= (Controls.joy_axis[kc_joystick[15].value]*PlayerCfg.JoystickSens[4])/8;
 		else
 			Controls.bank_time += (Controls.joy_axis[kc_joystick[15].value]*PlayerCfg.JoystickSens[4])/8;
 		// From mouse...
-		if ( !kc_mouse[16].value )		// If not inverted...
+		if ( !kc_mouse[22].value )		// If not inverted...
 			Controls.bank_time += (Controls.mouse_axis[kc_mouse[15].value]*PlayerCfg.MouseSens[4])/8;
 		else
 			Controls.bank_time -= (Controls.mouse_axis[kc_mouse[15].value]*PlayerCfg.MouseSens[4])/8;


--- NEW FILE d1x-rebirth.sh ---
#!/bin/bash

. /usr/share/opengl-games-utils/opengl-game-functions.sh

if hasDri; then
    D1X=/usr/bin/d1x-rebirth-gl
else
    D1X=/usr/bin/d1x-rebirth-sdl
fi

if [ -f /usr/share/d1x/full/descent.hog -a \
     -f /usr/share/d1x/full/descent.pig ]; then
    exec $D1X "$@"
elif [ -f /usr/share/d1x/d1shar/descent.hog -a \
       -f /usr/share/d1x/d1shar/descent.pig ]; then
    exec $D1X -hogdir /usr/share/d1x/d1shar/ "$@"
else
    zenity --error --text="No Descent 1 data files found, either place the \
full (registered/commercial) version data-files (descent.hog and descent.pig) \
in /usr/share/d1x/full/descent.pig; or install the d1x-shareware package."
    exit 1
fi


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/d1x/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Jul 2008 12:51:50 -0000	1.2
+++ .cvsignore	15 Sep 2011 21:04:23 -0000	1.3
@@ -1,3 +1,2 @@
-d1bigfnt.zip
 d1swdf.tar.gz
-d1x143sc.tar.bz2
+d1x-rebirth_v0.57.1-src.tar.gz


Index: d1x.spec
===================================================================
RCS file: /cvs/nonfree/rpms/d1x/devel/d1x.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- d1x.spec	29 Mar 2009 14:48:33 -0000	1.5
+++ d1x.spec	15 Sep 2011 21:04:24 -0000	1.6
@@ -1,221 +1,124 @@
-Summary:	Modified version of Descent 1
+%global rebirth_version 0.57.1
+
+Summary:	Descent 1 game engine (d1x-rebirth version)
 Name:		d1x
 Version:	1.43
-Release:	8%{?dist}
+Release:	9.rebirth_v%{rebirth_version}%{?dist}
 License:	non-commercial
 Group:		Amusements/Games
-Source0:	http://home.zonnet.nl/jwrdegoede/d1x143sc.tar.bz2
-Source1:	http://home.zonnet.nl/jwrdegoede/d1swdf.tar.gz
-Source2:	http://d1x.warpcore.org/files/d1bigfnt.zip
-# first batch of patches, many many patches because upstream is dead.
-Patch0:		%{name}-config.patch
-Patch1:		%{name}-opt.patch
-Patch2:		%{name}-fix.patch
-Patch3:		%{name}-paths.patch
-Patch4:		%{name}-maths.patch
-Patch5:		%{name}-types.patch
-Patch6:		%{name}-gcc3.patch
-Patch7:		%{name}-joystick.patch
-Patch8:		%{name}-assert.patch
-Patch9:		%{name}-fixc.patch
-Patch10:	%{name}-gcc34.patch
-Patch11:	%{name}-shareware-fixes.patch
-Patch12:	%{name}-cvs-fixes.patch
-Patch13:	%{name}-miscfixes.patch
-Patch14:	%{name}-cvs-fixes2.patch
-Patch15:	%{name}-gnuasm.patch
-Patch16:	%{name}-new-sdl.patch
-# d1x has been revived as the dxx-rebirth project, I'm honored to say that they
-# have used the livna SRPM's as a starting position and that their tarballs
-# thus include all of the above patches. However there releases aren't all
-# that stable so I've done a diff between 1.43 + all our above patches and
-# their latest release (0.42), and cherry picked the good stuff (I hope):
-Patch21:        d1x-rebirth-fixes.patch
-Patch22:        d1x-rebirth-highresbrief.patch
-Patch23:        d1x-rebirth-mode-handling.patch
-Patch24:        d1x-rebirth-mouselook.patch
-Patch25:        d1x-rebirth-ogl.patch
-# these patches are fixes/improvements on top of the d1x-rebirth patches
-Patch31:        d1x-post-rebirth-fixes.patch
-Patch32:        d1x-fix-rebirth-ogl.patch
-Patch33:        d1x-music.patch
-Patch34:        d1x-help.patch
-Patch35:        d1x-unixify.patch
-Patch36:        d1x-store-res-in-plx.patch
-Patch37:        d1x-playerfile-compat.patch
-Patch38:        d1x-use-reg-save-in-sw.patch
-Patch39:        d1x-playerfile-compat-fix.patch
-# and patches added much later to keep things compiling with the latest gcc
-Patch40:        d1x-gcc43.patch
-URL:		http://d1x.warpcore.org/
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	SDL-devel >= 1.1
-BuildRequires:	mesa-libGL-devel mesa-libGLU-devel
-%ifarch %{ix86}
-BuildRequires:	nasm
-%endif
+Source0:	http://downloads.sourceforge.net/dxx-rebirth/d1x-rebirth_v%{rebirth_version}-src.tar.gz
+Source1:	d1x-rebirth.sh
+Source2:	d1swdf.tar.gz
+Patch0:		d1x-rebirth-v0.57.1-libmath.patch
+Patch1:		d1x-rebirth-v0.57.1-physfs_v1.patch
+Patch2:		d1x-rebirth-v0.57.1-split-regular-and-slide-invert.patch
+Patch3:		d1x-rebirth-v0.57.1-desktop.patch
+URL:		http://www.dxx-rebirth.com/
+BuildRequires:	SDL-devel mesa-libGL-devel mesa-libGLU-devel
+BuildRequires:	desktop-file-utils dos2unix
+Requires:	opengl-games-utils >= 0.2
+Requires:	hicolor-icon-theme
+Provides:	%{name}-full = %{version}-%{release}
+Obsoletes:	%{name}-full < %{version}-%{release}
 
 %description
 D1X is a modification of the Descent 1 source that was released by
 Parallax. It's mostly compatible with the Descent 1 v1.5, both in
 multiplayer and on the local machine.
 
-
-%package full
-Summary:	D1X - binaries for full version of game
-Group:		Amusements/Games
-
-%description full
-D1X is a modification of the Descent 1 source that was released by
-Parallax. It's mostly compatible with the Descent 1 v1.5, both in
-multiplayer and on the local machine.
-
-This package contains D1X binaries for the full (registered/commercial) version
-of the game. You will need to place the full version data-files in
-/usr/share/%{name}/full .
+To play Descent1 you need to either need the full (registered/commercial)
+version of the game and place the full version data-files in
+%{_datadir}/%{name}/full; or install the d1x-shareware package.
 
 
 %package shareware
-Summary:	D1X - binaries for shareware version of game
+Summary:	Shareware version of Descent 1
 Group:		Amusements/Games
+Requires:	%{name} = %{version}-%{release}
 
 %description shareware
 D1X is a modification of the Descent 1 source that was released by
 Parallax. It's mostly compatible with the Descent 1 v1.5, both in
 multiplayer and on the local machine.
 
-This package contains D1X binaries and data-files for the shareware version of
-the game.
+This package contains the shareware version of the game.
 
 
 %prep
-%setup -q -n %{name}
-# lots of patches, so no backups as those are useless, since some files
-# get patched many times.
+%setup -q -n d1x-rebirth_v%{rebirth_version}-src
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-
-%patch21 -p1 
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-# patch25 is opengl only and gets applied after building the non ogl version.
-
-%patch31 -p1
-# patch32 is opengl only and gets applied after building the non ogl version.
-%patch33 -p1 -E
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-
-%patch40 -p1
+dos2unix -k *.txt
 
 
 %build
-mkdir -p lib
-echo "DEBUGABLE = 1" >> defines.in
-%ifnarch %{ix86}
-echo "NO_ASM = 1" >> defines.in
-%endif
-%ifarch sparc sparc64
-echo "BIGENDIAN = 1" >> defines.in
-%endif
-
-cp defines.in defines.mak
-echo "SDL_IO = 1" >> defines.mak
-make	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	OPTFLAGS="$RPM_OPT_FLAGS \
-	-DD1XDATAPATH=\\\"%{_datadir}/%{name}/full/\\\""
-mv d1x143 d1x-sdl-full
-
-make clean
-echo "SHAREWARE = 1" >> defines.mak
-make	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	OPTFLAGS="$RPM_OPT_FLAGS \
-	-DD1XDATAPATH=\\\"%{_datadir}/%{name}/d1shar/\\\""
-mv d1x143sh d1x-sdl-share
-
-# this patch isn't applied until now as this makes some huge video changes
-# (d1x-rebirth scalable cockpit code) which seem to break (cause crashes in) 
-# the software renderer
-patch -p1 < %{PATCH25}
-patch -p1 < %{PATCH32}
-make clean
-cp -f defines.in defines.mak
-echo "SDLGL_IO = 1" >> defines.mak
-make	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	LFLAGS="-L/usr/X11R6/%{_lib}" \
-	OPTFLAGS="$RPM_OPT_FLAGS \
-	-DD1XDATAPATH=\\\"%{_datadir}/%{name}/full/\\\""
-mv d1x143_ogl d1x-gl-full
-
-make clean
-echo "SHAREWARE = 1" >> defines.mak
-make	CC="%{__cc}" \
-	CXX="%{__cxx}" \
-	LFLAGS="-L/usr/X11R6/%{_lib}" \
-	OPTFLAGS="$RPM_OPT_FLAGS \
-	-DD1XDATAPATH=\\\"%{_datadir}/%{name}/d1shar/\\\""
-mv d1x143sh_ogl d1x-gl-share
+COMMON_FLAGS="prefix=/usr sharepath=%{_datadir}/%{name}/full ipv6=1 verbosebuild=1"
+export CFLAGS="$RPM_OPT_FLAGS"
+scons $COMMON_FLAGS opengl=0
+mv d1x-rebirth d1x-rebirth-sdl
+scons $COMMON_FLAGS opengl=1
+mv d1x-rebirth d1x-rebirth-gl
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-install -d $RPM_BUILD_ROOT%{_datadir}/d1x
-install -d $RPM_BUILD_ROOT%{_datadir}/d1x/full
-install -d $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar
-install d1x-*-* $RPM_BUILD_ROOT%{_bindir}
-tar x -z -C $RPM_BUILD_ROOT%{_datadir}/d1x -f %{SOURCE1}
-unzip -d $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar %{SOURCE2}
-unzip -d $RPM_BUILD_ROOT%{_datadir}/d1x/full   %{SOURCE2}
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%files full
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/d1x-sdl-full
-%attr(755,root,root) %{_bindir}/d1x-gl-full
-%{_datadir}/d1x/full/*
-%doc bugs.txt d1x.faq d1x.ini d1x.txt d1x140.txt license.txt readme.d1x readme.org todo.txt
+mkdir -p $RPM_BUILD_ROOT%{_bindir}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/full
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar
+install -m 755 d1x-rebirth-sdl $RPM_BUILD_ROOT%{_bindir}
+install -m 755 d1x-rebirth-gl $RPM_BUILD_ROOT%{_bindir}
+install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/d1x-rebirth
+tar x -z -C $RPM_BUILD_ROOT%{_datadir}/d1x -f %{SOURCE2}
+# fixup permissions from tarbal
+chmod 644 $RPM_BUILD_ROOT%{_datadir}/d1x/d1shar/README
+# below is the desktop file and icon stuff.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --vendor "" \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  d1x-rebirth.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 d1x-rebirth.xpm \
+  $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+
+
+%post
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
+%files
+%defattr(-,root,root,-)
+%doc COPYING.txt README.txt RELEASE-NOTES.txt
+%{_bindir}/d1x-rebirth*
 %dir %{_datadir}/d1x
 %dir %{_datadir}/d1x/full
+%{_datadir}/applications/d1x-rebirth.desktop
+%{_datadir}/icons/hicolor/128x128/apps/d1x-rebirth.xpm
 
 %files shareware
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/d1x-sdl-share
-%attr(755,root,root) %{_bindir}/d1x-gl-share
-%{_datadir}/d1x/d1shar/*
-%doc bugs.txt d1x.faq d1x.ini d1x.txt d1x140.txt license.txt readme.d1x readme.org todo.txt
-%dir %{_datadir}/d1x
-%dir %{_datadir}/d1x/d1shar
+%defattr(-,root,root,-)
+%{_datadir}/d1x/d1shar
 
 
 %changelog
+* Thu Sep 15 2011 Hans de Goede <j.w.r.degoede at gmail.com> - 1.43-9.rebirth_v0.57.1
+- Update to latest d1x-rebirth release v0.57.1
+- One binary now can now handle both the shareware and full versions:
+  - Drop the -full subpackage
+  - Put the engine in the main package
+  - Make the main package obsolete the -full subpackage
+  - Make the -shareware package only contain the shareware data files
+- Add a desktop file and icon
+
 * Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 1.43-8
 - rebuild for new F11 features
 
@@ -290,7 +193,7 @@
 - Patch 12 brings in various fixes from the d1x cvs version.
 - Plans:
   -Save settings/games in ~/.d1x instead of in wd.
-  -Search for custom levels in %{_datadir}/d1x/full,~/.d1x and a
+  -Search for custom levels in /usr/share/d1x/full,~/.d1x and a
    user configurable dir.
   -Fix/add music playback.
   -DesktopEntries


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/d1x/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Jul 2008 12:51:50 -0000	1.2
+++ sources	15 Sep 2011 21:04:24 -0000	1.3
@@ -1,3 +1,2 @@
-3f8a1337c32f43eb23dde07112ec92c0  d1bigfnt.zip
 8112d6127a7a81a36735f5a9c3175ec2  d1swdf.tar.gz
-fb52fd2990b2fadcea804238be648e53  d1x143sc.tar.bz2
+20c16f1984787420a7c833a9ebf8980f  d1x-rebirth_v0.57.1-src.tar.gz


--- d1x-assert.patch DELETED ---


--- d1x-config.patch DELETED ---


--- d1x-cvs-fixes.patch DELETED ---


--- d1x-cvs-fixes2.patch DELETED ---


--- d1x-fix-rebirth-ogl.patch DELETED ---


--- d1x-fix.patch DELETED ---


--- d1x-fixc.patch DELETED ---


--- d1x-gcc3.patch DELETED ---


--- d1x-gcc34.patch DELETED ---


--- d1x-gcc43.patch DELETED ---


--- d1x-gnuasm.patch DELETED ---


--- d1x-help.patch DELETED ---


--- d1x-joystick.patch DELETED ---


--- d1x-maths.patch DELETED ---


--- d1x-miscfixes.patch DELETED ---


--- d1x-music.patch DELETED ---


--- d1x-new-sdl.patch DELETED ---


--- d1x-opt.patch DELETED ---


--- d1x-paths.patch DELETED ---


--- d1x-playerfile-compat-fix.patch DELETED ---


--- d1x-playerfile-compat.patch DELETED ---


--- d1x-post-rebirth-fixes.patch DELETED ---


--- d1x-rebirth-fixes.patch DELETED ---


--- d1x-rebirth-highresbrief.patch DELETED ---


--- d1x-rebirth-mode-handling.patch DELETED ---


--- d1x-rebirth-mouselook.patch DELETED ---


--- d1x-rebirth-ogl.patch DELETED ---


--- d1x-shareware-fixes.patch DELETED ---


--- d1x-store-res-in-plx.patch DELETED ---


--- d1x-types.patch DELETED ---


--- d1x-unixify.patch DELETED ---


--- d1x-use-reg-save-in-sw.patch DELETED ---

