X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=scummvm.spec;h=dafa25ec5d58366b55b6b2f603abc79d6093b574;hb=ad8f75a9a493522fab58a0cbc1c1b5645a86203e;hp=bcb832b4e1c844922015764e4f9dd5a68479039d;hpb=25f6ef892501312a1080c85c110214cfebbd8c0a;p=packages%2Fscummvm.git

diff --git a/scummvm.spec b/scummvm.spec
index bcb832b..dafa25e 100644
--- a/scummvm.spec
+++ b/scummvm.spec
@@ -1,17 +1,18 @@
-%define		version_tools	1.1.0
+%define		version_tools	1.6.0
 Summary:	Graphic adventure game interpreter
 Summary(pl.UTF-8):	Interpreter gier przygodowych
 Name:		scummvm
-Version:	1.1.0
-Release:	3
-License:	GPL
-Group:		X11/Applications/Games
-Source0:	http://dl.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2
-# Source0-md5:	6793c3fe801d4fcd3d5b4fc2c27d0e9e
-Source1:	http://dl.sourceforge.net/scummvm/%{name}-tools-%{version_tools}.tar.bz2
-# Source1-md5:	d89ba46b7395671181333f29d963057f
+Version:	1.6.0
+Release:	2
+License:	GPL v2+
+Group:		X11/Applications/Games
+Source0:	http://downloads.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2
+# Source0-md5:	473c151ff44e3db7b603ecacd800a0d2
+Source1:	http://downloads.sourceforge.net/scummvm/%{name}-tools-%{version_tools}.tar.bz2
+# Source1-md5:	9a5c74a49707c513e8853004e3a699e4
 Source2:	%{name}.desktop
 Patch0:		%{name}-wx-config.patch
+Patch1:		dwarf-debug.patch
 URL:		http://scummvm.org/
 BuildRequires:	SDL-devel >= 1.2.2
 BuildRequires:	alsa-lib-devel >= 0.9
@@ -21,17 +22,18 @@ BuildRequires:	fluidsynth-devel
 %endif
 BuildRequires:	freetype-devel
 BuildRequires:	libmad-devel
+BuildRequires:	libmpeg2-devel >= 0.3.2
 BuildRequires:	libpng-devel
 BuildRequires:	libvorbis-devel
-BuildRequires:	libmpeg2-devel >= 0.3.2
 %ifarch %{ix86}
 BuildRequires:	nasm
 %endif
+BuildRequires:	sed >= 4.0
 BuildRequires:	wxGTK2-unicode-devel
 BuildRequires:	wxWidgets-devel
 BuildRequires:	zlib-devel
-BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
+Obsoletes:	scummvm-engine-m4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		specflags_sparc	-fPIC
@@ -91,8 +93,8 @@ The AGI (Adventure Game Interpreter) engine was used by Sierra in
 their early adventure games.
 
 %description engine-agi -l pl.UTF-8
-Silnik AGI (Adventure Game Interpreter) był używany przez firmę
-Sierra w jej wczesnych grach przygodowych.
+Silnik AGI (Adventure Game Interpreter) był używany przez firmę Sierra
+w jej wczesnych grach przygodowych.
 
 %package engine-agos
 Summary:	AGOS engine
@@ -102,8 +104,8 @@ Requires:	%{name} = %{version}-%{release}
 
 %description engine-agos
 The AGOS Engine was originally created by Alan Cox at HorrorSoft and
-is based on AberMUD V, with graphical extensions.
-Required for following games:
+is based on AberMUD V, with graphical extensions. Required for
+following games:
 - Elvira
 - Elvira 2
 - Waxworks
@@ -122,6 +124,18 @@ Używany w następujących grach:
 - Simon the Sorcerer 2
 - The Feeble Files
 
+%package engine-cge
+Summary:	CGE engine
+Summary(pl.UTF-8):	Silnik CGE
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-cge
+CGE engine.
+
+%description engine-cge -l pl.UTF-8
+Silnik CGE.
+
 %package engine-cine
 Summary:	Cinematique engine
 Summary(pl.UTF-8):	Silnik Cinematique
@@ -134,6 +148,18 @@ Cinematique engine.
 %description engine-cine -l pl.UTF-8
 Silnik Cinematique.
 
+%package engine-composer
+Summary:	Composer engine
+Summary(pl.UTF-8):	Silnik Composer
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-composer
+Composer engine.
+
+%description engine-composer -l pl.UTF-8
+Silnik Composer.
+
 %package engine-cruise
 Summary:	Cruise engine
 Summary(pl.UTF-8):	Silnik Cruise
