packages: Atari800/Atari800.spec - updated to 2.2.1 - svgalib support dropp...

Sat May 28 21:33:23 CEST 2011

Author: qboosh                       Date: Sat May 28 19:33:23 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 2.2.1
- svgalib support dropped upstream; SDL version obsoletes svga now

---- Files affected:
packages/Atari800:
   Atari800.spec (1.56 -> 1.57) 

---- Diffs:

================================================================
Index: packages/Atari800/Atari800.spec
diff -u packages/Atari800/Atari800.spec:1.56 packages/Atari800/Atari800.spec:1.57

--- packages/Atari800/Atari800.spec:1.56	Tue Jul 17 22:48:19 2007
+++ packages/Atari800/Atari800.spec	Sat May 28 21:33:18 2011
@@ -2,17 +2,16 @@
 #
 # Conditional build:
 %bcond_with	license_agreement	# with unzipped ROM files instead of xf25.zip
-%bcond_without	svga 			# without SVGA version
 #
 Summary:	Atari 800 Emulator
 Summary(pl.UTF-8):	Emulator Atari 800
 Name:		Atari800
-Version:	2.0.3
+Version:	2.2.1
 Release:	1
-License:	GPL (Atari800), distributable if unmodified (xf25 with ROMs)
+License:	GPL v2+ (Atari800), distributable if unmodified (xf25 with ROMs)
 Group:		Applications/Emulators
-Source0:	http://dl.sourceforge.net/atari800/atari800-%{version}.tar.gz
-# Source0-md5:	4e472f804a22219d5a7d1d381c89d872
+Source0:	http://downloads.sourceforge.net/atari800/atari800-%{version}.tar.gz
+# Source0-md5:	57c0b44207934c6109e64a56c2c83de0
 # NOTE: ROMs probably can be redistributed only in original XF25 archive
 Source1:	http://joy.sophics.cz/www/xf25.zip
 # Source1-md5:	4dc3b6b4313e9596c4d474785a37b94d
@@ -20,7 +19,6 @@
 URL:		http://atari800.atari.org/
 BuildRequires:	SDL-devel
 BuildRequires:	automake
-%{?with_svga:BuildRequires:	svgalib-devel}
 %if %{with license_agreement}
 BuildRequires:	unzip
 %endif
@@ -37,8 +35,8 @@
 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 %package common
-Summary:	Atari 800 Emulator - common files for svgalib and X11 versions
-Summary(pl.UTF-8):	Emulator Atari 800 - pliki wspólne dla wersji svgalib oraz X11
+Summary:	Atari 800 Emulator - common files for SDL and X11 versions
+Summary(pl.UTF-8):	Emulator Atari 800 - pliki wspólne dla wersji SDL oraz X11
 Group:		Applications/Emulators
 Obsoletes:	Atari800
 %if !%{with license_agreement}
@@ -48,7 +46,7 @@
 %description common
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
-This package contains common files for both svgalib and X11 versions
+This package contains common files for both SDL and X11 versions
 of Atari800.
 %if !%{with license_agreement}
 Note: because of license problems we had to include whole X-Former
@@ -59,7 +57,7 @@
 %description common -l pl.UTF-8
 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
-Ten pakiet zawiera pliki wspólne dla wersji działających pod svgalib
+Ten pakiet zawiera pliki wspólne dla wersji działających pod SDL
 oraz X11.
 %if !%{with license_agreement}
 Uwaga: z powodu problemów z licencją musieliśmy załączyć całą paczkę
@@ -67,28 +65,9 @@
 przebuduj pakiet z opcja --with license_agreement.
 %endif
 
-%package svga
-Summary:	Atari 800 Emulator - svgalib version
-Summary(pl.UTF-8):	Emulator Atari 800 - wersja pod svgalib
-License:	GPL
-Group:		Applications/Emulators
-Requires:	%{name}-common = %{version}-%{release}
-
-%description svga
-This is Atari 800, 800XL, 130XE and 5200 emulator.
-
-This package contains Atari800 executable file configured for svgalib
-with sound and joystick support.
-
-%description svga -l pl.UTF-8
-To jest emulator Atari 800, 800XL, 130XE i 5200.
-
-Ten pakiet zawiera wykonywalny plik emulatora skonfigurowany dla
-svgalib z obsługą dźwięku i joysticka.
-
 %package x11
 Summary:	Atari 800 Emulator - X Window version
-Summary(pl.UTF-8):	Emulator Atari 800 - wersja pod X Window
+Summary(pl.UTF-8):	Emulator Atari 800 - wersja dla systemu X Window
 License:	GPL
 Group:		Applications/Emulators
 Requires:	%{name}-common = %{version}-%{release}
@@ -107,10 +86,11 @@
 
 %package SDL
 Summary:	Atari 800 Emulator - SDL version
-Summary(pl.UTF-8):	Emulator Atari 800 - wersja pod SDL
+Summary(pl.UTF-8):	Emulator Atari 800 - wersja SDL
 License:	GPL
 Group:		Applications/Emulators
 Requires:	%{name}-common = %{version}-%{release}
+Obsoletes:	Atari800-svga
 
 %description SDL
 This is Atari 800, 800XL, 130XE and 5200 emulator.
@@ -132,22 +112,6 @@
 rm config.sub
 cp -f /usr/share/automake/config.sub .
 
-CFLAGS="%{rpmcflags}"
-
-%if %{with svga}
-%configure \
-	--target=svgalib \
-	--enable-crashmenu \
-	--enable-cursorblock \
-	--disable-stereosound
-
-%{__make}
-
-mv -f atari800 atari800-svga
-
-%{__make} clean
-%endif
-
 %configure \
 	--target=sdl \
 	--enable-crashmenu \
@@ -172,9 +136,6 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/atari800,%{_mandir}/man1}
 
-%if %{with svga}
-install src/atari800-svga $RPM_BUILD_ROOT%{_bindir}
-%endif
 install src/atari800-x11 $RPM_BUILD_ROOT%{_bindir}
 install src/atari800-SDL $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/atari800
@@ -182,7 +143,7 @@
 
 %if %{with license_agreement}
 unzip -q -L %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/atari800
-rm -f $RPM_BUILD_ROOT%{_datadir}/atari800/xf25.*
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/atari800/xf25.*
 %else
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/atari800
 %endif
@@ -215,18 +176,16 @@
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/atari800-SDL
 
-%if %{with svga}
-%files svga
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/atari800-svga
-%endif
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2011/05/28 19:33:18  qboosh
+- updated to 2.2.1
+- svgalib support dropped upstream; SDL version obsoletes svga now
+
 Revision 1.56  2007/07/17 20:48:19  qboosh
 - updated to 2.0.3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/Atari800/Atari800.spec?r1=1.56&r2=1.57&f=u

