- Up to 4.0.0.

[packages/Atari800.git] / Atari800.spec

diff --git a/Atari800.spec b/Atari800.spec
index 81d88f94e9a0329f3386217f1e3b4c4ab8a884ea..188101898a83b4f709cdd13259934597848d4846 100644 (file)
--- a/Atari800.spec
+++ b/Atari800.spec
@@ -1,29 +1,28 @@
 #
 # Conditional build:
 %bcond_with    license_agreement       # with unzipped ROM files instead of xf25.zip
 #
 # 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:       Atari 800 Emulator

-Summary(pl):   Emulator Atari 800
+Summary(pl.UTF-8):     Emulator Atari 800

 Name:          Atari800
 Name:          Atari800

-Version:       1.3.6
+Version:       4.0.0

 Release:       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
 Group:         Applications/Emulators

-Source0:       http://dl.sourceforge.net/atari800/atari800-%{version}.tar.gz
-# Source0-md5: 98b58d26aabeedb124233787677c32c3
+Source0:       https://sourceforge.net/projects/atari800/files/atari800/%{version}/atari800-%{version}.tar.gz
+# Source0-md5: 72ba8e390a8fba7d087c2c089dae6d3c

 # NOTE: ROMs probably can be redistributed only in original XF25 archive
 Source1:       http://joy.sophics.cz/www/xf25.zip
 # Source1-md5: 4dc3b6b4313e9596c4d474785a37b94d
 Source2:       %{name}-chooser
 # NOTE: ROMs probably can be redistributed only in original XF25 archive
 Source1:       http://joy.sophics.cz/www/xf25.zip
 # Source1-md5: 4dc3b6b4313e9596c4d474785a37b94d
 Source2:       %{name}-chooser

-URL:           http://atari800.atari.org/
+URL:           https://atari800.github.io/

 BuildRequires: SDL-devel
 BuildRequires: SDL-devel

-BuildRequires: XFree86-devel

 BuildRequires: automake
 BuildRequires: automake

-%{?with_svga:BuildRequires:    svgalib-devel}

 %if %{with license_agreement}
 BuildRequires: unzip
 %endif
 %if %{with license_agreement}
 BuildRequires: unzip
 %endif

+BuildRequires: xorg-lib-libX11-devel
+BuildRequires: xorg-lib-libXext-devel

 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 BuildRequires: zlib-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 


@@ -32,84 +31,66 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %description
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
 %description
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 

-%description -l pl
+%description -l pl.UTF-8

 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 %package common
 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 %package common

-Summary:       Atari 800 Emulator - common files for svgalib and X11 versions
-Summary(pl):   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
 Group:         Applications/Emulators
 Obsoletes:     Atari800

-%if %{without license_agreement}
+%if !%{with license_agreement}

 Requires(post):        unzip
 %endif
 
 %description common
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
 Requires(post):        unzip
 %endif
 
 %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.
 of Atari800.

-%if %{without license_agreement}
+%if !%{with license_agreement}

 Note: because of license problems we had to include whole X-Former
 archive (xf25.zip). If you don't want it - rebuild Atari800 (--with
 license_agreement)
 %endif 
 
 Note: because of license problems we had to include whole X-Former
 archive (xf25.zip). If you don't want it - rebuild Atari800 (--with
 license_agreement)
 %endif 
 

-%description common -l pl
+%description common -l pl.UTF-8

 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 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.
 oraz X11.

-%if %{without license_agreement}
-Uwaga: z powodu problemów z licencj± musieli¶my za³±czyæ ca³± paczkê
-z emulatorem X-Former (xf25.zip). Je¶li jej nie chcesz w pakiecie -
+%if !%{with license_agreement}
+Uwaga: z powodu problemów z licencją musieliśmy załączyć całą paczkę
+z emulatorem X-Former (xf25.zip). Jeśli jej nie chcesz w pakiecie -

 przebuduj pakiet z opcja --with license_agreement.
 %endif
 
 przebuduj pakiet z opcja --with license_agreement.
 %endif
 

