[vavoom] New upstream release Drop definition of buildroot, defattr and clean stage Drop obsolete patches Rem

[Rahul Sundaram]

commit 2b914eaea5057c160b5ea1561e948ef3a477ffe2
Author: Rahul Sundaram <sundaram at fedoraproject.org>
Date:   Sat Aug 20 14:11:45 2011 +0530

    New upstream release
    Drop definition of buildroot, defattr and clean stage
    Drop obsolete patches
    Remove no longer valid doom shareware mirror in doom.autodlrc
    Fixed sed line to apply to timidity.h instead of config.h which no longer exists

 .gitignore                    |    1 +
 doom.autodlrc                 |    1 -
 sources                       |    2 +-
 vavoom-1.30-cmake28-fix.patch |   14 --------------
 vavoom-1.30-gcc44-fix.patch   |   22 ----------------------
 vavoom.spec                   |   30 ++++++++++--------------------
 6 files changed, 12 insertions(+), 58 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6654b42..fa92122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 vavoom-1.30.tar.bz2
+/vavoom-1.33.tar.bz2
diff --git a/doom.autodlrc b/doom.autodlrc
index 0ed372f..31d5193 100644
--- a/doom.autodlrc
+++ b/doom.autodlrc
@@ -39,7 +39,6 @@ ID SOFTWARE LICENSE
 	[MD5]244d181457c9be5f28b91b488e67e042[/MD5]
 	[PATH]$HOME/.vavoom/doom-shareware[/PATH]
 	[MIRRORS]
-		[URL]http://www.parkerinfo.com/dmdo/downloads/doom19s.zip[/URL]
 		[URL]ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/doom/doom19s.zip[/URL]
 		[URL]ftp://ftp.idsoftware.com/idstuff/doom/doom19s.zip[/URL]
 	[/MIRRORS]
diff --git a/sources b/sources
index cf72d0e..674ae59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-205c3645006232d75790fb8779a54e85  vavoom-1.30.tar.bz2
+f3b40df71eeb2f1c8956b81c995dfc28  vavoom-1.33.tar.bz2
diff --git a/vavoom.spec b/vavoom.spec
index 4dde758..b76729a 100644
--- a/vavoom.spec
+++ b/vavoom.spec
@@ -1,6 +1,6 @@
 Name:           vavoom
-Version:        1.30
-Release:        6%{?dist}
+Version:        1.33
+Release:        1%{?dist}
 Summary:        Enhanced Doom, Heretic, Hexen and Strife source port
 Source0:        http://downloads.sourceforge.net/vavoom/%{name}-%{version}.tar.bz2
 Source1:        doom.autodlrc
@@ -19,12 +19,9 @@ Source13:       doom-logo.png
 Source14:       tux-b2f.png
 Patch0:         vavoom-1.21-datadir.patch
 Patch1:         vavoom-1.27-CMakeLists.patch
-Patch2:         vavoom-1.30-gcc44-fix.patch
-Patch3:         vavoom-1.30-cmake28-fix.patch
 URL:            http://vavoom-engine.com/
 Group:          Amusements/Games
 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-soft-devel
 BuildRequires:  libGLU-devel wxGTK-devel desktop-file-utils cmake
@@ -37,14 +34,10 @@ Heretic, Hexen and Strife. Compared to the original games it adds extra
 features such as translucency and freelook support and ofcourse the capability
 to play these classics under Linux.
 
-
 %prep 
 %setup -q
 %patch0 -p1 -b .datadir
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
 
 %build
 %cmake -DWITH_LIBMAD:BOOL=OFF
@@ -52,13 +45,11 @@ to play these classics under Linux.
 # 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 CONFIG_FILE.*|#define CONFIG_FILE \"%{_sysconfdir}/timidity.cfg\"|" source/timidity/timidity.h
 
 make VERBOSE=1
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
 make install \
         DESTDIR=$RPM_BUILD_ROOT \
         INSTALL_PARMS="-m 0755" \
@@ -97,11 +88,6 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
 install -p -m 644 %{SOURCE13} %{SOURCE14} \
   $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/
 
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
 %post
 touch --no-create %{_datadir}/icons/hicolor || :
 if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -114,17 +100,21 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then
    %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-
 %files
-%defattr(-,root,root,-)
 %doc docs/*.log docs/gnu.txt docs/vavoom.txt
 %{_bindir}/*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/*.png
 
-
 %changelog
+* Sat Aug 20 2011 Rahul Sundaram <sundaram at fedoraproject.org> 1.33-1
+- New upstream release
+- Drop definition of buildroot, defattr and clean stage
+- Drop obsolete patches
+- Remove no longer valid doom shareware mirror in doom.autodlrc
+- Fixed sed line to apply to timidity.h instead of config.h which no longer exists
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.30-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild