From 6fbf0110731249097e2b06adad6f0bb862d73e56 Mon Sep 17 00:00:00 2001 From: Bill Currie Date: Mon, 27 May 2002 20:28:10 +0000 Subject: [PATCH] rpm building fixes --- RPM/quakeforge.spec.in | 22 +++++++++++++++++----- include/Makefile.am | 8 ++++---- include/QF/Makefile.am | 2 +- include/{QF => }/exp.h | 0 include/{QF => }/ops.h | 0 libs/util/cmd.c | 5 +++-- libs/util/exp.c | 5 +++-- tools/pak/Makefile.am | 2 ++ tools/qfcc/include/Makefile.am | 3 ++- tools/qfprogs/include/Makefile.am | 2 +- 10 files changed, 33 insertions(+), 16 deletions(-) rename include/{QF => }/exp.h (100%) rename include/{QF => }/ops.h (100%) diff --git a/RPM/quakeforge.spec.in b/RPM/quakeforge.spec.in index bcce65f24..d97e71dd5 100644 --- a/RPM/quakeforge.spec.in +++ b/RPM/quakeforge.spec.in @@ -48,6 +48,16 @@ Software's very popular DOOM series. Its primary development goal is to remain compatible with the original games released by id Software while adding portability and optional extensions to enhance gameplay. +%package utils +Summary: QuakeForge 3D game engine - utility programs +Group: Amusements/Games +#Requires: +%description utils +QuakeForge is a source port of Quake and QuakeWorld, the successors to id +Software's very popular DOOM series. Its primary development goal is to +remain compatible with the original games released by id Software while +adding portability and optional extensions to enhance gameplay. + %package servers Summary: QuakeForge 3D game engine - Server Group: Amusements/Games @@ -307,7 +317,7 @@ rm -rf $RPM_BUILD_ROOT %doc COPYING INSTALL TODO doc/* %attr(-,root,root) %dir %{_prefix}/share/games/quakeforge %attr(-,root,root) %dir %{_prefix}/share/games/quakeforge/id1 -%attr(-,root,root) %{_prefix}/share/games/quakeforge/id1/menu.dat +%attr(-,root,root) %{_prefix}/share/games/quakeforge/id1/menu.dat* %files common %attr(-,root,root) /etc/quakeforge.conf @@ -316,7 +326,6 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %{_prefix}/lib/libQFcsqc.so.* %attr(-,root,root) %{_prefix}/lib/libQFgamecode.so.* %attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.so.* -%attr(-,root,root) %{_prefix}/lib/libQFgib.so.* %attr(-,root,root) %{_prefix}/lib/libQFjs.so.* %attr(-,root,root) %{_prefix}/lib/libQFmodels.so.* %attr(-,root,root) %{_prefix}/lib/libQFsound.so.* @@ -326,6 +335,12 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_output_disk.so* %attr(-,root,root) %{_prefix}/lib/quakeforge/libsnd_render_default.so* +%files utils +%attr(-,root,root) %{_prefix}/bin/pak +%attr(-,root,root) %{_prefix}/bin/qfprogs +%attr(-,root,root) %{_prefix}/man/man1/pak.1.gz +#%attr(-,root,root) %{_prefix}/man/man1/qfprogs.1.gz + %files servers %attr(-,root,root) %{_prefix}/bin/qw-server %attr(-,root,root) %{_prefix}/bin/nq-server @@ -428,9 +443,6 @@ rm -rf $RPM_BUILD_ROOT %attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.a %attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.la %attr(-,root,root) %{_prefix}/lib/libQFgamecode_builtins.so -%attr(-,root,root) %{_prefix}/lib/libQFgib.a -%attr(-,root,root) %{_prefix}/lib/libQFgib.la -%attr(-,root,root) %{_prefix}/lib/libQFgib.so %attr(-,root,root) %{_prefix}/lib/libQFjs.a %attr(-,root,root) %{_prefix}/lib/libQFjs.la %attr(-,root,root) %{_prefix}/lib/libQFjs.so diff --git a/include/Makefile.am b/include/Makefile.am index 001bb11d9..81be94eba 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,10 +1,10 @@ ## Process this file with automake to produce Makefile.in AUTOMAKE_OPTIONS= foreign SUBDIRS = QF -EXTRA_DIST = asm_i386.h adivtab.h anorm_dots.h anorms.h asm_draw.h block16.h \ - block8.h buildnum.h compat.h context_x11.h d_iface.h d_ifacea.h \ - d_local.h dga_check.h fbset.h getopt.h gl_warp_sin.h \ - in_win.h logos.h menu.h old_keys.h qstring.h quakeasm.h r_cvar.h \ +EXTRA_DIST = asm_i386.h alsa_funcs_list.h adivtab.h anorm_dots.h anorms.h \ + asm_draw.h block16.h block8.h buildnum.h compat.h context_x11.h d_iface.h \ + d_ifacea.h d_local.h dga_check.h exp.h fbset.h getopt.h gl_warp_sin.h \ + in_win.h logos.h menu.h old_keys.h ops.h qstring.h quakeasm.h r_cvar.h \ r_dynamic.h r_local.h r_shared.h sbar.h skin_stencil.h stamp-h.in \ varrays.h vgamodes.h view.h vregset.h winquake.h world.h \ \ diff --git a/include/QF/Makefile.am b/include/QF/Makefile.am index 1f0c5daa9..d4353e1c9 100644 --- a/include/QF/Makefile.am +++ b/include/QF/Makefile.am @@ -5,7 +5,7 @@ include_HEADERS = bspfile.h cdaudio.h checksum.h clip_hull.h cmd.h \ console.h crc.h csqc.h cvar.h dstring.h draw.h gcc_attr.h hash.h hl.h \ in_event.h info.h input.h joystick.h keys.h link.h locs.h \ mathlib.h mdfour.h model.h modelgen.h msg.h pak.h pcx.h plugin.h \ - pr_comp.h pr_debug.h progs.h qargs.h qdefs.h qendian.h qfplist.h \ + pr_comp.h pr_debug.h pr_obj.h progs.h qargs.h qdefs.h qendian.h qfplist.h \ qtypes.h render.h screen.h sizebuf.h skin.h sound.h spritegn.h \ sys.h teamplay.h texture.h tga.h uint32.h va.h \ ver_check.h vfile.h vfs.h vid.h wad.h zone.h diff --git a/include/QF/exp.h b/include/exp.h similarity index 100% rename from include/QF/exp.h rename to include/exp.h diff --git a/include/QF/ops.h b/include/ops.h similarity index 100% rename from include/QF/ops.h rename to include/ops.h diff --git a/libs/util/cmd.c b/libs/util/cmd.c index eab1218fb..e8cd0a32c 100644 --- a/libs/util/cmd.c +++ b/libs/util/cmd.c @@ -49,12 +49,13 @@ static const char rcsid[] = #include "QF/sys.h" #include "QF/vfs.h" #include "QF/zone.h" -#include "compat.h" #include "QF/dstring.h" -#include "QF/exp.h" #include "QF/va.h" #include "QF/info.h" +#include "compat.h" +#include "exp.h" + typedef struct cmdalias_s { struct cmdalias_s *next; const char *name; diff --git a/libs/util/exp.c b/libs/util/exp.c index 50dda513e..bc488587f 100644 --- a/libs/util/exp.c +++ b/libs/util/exp.c @@ -24,10 +24,11 @@ #include #include -#include "QF/exp.h" -#include "QF/ops.h" #include "QF/qtypes.h" +#include "exp.h" +#include "ops.h" + exp_error_t EXP_ERROR; optable_t optable[] = diff --git a/tools/pak/Makefile.am b/tools/pak/Makefile.am index 1b0fdbc15..c8e4b671a 100644 --- a/tools/pak/Makefile.am +++ b/tools/pak/Makefile.am @@ -13,3 +13,5 @@ man_MANS= pak.1 pak_SOURCES= pak.c pakfile.c pak_LDADD= $(PAK_LIBS) pak_DEPENDENCIES= $(PAK_DEPS) + +EXTRA_DIST= pak.h pakfile.h pak.1 diff --git a/tools/qfcc/include/Makefile.am b/tools/qfcc/include/Makefile.am index 2b6b7cef8..5af68b34b 100644 --- a/tools/qfcc/include/Makefile.am +++ b/tools/qfcc/include/Makefile.am @@ -1,3 +1,4 @@ AUTOMAKE_OPTIONS= foreign -EXTRA_DIST= cmdlib.h expr.h struct.h switch.h qfcc.h type.h +EXTRA_DIST= class.h cmdlib.h expr.h function.h method.h qfcc.h struct.h \ + switch.h type.h diff --git a/tools/qfprogs/include/Makefile.am b/tools/qfprogs/include/Makefile.am index d7de6112c..4ad76132b 100644 --- a/tools/qfprogs/include/Makefile.am +++ b/tools/qfprogs/include/Makefile.am @@ -1,3 +1,3 @@ AUTOMAKE_OPTIONS= foreign -EXTRA_DIST= +EXTRA_DIST= disassemble.h globals.h qfprogs.h strings.h