-%package svga
-Summary:       Atari 800 Emulator - svgalib version
-Summary(pl):   Emulator Atari 800 - wersja pod svgalib
-License:       GPL
-Group:         Applications/Emulators
-Requires:      %{name}-common = %{version}
-
-%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
-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
 %package x11
 Summary:       Atari 800 Emulator - X Window version

-Summary(pl):   Emulator Atari 800 - wersja pod X Window
+Summary(pl.UTF-8):     Emulator Atari 800 - wersja dla systemu X Window

 License:       GPL
 Group:         Applications/Emulators
 License:       GPL
 Group:         Applications/Emulators

-Requires:      %{name}-common = %{version}
+Requires:      %{name}-common = %{version}-%{release}

 
 %description x11
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
 This package contains Atari800 executable file configured for X11 with
 
 %description x11
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
 This package contains Atari800 executable file configured for X11 with

-sound and joystick support.
+OSS sound and joystick support.

 
 

-%description x11 -l pl
+%description x11 -l pl.UTF-8

 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 Ten pakiet zawiera wykonywalny plik emulatora skonfigurowany dla X11 z
 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 Ten pakiet zawiera wykonywalny plik emulatora skonfigurowany dla X11 z

-obs³ug± d¼wiêku i joysticka.
+obsługą dźwięku OSS i joysticka.

 
 %package SDL
 Summary:       Atari 800 Emulator - SDL version
 
 %package SDL
 Summary:       Atari 800 Emulator - SDL version

-Summary(pl):   Emulator Atari 800 - wersja pod SDL
+Summary(pl.UTF-8):     Emulator Atari 800 - wersja SDL

 License:       GPL
 Group:         Applications/Emulators
 License:       GPL
 Group:         Applications/Emulators

-Requires:      %{name}-common = %{version}
+Requires:      %{name}-common = %{version}-%{release}
+Obsoletes:     Atari800-svga

 
 %description SDL
 This is Atari 800, 800XL, 130XE and 5200 emulator.
 
 %description SDL
 This is Atari 800, 800XL, 130XE and 5200 emulator.


@@ -117,11 +98,11 @@ This is Atari 800, 800XL, 130XE and 5200 emulator.
 This package contains Atari800 executable file configured for SDL with
 sound and joystick support.
 
 This package contains Atari800 executable file configured for SDL with
 sound and joystick support.
 

-%description SDL -l pl
+%description SDL -l pl.UTF-8

 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 Ten pakiet zawiera wykonywalny plik emulatora skonfigurowany dla SDL z
 To jest emulator Atari 800, 800XL, 130XE i 5200.
 
 Ten pakiet zawiera wykonywalny plik emulatora skonfigurowany dla SDL z

-obs³ug± d¼wiêku i joysticka.
+obsługą dźwięku i joysticka.

 
 %prep
 %setup -q -n atari800-%{version}
 
 %prep
 %setup -q -n atari800-%{version}


@@ -131,99 +112,34 @@ cd src
 rm config.sub
 cp -f /usr/share/automake/config.sub .
 
 rm config.sub
 cp -f /usr/share/automake/config.sub .
 

-CFLAGS="%{rpmcflags}"
-
-%if %{with svga}

 %configure \
 %configure \