@@ -170,6 +196,18 @@ Drascula engine.
 %description engine-drascula -l pl.UTF-8
 Silnik Drascula.
 
+%package engine-dreamweb
+Summary:	Dreamweb engine
+Summary(pl.UTF-8):	Silnik Dreamweb
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-dreamweb
+Dreamweb engine.
+
+%description engine-dreamweb -l pl.UTF-8
+Silnik Dreamweb.
+
 %package engine-gob
 Summary:	Gob engine
 Summary(pl.UTF-8):	Silnik Gob
@@ -189,12 +227,24 @@ Group:		X11/Applications/Games
 Requires:	%{name} = %{version}-%{release}
 
 %description engine-groovie
-Engine to run adventure games created by Trilobyte or
-Aftermath Media (The 7th Guest, The 11th Hour).
+Engine to run adventure games created by Trilobyte or Aftermath Media
+(The 7th Guest, The 11th Hour).
 
 %description engine-groovie -l pl.UTF-8
-Silnik do uruchamiania gier stworzonych przez Trilobyte
-i Aftermath Media (The 7th Guest, The 11th Hour).
+Silnik do uruchamiania gier stworzonych przez Trilobyte i Aftermath
+Media (The 7th Guest, The 11th Hour).
+
+%package engine-hugo
+Summary:	Hugo engine
+Summary(pl.UTF-8):	Silnik Hugo
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-hugo
+Hugo engine.
+
+%description engine-hugo -l pl.UTF-8
+Silnik Hugo.
 
 %package engine-kyra
 Summary:	Kyrandia engine
@@ -208,6 +258,18 @@ Kyrandia engine.
 %description engine-kyra -l pl.UTF-8
 Silnik Kyrandia.
 
+%package engine-lastexpress
+Summary:	Lastexpress engine
+Summary(pl.UTF-8):	Silnik Lastexpress
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-lastexpress
+Lastexpress is the engine for the game Lastexpress of the Temptress.
+
+%description engine-lastexpress -l pl.UTF-8
+Lastexpress jest silnikiem dla gry Lastexpress of the Temptress.
+
 %package engine-lure
 Summary:	Lure engine
 Summary(pl.UTF-8):	Silnik Lure
@@ -220,23 +282,6 @@ Lure is the engine for the game Lure of the Temptress.
 %description engine-lure -l pl.UTF-8
 Lure jest silnikiem dla gry Lure of the Temptress.
 
-%package engine-m4
-Summary:	M4/MADS engine
-Summary(pl.UTF-8):	Silnik M4/MADS
-Group:		X11/Applications/Games
-Requires:	%{name} = %{version}-%{release}
-
-%description engine-m4
-MADS stands for the MicroProse Adventure Development System,
-used in the three adventure games they made. It was later sold
-to Sanctuary Woods, who continued development on it and named
-it M4 (MADS version 4 perhaps) and released two more games.
-
-%description engine-m4 -l pl.UTF-8
-MADS to MicroProse Adventure Development System, używany jest
-w trzech grach stworzonych przez MicroProse. Został sprzedany
-do Sanctuary Woods i dalej rozwijany jako M4.
-
 %package engine-made
 Summary:	MADE engine
 Summary(pl.UTF-8):	Silnik MADE
@@ -244,13 +289,13 @@ Group:		X11/Applications/Games
 Requires:	%{name} = %{version}-%{release}
 
 %description engine-made
-MADE stands for Multimedia Applications Development Environment,
-and was used by Activision to create some of their point'n'click
-adventure games. 
+MADE stands for Multimedia Applications Development Environment, and
+was used by Activision to create some of their point'n'click adventure
+games.
 
 %description engine-made -l pl.UTF-8
-MADE to Multimedia Applications Development Environment,
-był używany przez Activision w grach przygodowych.
+MADE to Multimedia Applications Development Environment, był używany
+przez Activision w grach przygodowych.
 
 %package engine-mohawk
 Summary:	Mohawk engine
@@ -259,12 +304,12 @@ Group:		X11/Applications/Games
 Requires:	%{name} = %{version}-%{release}
 
 %description engine-mohawk
-The Mohawk engine was developed by Brøderbund starting
-in the early 1990's with the Windows port of Myst.
+The Mohawk engine was developed by Brøderbund starting in the early
+1990's with the Windows port of Myst.
 
 %description engine-mohawk -l pl.UTF-8
