Packman Build Service PMBS

Changes of Revision 4

hexen2.spec Changed

@@ -50,7 +50,6 @@
 %endif
 Requires:       SDL >= 1.2.4
 Obsoletes:      %{name}-missionpack
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %{?el2:%define _without_freedesktop 1}
 %{?rh7:%define _without_freedesktop 1}
 %{?el2:%define _with_gtk1 1}
@@ -88,12 +87,6 @@
 %{!?_without_freedesktop:BuildRequires: desktop-file-utils}
 %{?_with_gtk1:BuildRequires:  gtk-devel}
 %{!?_with_gtk1:BuildRequires: %{!?_with_gtk3:gtk2-devel}%{?_with_gtk3:gtk3-devel}}
-# timidity++-patches requirement is non-fatal
-#%{!?_without_timidity:Requires: timidity++-patches}
-# these will be picked by rpm already
-#%{?_with_opus:Requires: opus opusfile}
-#%{!?_without_mp3:Requires: libmad}
-#%{!?_without_ogg:Requires: libvorbis}
 
 %description
 Hexen II is a class based shooter game by Raven Software from 1997.
@@ -106,13 +99,8 @@
 %package -n hexenworld
 Summary:        Client and Server
 Group:          Amusements/Games/Action/Shoot
-# timidity++-patches requirement is non-fatal
-#%{!?_without_timidity:Requires: timidity++-patches}
-# these will be picked by rpm already
-#%{!?_without_mp3:Requires: libmad}
-#%{!?_without_ogg:Requires: libvorbis}
-Requires:       %{name} >= %{version}
-Requires:       SDL >= 1.2.4
+Requires:       %{name} = %version-%release
+Requires:       SDL
 
 %description -n hexenworld
 Hexen II is a class based shooter game by Raven Software from 1997.
@@ -124,14 +112,12 @@
 %prep
 %setup -q -n hexen2source-%{version} -a1 -a2
 
+%build
 ## set the default gamedata directory
-%if 0%{?suse_version}
 sed -i -e 's|int basedir_nonstd	= 0;|int basedir_nonstd	= 1;|' launcher/config_file.c
-sed -i -e '274 a\	printf ("GameDatadir  : %s\\n", game_basedir);' \
+sed -i -e '274 a\	printf ("GameDatadir  : %%s\\n", game_basedir);' \
 	-e '278 a\	write_config_file();' launcher/main.c
-%endif
 
-## fix __DATE__ and __TIME__
 STATIC_BUILDTIME=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%H:%%M')
 STATIC_BUILDDATE=$(LC_ALL=C date -u -r %{_sourcedir}/%{name}.changes '+%%b %%e %%Y')
 %define _sed_work sed -i -e 's/__DATE__/"$STATIC_BUILDDATE"/' -e 's/__TIME__/"$STATIC_BUILDTIME"/'
@@ -143,7 +129,7 @@
 %{_sed_work} hw_utils/hwmaster/sys_amiga.c
 %{_sed_work} hw_utils/hwmaster/sys_unix.c
 
-%build
+export CFLAGS='%optflags -Wno-deprecated-declarations -std=gnu11'
 # Build the main game binaries
 make -C engine/%{name} %{engine_buildopt} h2 %{?_smp_mflags}
 # use localclean instead of clean to avoid building timidity every time
@@ -304,7 +290,6 @@
 
 
 %files
-%defattr(-,root,root)
 %dir %{_datadir}/games/%{name}
 %dir %{_datadir}/games/%{name}/data1
 %dir %{_datadir}/games/%{name}/data1/maps
@@ -375,7 +360,6 @@
 %{?_without_freedesktop:%{_sysconfdir}/X11/applnk/Games/%{desktop_vendor}.desktop}
 
 %files -n hexenworld
-%defattr(-,root,root)
 %dir %{_datadir}/games/%{name}
 %dir %{_datadir}/games/%{name}/docs
 %dir %{_datadir}/games/%{name}/hw