rpms/deutex/devel deutex-4.4.0-waddir.patch, NONE, 1.1 deutex.spec, 1.3, 1.4

[Michael Thomas (wart)]

Author: wart

Update of /cvs/extras/rpms/deutex/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15700

Modified Files:
	deutex.spec 
Added Files:
	deutex-4.4.0-waddir.patch 
Log Message:
Set default wad directory to the fedora default.



deutex-4.4.0-waddir.patch:

--- NEW FILE deutex-4.4.0-waddir.patch ---
--- 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[];
 


Index: deutex.spec
===================================================================
RCS file: /cvs/extras/rpms/deutex/devel/deutex.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- deutex.spec	28 Aug 2006 03:35:49 -0000	1.3
+++ deutex.spec	11 Apr 2007 16:23:40 -0000	1.4
@@ -1,6 +1,8 @@
+%define waddir  %{_datadir}/doom
+
 Name:           deutex
 Version:        4.4.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        DOOM wad file manipulator
 
 Group:          Amusements/Graphics
@@ -10,6 +12,7 @@
 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 +32,13 @@
 %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 +63,9 @@
 
 
 %changelog
+* Wed Apr 11 2007 Wart <wart at kobold.org> 4.4.0-4
+- Set default wad directory to the fedora default
+
 * Sun Aug 27 2006 Wart <wart at kobold.org> 4.4.0-3
 - Rebuild for FC-6