-Silnik Mohawk został stworzony przez Brøderbund we wczesnych
-latach 90-ych, na potrzeby gry Myst.
+Silnik Mohawk został stworzony przez Brøderbund we wczesnych latach
+90-ych, na potrzeby gry Myst.
 
 %package engine-parallaction
 Summary:	Parallaction engine
@@ -369,6 +414,18 @@ Sword2 engine.
 %description engine-sword2 -l pl.UTF-8
 Silnik Sword2.
 
+%package engine-sword25
+Summary:	Sword2.5 engine
+Summary(pl.UTF-8):	Silnik Sword2.5
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-sword25
+Sword2.5 engine.
+
+%description engine-sword25 -l pl.UTF-8
+Silnik Sword2.5.
+
 %package engine-teenagent
 Summary:	TeenAgent engine
 Summary(pl.UTF-8):	Silnik TeenAgent
@@ -381,6 +438,18 @@ This engine is only used by TeenAgent.
 %description engine-teenagent -l pl.UTF-8
 Ten silnik jest używany tylko przez TeenAgenta.
 
+%package engine-testbed
+Summary:	Testbed engine
+Summary(pl.UTF-8):	Silnik Testbed
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-testbed
+TestBed: the Testing framework engine
+
+%description engine-testbed -l pl.UTF-8
+TestBed: the Testing framework engine
+
 %package engine-tinsel
 Summary:	Tinsel engine
 Summary(pl.UTF-8):	Silnik Tinsel
@@ -393,6 +462,18 @@ This engine is only used by Discworld 1 and Discworld 2.
 %description engine-tinsel -l pl.UTF-8
 Ten silnik jest używany tylko przez Discworld 1 i Discworld 2.
 
+%package engine-toon
+Summary:	Toon engine
+Summary(pl.UTF-8):	Silnik Toon
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-toon
+Toonstruck engine.
+
+%description engine-toon -l pl.UTF-8
+Silnik Toonstruck.
+
 %package engine-touche
 Summary:	Touche engine
 Summary(pl.UTF-8):	Silnik Touche
@@ -407,6 +488,19 @@ Musketeer.
 Ten silnik jest używany tylko przez Touché: Przygody Piątego
 Muszkietera.
 
+%package engine-tsage
+Summary:	Tsage engine
+Summary(pl.UTF-8):	Silnik Tsage
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-tsage
+This engine is only used by Ringworld: Revenge Of The Patriarch.
+
+%description engine-tsage -l pl.UTF-8
+Ten silnik jest używany tylko przez Ringworld: Revenge Of The
+Patriach.
+
 %package engine-tucker
 Summary:	Tucker engine
 Summary(pl.UTF-8):	Silnik Tucker
@@ -419,6 +513,67 @@ The Tucker engine is used in Bud Tucker in Double Trouble.
 %description engine-tucker -l pl.UTF-8
 Silnik Tucker jest używany przez Bud Tucker in Double Trouble.
 
+%package engine-hopkins
+Summary:	Hopkins FBI engine
+Summary(pl.UTF-8):	Silnik Hopkins FBI
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-hopkins
+This engine is used by Hopkins FBI.
+
+%description engine-hopkins -l pl.UTF-8
+Ten silnik jest używany przez Hopkins FBI.
+
+%package engine-pegasus
+Summary:	Pegasus engine
+Summary(pl.UTF-8):	Silnik Pegasus
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-pegasus
+This engine is used by The Journeyman Project: Pegasus Prime.
+
+%description engine-pegasus -l pl.UTF-8
+Ten silnik jest używany przez The Journeyman Project: Pegasus Prime.
+
+%package engine-toltecs
+Summary:	Toltecs engine
+Summary(pl.UTF-8):	Silnik Toltecs
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-toltecs
+This engine is used by 3 Skulls of the Toltecs.
+
+%description engine-toltecs -l pl.UTF-8
+Ten silnik jest używany przez 3 Skulls of the Toltecs.
+
+%package engine-tony
+Summary:	Tony engine
+Summary(pl.UTF-8):	Silnik Tony
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-tony
+This engine is used by Tony Tough and the Night of Roasted Moths.
+
+%description engine-tony -l pl.UTF-8
+Ten silnik jest używany przez Tony Tough and the Night of Roasted
+Moths.
+
+%package engine-wintermute
+Summary:	Wintermute engine
+Summary(pl.UTF-8):	Silnik Wintermute
+Group:		X11/Applications/Games
+Requires:	%{name} = %{version}-%{release}
+
+%description engine-wintermute
+The engine is used for the Wintermute games.
+
+%description engine-wintermute -l pl.UTF-8
+Ten silnik jest używany przez gry Wintermute.
+
 %package theme-classic
 Summary:	Theme classic for ScummVM
 Summary(pl.UTF-8):	Motyw classic dla ScummVM
