rpms/vavoom/F-7 vavoom.spec,1.2,1.3

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/vavoom/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2168

Modified Files:
	vavoom.spec 
Log Message:
* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.24-3
- Fix some security issues in the server: CVE-2007-4533, CVE-2007-4534,
  CVE-2007-4535 (bz 256621)



Index: vavoom.spec
===================================================================
RCS file: /cvs/extras/rpms/vavoom/F-7/vavoom.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- vavoom.spec	14 Jun 2007 18:48:38 -0000	1.2
+++ vavoom.spec	31 Aug 2007 18:44:10 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           vavoom
 Version:        1.24
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -19,9 +19,10 @@
 Source14:       tux-b2f.png
 Patch0:         vavoom-1.21-datadir.patch
 Patch1:         vavoom-1.23-fixes.patch
+Patch2:         vavoom-1.24-CVE-2007-4533-5.patch
 URL:            http://vavoom-engine.com/
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  SDL_mixer-devel SDL_net-devel libpng-devel libjpeg-devel
 BuildRequires:  libvorbis-devel mikmod-devel flac-devel openal-devel
@@ -40,6 +41,7 @@
 %setup -q
 %patch0 -p1 -b .datadir
 %patch1 -p1 -b .fix
+%patch2 -p2 -b .CVE
 
 
 %build
@@ -49,8 +51,8 @@
 
 # This one line sed command is easier than trying to muck with the Makefile
 # to add the proper -D definition.
-%{__sed} -i "s|#define FL_BASEDIR.*|#define FL_BASEDIR \"%{_datadir}/%{name}\"|" source/files.h
-%{__sed} -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/config.h
+sed -i "s|#define FL_BASEDIR.*|#define FL_BASEDIR \"%{_datadir}/%{name}\"|" source/files.h
+sed -i "s|#define CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/config.h
 
 # The Makefile doesn't do parallel builds correctly.  Don't add smp_mflags.
 make
@@ -103,11 +105,15 @@
 
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 %postun
 touch --no-create %{_datadir}/icons/hicolor || :
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
 
 
 %files
@@ -120,6 +126,13 @@
 
 
 %changelog
+* Fri Aug 31 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.24-3
+- Fix some security issues in the server: CVE-2007-4533, CVE-2007-4534,
+  CVE-2007-4535 (bz 256621)
+
+* Wed Aug 15 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.24-2
+- Update License tag for new Licensing Guidelines compliance
+
 * Thu Jun 14 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.24-1
 - New upstream release 1.24
 - This also fixes bug 241611