From 39acba180f831257579fc490734aba2d667e0eef Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Apr 11 2007 16:28:52 +0000 Subject: Set default wad directory to the fedora default --- diff --git a/deutex-4.4.0-waddir.patch b/deutex-4.4.0-waddir.patch new file mode 100644 index 0000000..5298a24 --- /dev/null +++ b/deutex-4.4.0-waddir.patch @@ -0,0 +1,24 @@ +--- deutex-4.4.0/src/deutex.c.orig 2007-04-11 08:44:21.000000000 -0700 ++++ deutex-4.4.0/src/deutex.c 2007-04-11 08:46:53.000000000 -0700 +@@ -891,7 +891,7 @@ + DataDir = "."; /*work directory*/ + DoomDir = getenv("DOOMWADDIR"); + if(DoomDir == NULL) +- DoomDir = "."; ++ DoomDir = DOOMDIR; + else + Phase("Doom directory is %.128s\n",DoomDir); + /* +--- deutex-4.4.0/src/deutex.h.orig 2007-04-11 08:46:01.000000000 -0700 ++++ deutex-4.4.0/src/deutex.h 2007-04-11 08:46:26.000000000 -0700 +@@ -66,6 +66,10 @@ + #endif + #endif + ++#ifndef DOOMDIR ++#define DOOMDIR "." ++#endif ++ + /* DeuTex version */ + extern const char deutex_version[]; + diff --git a/deutex.spec b/deutex.spec index bbda97a..755c108 100644 --- a/deutex.spec +++ b/deutex.spec @@ -1,6 +1,6 @@ Name: deutex Version: 4.4.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: DOOM wad file manipulator Group: Amusements/Graphics @@ -10,6 +10,7 @@ Source0: http://www.teaser.fr/~amajorel/deutex/deutex-4.4.0.tar.gz Patch0: deutex-4.4.0-build.patch Patch1: deutex-4.4.0-64bit.patch Patch2: deutex-4.4.0-freedoom.patch +Patch3: deutex-4.4.0-waddir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) %description @@ -29,12 +30,13 @@ you're doing any wad hacking beyond level editing, DeuTex is a must. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 # Minor permissions cleanup for rpmlint. chmod a-x src/picture.c %build -make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} +make CFLAGS="$RPM_OPT_FLAGS -DDOOMDIR=\"\\\"%{waddir}\\\"\"" %{?_smp_mflags} iconv --from=ISO-8859-1 --to=UTF-8 deutex.6 > deutex.6.new mv deutex.6.new deutex.6 @@ -59,6 +61,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 11 2007 Wart 4.4.0-4 +- Set default wad directory to the fedora default + * Sun Aug 27 2006 Wart 4.4.0-3 - Rebuild for FC-6