@@ -445,32 +600,34 @@ Motyw modern dla ScummVM.
 
 %prep
 %setup -q -a 1
-%patch0 -p1
+%patch1 -p1
+cd scummvm-tools-%{version_tools}
+%patch0 -p2
+cd ..
 
 %{__sed} -i -e 's:"plugins":"%{_libdir}/scummvm":' base/plugins.cpp
 
 %build
 ./configure \
-	--prefix=/usr \
+	--prefix=%{_prefix} \
 	--disable-debug \
-	--enable-mpeg2 \
 	--enable-all-engines \
 	--enable-plugins \
 	--default-dynamic
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DDYNAMIC_MODULES -fpic $(wx-gtk2-unicode-config --cppflags)" \
+	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -fpic $(wx-gtk2-unicode-config --cppflags)" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags}"
 
 cd scummvm-tools-%{version_tools}
 ./configure \
-	--prefix=/usr \
+	--prefix=%{_prefix} \
 	--disable-debug
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DUNIX $(wx-gtk2-unicode-config --cppflags)" \
+	CXXFLAGS="%{rpmcppflags} %{rpmcflags} -DUNIX -fpermissive $(wx-gtk2-unicode-config --cppflags)" \
 	LDFLAGS="%{rpmcflags} %{rpmldflags} $(wx-gtk2-unicode-config --libs)"
 
 %install
@@ -483,7 +640,7 @@ install scummvm $RPM_BUILD_ROOT%{_bindir}
 install plugins/lib*.so $RPM_BUILD_ROOT%{_libdir}/scummvm
 
 %{__make} -C scummvm-tools-%{version_tools} install \
-	DESTDIR=$RPM_BUILD_ROOT%{_bindir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
 install icons/%{name}.svg $RPM_BUILD_ROOT%{_pixmapsdir}
@@ -509,6 +666,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc scummvm-tools-%{version_tools}/README
 %attr(755,root,root) %{_bindir}/*
 %exclude %{_bindir}/scummvm
+%{_datadir}/scummvm-tools
 
 %files engine-agi
 %defattr(644,root,root,755)
@@ -518,10 +676,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libagos.so
 
+%files engine-cge
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libcge.so
+
 %files engine-cine
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libcine.so
 
+%files engine-composer
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libcomposer.so
+
 %files engine-cruise
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libcruise.so
@@ -534,6 +700,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libdrascula.so
 
+%files engine-dreamweb
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libdreamweb.so
+
 %files engine-gob
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libgob.so
@@ -542,17 +712,21 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libgroovie.so
 
+%files engine-hugo
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libhugo.so
+
 %files engine-kyra
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libkyra.so
 
-%files engine-lure
+%files engine-lastexpress
 %defattr(644,root,root,755)
-%dir %{_libdir}/scummvm/liblure.so
+%dir %{_libdir}/scummvm/liblastexpress.so
 
-%files engine-m4
+%files engine-lure
 %defattr(644,root,root,755)
-%dir %{_libdir}/scummvm/libm4.so
+%dir %{_libdir}/scummvm/liblure.so
 
 %files engine-made
 %defattr(644,root,root,755)
@@ -594,10 +768,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libsword2.so
 
+%files engine-sword25
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libsword25.so
+
 %files engine-teenagent
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libteenagent.so
 
+%files engine-testbed
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libtestbed.so
+
 %files engine-tinsel
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libtinsel.so
@@ -606,10 +788,38 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libtouche.so
 
+%files engine-toon
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libtoon.so
+
+%files engine-tsage
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libtsage.so
+
 %files engine-tucker
 %defattr(644,root,root,755)
 %dir %{_libdir}/scummvm/libtucker.so
 
+%files engine-hopkins
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libhopkins.so
+
+%files engine-pegasus
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libpegasus.so
+
+%files engine-toltecs
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libtoltecs.so
+
+%files engine-tony
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libtony.so
+
+%files engine-wintermute
+%defattr(644,root,root,755)
+%dir %{_libdir}/scummvm/libwintermute.so
+
 %files theme-classic
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/scummclassic.*