-       --target=svgalib \
-       --disable-VERY_SLOW \
-       --enable-NO_CYCLE_EXACT \
-       --enable-CRASH_MENU \
-       --enable-MONITOR_BREAK \
-       --enable-MONITOR_HINTS \
-       --enable-MONITOR_ASSEMBLER \
-       --enable-COMPILED_PALETTE \
-       --enable-SNAILMETER \
-       --disable-SVGA_SPEEDUP \
-       --enable-USE_CURSORBLOCK \
-       --disable-JOYMOUSE \
-       --enable-LINUX_JOYSTICK \
-       --enable-SOUND \
-       --enable-NO_VOL_ONLY \
-       --enable-NO_CONSOL_SOUND \
-       --disable-SERIO_SOUND \
-       --enable-NOSNDINTER \
-       --disable-CLIP \
-       --disable-STEREO \
-       --disable-BUFFERED_LOG \
-       --enable-SET_LED \
-       --enable-NO_LED_ON_SCREEN
+       --target=x11-shm \
+       --enable-crashmenu \
+       --disable-stereosound \
+       --with-sound=sdl \
+       --with-video=sdl

 
 %{__make}
 
 
 %{__make}
 

-mv -f atari800 atari800-svga
+%{__mv} atari800 atari800-SDL

 
 %{__make} clean
 
 %{__make} clean

-%endif

 
 %configure \
 
 %configure \

-       --target=sdl \
-       --disable-VERY_SLOW \
-       --enable-NO_CYCLE_EXACT \
-       --enable-CRASH_MENU \
-       --enable-MONITOR_BREAK \
-       --enable-MONITOR_HINTS \
-       --enable-MONITOR_ASSEMBLER \
-       --enable-COMPILED_PALETTE \
-       --enable-SNAILMETER \
-       --enable-LINUX_JOYSTICK \
-       --enable-SOUND \
-       --enable-NO_VOL_ONLY \
-       --enable-NO_CONSOL_SOUND \
-       --disable-SERIO_SOUND \
-       --enable-NOSNDINTER \
-       --disable-CLIP \
-       --disable-STEREO \
-       --disable-BUFFERED_LOG \
-       --enable-SET_LED \
-       --enable-NO_LED_ON_SCREEN
+       --target=x11-shm \
+       --enable-crashmenu \
+       --disable-stereosound \
+       --with-sound=oss \
+       --with-video=no

 
 %{__make}
 
 
 %{__make}
 

-mv -f atari800 atari800-SDL
-
-%{__make} clean
-
-%configure \
-       --target=shm \
-       --disable-VERY_SLOW \
-       --enable-NO_CYCLE_EXACT \
-       --enable-CRASH_MENU \
-       --enable-MONITOR_BREAK \
-       --enable-MONITOR_HINTS \
-       --enable-MONITOR_ASSEMBLER \
-       --enable-COMPILED_PALETTE \
-       --enable-SNAILMETER \
-       --enable-LINUX_JOYSTICK \
-       --enable-SOUND \
-       --enable-NO_VOL_ONLY \
-       --enable-NO_CONSOL_SOUND \
-       --disable-SERIO_SOUND \
-       --enable-NOSNDINTER \
-       --disable-CLIP \
-       --disable-STEREO
-
-%{__make}
-
-mv -f atari800 atari800-x11
+%{__mv} atari800 atari800-x11

 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/atari800,%{_mandir}/man1}
 
 
 %install
 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
 install src/atari800-x11 $RPM_BUILD_ROOT%{_bindir}
 install src/atari800-SDL $RPM_BUILD_ROOT%{_bindir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/atari800


@@ -231,7 +147,7 @@ install src/atari800.man $RPM_BUILD_ROOT%{_mandir}/man1/atari800.1
 
 %if %{with license_agreement}
 unzip -q -L %{SOURCE1} -d $RPM_BUILD_ROOT%{_datadir}/atari800
 
 %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
 %else
 install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/atari800
 %endif


@@ -239,7 +155,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/atari800
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 

-%if %{without license_agreement}
+%if !%{with license_agreement}

 %post common
 cd %{_datadir}/atari800
 if [ "`echo *.rom`" = "*.rom" ]; then
 %post common
 cd %{_datadir}/atari800
 if [ "`echo *.rom`" = "*.rom" ]; then


@@ -263,9 +179,3 @@ fi
 %files SDL
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/atari800-SDL
 %files SDL
 %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