rpms/rott/devel rott-1.0-debian.patch, NONE, 1.1 rott.6, NONE, 1.1 rott-1.0-64bit.patch, 1.1, 1.2 rott.spec, 1.4, 1.5

Hans de Goede (jwrdegoede) fedora-extras-commits at redhat.com
Thu Apr 10 14:40:12 UTC 2008


Author: jwrdegoede

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

Modified Files:
	rott-1.0-64bit.patch rott.spec 
Added Files:
	rott-1.0-debian.patch rott.6 
Log Message:
* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-6
- Many fixes (and a manpage) ported over from debian


rott-1.0-debian.patch:

--- NEW FILE rott-1.0-debian.patch ---
diff -ur rott-1.0.orig/rott/_rt_ted.h rott-1.0/rott/_rt_ted.h
--- rott-1.0.orig/rott/_rt_ted.h	2002-12-20 21:15:28.000000000 +0100
+++ rott-1.0/rott/_rt_ted.h	2008-04-10 15:00:12.000000000 +0200
@@ -36,6 +36,7 @@
 {
 	int  lump;
 	int  cachelevel;
+	int  type; // To make precaching possible on big endian machines
 } cachetype;
 
 //========================================
diff -ur rott-1.0.orig/rott/byteordr.c rott-1.0/rott/byteordr.c
--- rott-1.0.orig/rott/byteordr.c	2002-12-24 06:09:11.000000000 +0100
+++ rott-1.0/rott/byteordr.c	2008-04-10 14:47:56.000000000 +0200
@@ -52,7 +52,33 @@
     Debug("No-op endian converter on %p.\n", lmp);
 }
 
-void CvtFixme(void *lmp, int num)
+// Returns converter for the designated type
+converter_t CvtForType(int type)
 {
-    Debug("FIXME endian converter on %p.\n", lmp);
+  switch(type) {
+    case cache_pic_t:
+      return Cvt_pic_t;
+      break;
+    case cache_lpic_t:
+      return Cvt_lpic_t;
+      break;
+    case cache_font_t:
+      return Cvt_font_t;
+      break;
+    case cache_lbm_t:
+      return Cvt_lbm_t;
+      break;
+    case cache_patch_t:
+      return Cvt_patch_t;
+      break;
+    case cache_transpatch_t:
+      return Cvt_transpatch_t;
+      break;
+    case cache_cfont_t:
+      return Cvt_cfont_t;
+      break;
+    default:
+      return CvtNull;
+      break;
+  }
 }
diff -ur rott-1.0.orig/rott/byteordr.h rott-1.0/rott/byteordr.h
--- rott-1.0.orig/rott/byteordr.h	2008-04-10 14:45:19.000000000 +0200
+++ rott-1.0/rott/byteordr.h	2008-04-10 14:50:59.000000000 +0200
@@ -38,6 +38,6 @@
 DECLARE_CONVERTER(transpatch_t);
 DECLARE_CONVERTER(cfont_t);
 void CvtNull(void *lmp, int num);
-void CvtFixme(void *lmp, int num);
+converter_t CvtForType(int type);
 
 #endif
diff -ur rott-1.0.orig/rott/cin_efct.c rott-1.0/rott/cin_efct.c
--- rott-1.0.orig/rott/cin_efct.c	2008-04-10 14:45:20.000000000 +0200
+++ rott-1.0/rott/cin_efct.c	2008-04-10 14:47:56.000000000 +0200
@@ -331,7 +331,7 @@
 {
    if (flic->usefile==false)
       {
-      W_CacheLumpName(flic->name,PU_CACHE, CvtFixme, 1);
+      W_CacheLumpName(flic->name,PU_CACHE, CvtNull, 1);
       }
 }
 
@@ -513,7 +513,7 @@
 */
 void PrecacheBack ( backevent * back )
 {
-   W_CacheLumpName( back->name, PU_CACHE, CvtFixme, 1);
+   W_CacheLumpName( back->name, PU_CACHE, CvtNull, 1);
 }
 
 
@@ -616,7 +616,7 @@
 {
    byte * pal;
 
-   pal=W_CacheLumpName(event->name,PU_CACHE, CvtFixme, 1);
+   pal=W_CacheLumpName(event->name,PU_CACHE, CvtNull, 1);
    XFlipPage ();
    CinematicSetPalette (pal);
 }
@@ -631,7 +631,7 @@
 
 void PrecachePalette (paletteevent * event)
 {
-   W_CacheLumpName(event->name,PU_CACHE, CvtFixme, 1);
+   W_CacheLumpName(event->name,PU_CACHE, CvtNull, 1);
 }
 
 
diff -ur rott-1.0.orig/rott/fx_man.c rott-1.0/rott/fx_man.c
--- rott-1.0.orig/rott/fx_man.c	2008-04-10 14:45:19.000000000 +0200
+++ rott-1.0/rott/fx_man.c	2008-04-10 15:32:00.000000000 +0200
@@ -141,6 +141,7 @@
 //  go to the file that is specified in that variable. Otherwise, they
 //  are ignored for the expense of the function call. If DUKESND_DEBUG is
 //  set to "-" (without the quotes), then the output goes to stdout.
+static void snddebug(const char *fmt, ...) __attribute__((format(printf,1,2)));
 static void snddebug(const char *fmt, ...)
 {
     va_list ap;
@@ -159,6 +160,7 @@
 
 // FIXME: Consolidate this code.
 // Same as snddebug(), but a different tag is put on each line.
+static void musdebug(const char *fmt, ...) __attribute__((format(printf,1,2)));
 static void musdebug(const char *fmt, ...)
 {
     va_list ap;
@@ -298,22 +300,6 @@
     snddebug("Error message set to [%s].", errorMessage);
 } // setErrorMessage
 
-
-int FX_GetBlasterSettings(fx_blaster_config *blaster)
-{
-    setErrorMessage("No SoundBlaster cards available.");
-    return(FX_Error);
-} // FX_GetBlasterSettings
-
-
-int FX_SetupSoundBlaster(fx_blaster_config blaster, int *MaxVoices,
-                         int *MaxSampleBits, int *MaxChannels)
-{
-    setErrorMessage("No SoundBlaster cards available.");
-    return(FX_Error);
-} // FX_SetupSoundBlaster
-
-
 int FX_SetupCard( int SoundCard, fx_device *device )
 {
     init_debugging();
diff -ur rott-1.0.orig/rott/fx_man.h rott-1.0/rott/fx_man.h
--- rott-1.0.orig/rott/fx_man.h	2002-12-23 09:54:18.000000000 +0100
+++ rott-1.0/rott/fx_man.h	2008-04-10 15:32:00.000000000 +0200
@@ -1,3 +1,4 @@
+
 /*
 Copyright (C) 1994-1995 Apogee Software, Ltd.
 
@@ -43,17 +44,6 @@
 #define MonoFx   1
 #define StereoFx 2
 
-typedef struct
-   {
-   unsigned long Address;
-   unsigned long Type;
-   unsigned long Interrupt;
-   unsigned long Dma8;
-   unsigned long Dma16;
-   unsigned long Midi;
-   unsigned long Emu;
-   } fx_blaster_config;
-
 enum FX_ERRORS
    {
    FX_Warning = -2,
@@ -67,6 +57,7 @@
    FX_DPMI_Error
    };
 
+#ifdef DOS
 enum fx_BLASTER_Types
    {
    fx_SB     = 1,
@@ -75,12 +66,11 @@
    fx_SBPro2 = 4,
    fx_SB16   = 6
    };
+#endif
 
 
 char *FX_ErrorString( int ErrorNumber );
 int   FX_SetupCard( int SoundCard, fx_device *device );
-int   FX_GetBlasterSettings( fx_blaster_config *blaster );
-int   FX_SetupSoundBlaster( fx_blaster_config blaster, int *MaxVoices, int *MaxSampleBits, int *MaxChannels );
 int   FX_Init( int SoundCard, int numvoices, int numchannels, int samplebits, unsigned mixrate );
 int   FX_Shutdown( void );
 int   FX_SetCallBack( void ( *function )( unsigned long ) );
diff -ur rott-1.0.orig/rott/myprint.h rott-1.0/rott/myprint.h
--- rott-1.0.orig/rott/myprint.h	2002-12-24 06:16:26.000000000 +0100
+++ rott-1.0/rott/myprint.h	2008-04-10 15:24:37.000000000 +0200
@@ -38,6 +38,6 @@
 int  printstring( char *string );
 int  printnum( int number );
 int  printunsigned( unsigned long number, int radix );
-int  myprintf( char *fmt, ... );
+int  myprintf( char *fmt, ... ) __attribute__((format(printf,1,2)));
[...2651 lines suppressed...]
       }
 
    close(handle);
-#endif
 
    if ( SOUNDSETUP )
       {
       getch();
       }
 
+#endif
+
    #if USE_SDL
    SDL_Quit();
    #endif
diff -ur rott-1.0.orig/rott/rt_util.h rott-1.0/rott/rt_util.h
--- rott-1.0.orig/rott/rt_util.h	2008-04-10 14:45:19.000000000 +0200
+++ rott-1.0/rott/rt_util.h	2008-04-10 15:24:37.000000000 +0200
@@ -44,7 +44,7 @@
 void  GetPalette(char * pal);
 void  ClearGraphicsScreen( void );
 void  ClearBuffer( char * buf, int size );
-void  Error (char *error, ...);
+void  Error (char *error, ...) __attribute__((noreturn,format(printf,1,2)));
 void  StartupSoftError ( void );
 void  ShutdownSoftError ( void );
 int   CheckParm (char *check);
@@ -88,7 +88,7 @@
 void  VL_GetPalette (byte *palette);
 void  UL_printf (byte *str);
 void  VL_NormalizePalette (byte *palette);
-void  MapDebug (char *error, ...);
+void  MapDebug (char *error, ...) __attribute__((format(printf,1,2)));
 void  OpenMapDebug ( void );
 void  UL_ColorBox (int x, int y, int w, int h, int color);
 
@@ -149,11 +149,11 @@
 
 #if (SOFTERROR==1)
 
-void  SoftwareError (char *error, ...);
+void  SoftwareError (char *error, ...) __attribute__((format(printf,1,2)));
 #define SoftError  SoftwareError
 
 #else
-void  SoftwareError (char *error, ...);
+void  SoftwareError (char *error, ...) __attribute__((format(printf,1,2)));
 //#define SoftError  SoftwareError
 
 #define SoftError  if (1) {} else SoftwareError
@@ -164,12 +164,12 @@
 
 #if (DEBUG==1)
 
-void  DebugError (char *error, ...);
+void  DebugError (char *error, ...) __attribute__((format(printf,1,2)));
 #define Debug  DebugError
 
 #else
 
-void  DebugError (char *error, ...);
+void  DebugError (char *error, ...) __attribute__((format(printf,1,2)));
 #define Debug  DebugError
 //#define Debug
 
diff -ur rott-1.0.orig/rott/rt_view.c rott-1.0/rott/rt_view.c
--- rott-1.0.orig/rott/rt_view.c	2008-04-10 14:45:19.000000000 +0200
+++ rott-1.0/rott/rt_view.c	2008-04-10 15:24:37.000000000 +0200
@@ -248,7 +248,7 @@
 
 //Hey, isn't this stuff already loaded in?
 //Why don't we make this a lump?
-   table=W_CacheLumpName("tables",PU_STATIC, CvtFixme, 1);
+   table=W_CacheLumpName("tables",PU_STATIC, CvtNull, 1);
    ptr=table;
 
 //
@@ -271,7 +271,7 @@
       pixelangle[centerx+i] =(short) -intang;
       frac+=(length*65536/centerx);
       }
-   table=W_CacheLumpName("tables",PU_CACHE, CvtFixme, 1);
+   table=W_CacheLumpName("tables",PU_CACHE, CvtNull, 1);
    SafeFree(pangle);
 }
 
@@ -580,7 +580,7 @@
 	if (((word)MAPSPOT(2,0,1)>=104) && ((word)MAPSPOT(2,0,1)<=105))
 		fog=(word)MAPSPOT(2,0,1)-104;
 	else
-		Error ("There is no Fog icon on map %ld\n",gamestate.mapon);
+		Error ("There is no Fog icon on map %d\n",gamestate.mapon);
 	if ((word)MAPSPOT(3,0,1)==139)
       {
       if (fog==0)
@@ -590,14 +590,14 @@
          memset (lights,0,MAPSIZE*MAPSIZE*(sizeof(unsigned long)));
          }
       else
-		   Error("You cannot use light sourcing on a level with fog on map %ld\n",gamestate.mapon);
+		   Error("You cannot use light sourcing on a level with fog on map %d\n",gamestate.mapon);
       }
 	else if ((word)MAPSPOT(3,0,1))
-		Error("You must use the lightsource icon or nothing at all at (3,0) in plane 1 on map %ld\n",gamestate.mapon);
+		Error("You must use the lightsource icon or nothing at all at (3,0) in plane 1 on map %d\n",gamestate.mapon);
    if (((word)MAPSPOT(2,0,0)>=LIGHTLEVELBASE) && ((word)MAPSPOT(2,0,0)<=LIGHTLEVELEND))
       glevel=(MAPSPOT(2,0,0)-LIGHTLEVELBASE);
 	else
-		Error("You must specify a valid darkness level icon at (2,0) on map %ld\n",gamestate.mapon);
+		Error("You must specify a valid darkness level icon at (2,0) on map %d\n",gamestate.mapon);
 
    SetLightLevels ( glevel );
 
diff -ur rott-1.0.orig/rott/sndcards.h rott-1.0/rott/sndcards.h
--- rott-1.0.orig/rott/sndcards.h	2002-12-20 21:15:28.000000000 +0100
+++ rott-1.0/rott/sndcards.h	2008-04-10 15:32:01.000000000 +0200
@@ -38,6 +38,7 @@
    {
 //   ASS_NoSound,
    SoundBlaster,
+#ifdef DOS
    ProAudioSpectrum,
    SoundMan16,
    Adlib,
@@ -45,11 +46,14 @@
    SoundCanvas,
    Awe32,
    WaveBlaster,
+#endif
    SoundScape,
    UltraSound,
+#ifdef DOS
    SoundSource,
    TandySoundSource,
    PC,
+#endif
    NumSoundCards
    } soundcardnames;
 
diff -ur rott-1.0.orig/rott/w_wad.c rott-1.0/rott/w_wad.c
--- rott-1.0.orig/rott/w_wad.c	2008-04-10 14:45:20.000000000 +0200
+++ rott-1.0/rott/w_wad.c	2008-04-10 15:32:01.000000000 +0200
@@ -242,7 +242,7 @@
 //
         lumpcache = calloc (numlumps, sizeof(*lumpcache));
         if (!lumpcache)
-           Error("W_InitFiles: lumpcache malloc failed size=%ld\n",numlumps<<2);
+           Error("W_InitFiles: lumpcache malloc failed size=%d\n",numlumps<<2);
 
         if (!quiet)
            printf("W_Wad: Wad Manager Started NUMLUMPS=%ld\n",(long int)numlumps);
@@ -250,7 +250,9 @@
         lumpcheck=SafeMalloc(numlumps);
         memset(lumpcheck,255,numlumps);
 #endif
+#ifdef DOS
         if (!SOUNDSETUP)
+#endif
            W_CheckWADIntegrity ();
 }
 
@@ -495,7 +497,7 @@
 #else
                 Z_Malloc (W_LumpLength (lump), tag, &lumpcache[lump]);
                 W_ReadLump (lump, lumpcache[lump]);
-                Debug("Invoking endian converter on %p, %i records\n", lump, numrec);
+                Debug("Invoking endian converter on %p, %i records\n", lumpcache[lump], numrec);
                 converter(lumpcache[lump], numrec);
 #endif
         }
diff -ur rott-1.0.orig/rott/z_zone.c rott-1.0/rott/z_zone.c
--- rott-1.0.orig/rott/z_zone.c	2008-04-10 14:45:19.000000000 +0200
+++ rott-1.0/rott/z_zone.c	2008-04-10 15:24:37.000000000 +0200
@@ -122,7 +122,7 @@
 
         header = malloc (size+sizeof(memzone_t));
         if (!header)
-                Error ("Z_AllocateZone: Couldn't malloc %i bytes avail=%ld\n",
+                Error ("Z_AllocateZone: Couldn't malloc %zd bytes avail=%d\n",
                 size+sizeof(memzone_t), Z_AvailHeap());
         header->size = size;
         Z_ClearZone (header);
@@ -542,7 +542,7 @@
                         SoftError("ERROR: two consecutive free blocks\n");
 		}
         }
-        SoftError("Total Size of blocks = %ld\n",totalsize);
+        SoftError("Total Size of blocks = %d\n",totalsize);
 
         SoftError("LEVEL ZONE\n");
         SoftError("zone size: %i  location: %p\n",levelzone->size,levelzone);
@@ -571,7 +571,7 @@
                         SoftError("ERROR: two consecutive free blocks\n");
 		}
         }
-        SoftError("Total Size of blocks = %ld\n",totalsize);
+        SoftError("Total Size of blocks = %d\n",totalsize);
 
 }
 


--- NEW FILE rott.6 ---
.TH ROTT 6 "2006-05-01" "1.0" "Rise of the Triad"

.SH NAME
rott \- Rise of the Triad

.SH SYNOPSIS
.B rott
.RI [ options ]

.SH DESCRIPTION
.B ROTT
is a port of Apogee's 3D action title Rise of the Triad, originally released in 1994.
This port duplicates the functionality of the original game on modern operating systems, including Linux, Win32, and OSX.

.SH OPTIONS
.TP
.BR spaceball
Enable check for Spaceball.
.TP
.BR nojoys
Disable check for joystick.
.TP
.BR nomouse
Disable check for mouse.
.TP
.BR cyberman
Enable check for Cyberman.
.TP
.BR assassin
Enable check for Wingman Assassin.
.TP
.BR ver
Version number.
.TP
.BR fullscreen
Enable Full Screen video mode.
.TP
.BR mapstats
Dump Map statistics to ERROR.
.TP
.BR tilestats
Dump Tile statistics to ERROR.
.TP
.BR mono
Enable mono-monitor support.
.TP
.BR screenshots
Clean screen capture for shots.
.TP
.BR pause
Pauses startup screen information.
.TP
.BR enablevr
Enable VR helmet input devices.
.TP
.BR noecho
Turn off sound reverb.
.TP
.BR demoexit
Exit program when demo is terminated.
.TP
.BR warp\  \fIlevel\fP
Warp to specific ROTT level (next paramater is level to start on).
.TP
.BR timelimit\  \fItime\fP
Play ROTT in time limit mode (next paramater is time in seconds).
.TP
.BR maxtimelimit\  \fItime\fP
Maximimum time to count down from (next paramater is time in seconds).
.TP
.BR dopefish
?

.SH AUTHORS
ROTT was created and published as shareware by Apogee Software, Ltd. and was published commercially by FormGen, Inc.
.PP
The primary contributors to this port are: Steven Fuller, Ryan Gordon, John Hall and Dan Olson.
.PP
This manual page was written by Fabian Greffrath <fabian at debian-unofficial.org>
for the Debian Unofficial project (but may be used by others).

rott-1.0-64bit.patch:

Index: rott-1.0-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/rott-1.0-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- rott-1.0-64bit.patch	18 May 2007 15:30:06 -0000	1.1
+++ rott-1.0-64bit.patch	10 Apr 2008 14:40:05 -0000	1.2
@@ -271,11 +271,13 @@
 diff -ur rott-1.0.orig/rott/rt_def.h rott-1.0/rott/rt_def.h
 --- rott-1.0.orig/rott/rt_def.h	2007-05-06 22:30:08.000000000 +0200
 +++ rott-1.0/rott/rt_def.h	2007-05-06 22:03:17.000000000 +0200
-@@ -300,7 +300,7 @@
+@@ -300,8 +300,8 @@
+ 
  typedef unsigned char           byte;
  typedef unsigned short int      word;
- typedef unsigned long           longword;
+-typedef unsigned long           longword;
 -typedef long fixed;
++typedef unsigned int            longword;
 +typedef int fixed;
  
  
@@ -909,3 +911,37 @@
  	int     episode;
  	int     battlemode;
  	int     battleoption;
+diff -ur rott-1.0.orig/rott/_rt_ted.h rott-1.0/rott/_rt_ted.h
+--- rott-1.0.orig/rott/_rt_ted.h	2002-12-20 21:15:28.000000000 +0100
++++ rott-1.0/rott/_rt_ted.h	2008-04-10 15:00:12.000000000 +0200
+@@ -43,14 +44,14 @@
+ typedef struct
+ {
+         short   RLEWtag;
+-        long            headeroffsets[100];
++        int             headeroffsets[100];
+         byte            tileinfo[1];
+ } mapfiletype;
+ 
+ 
+ typedef struct
+ {
+-		  long            planestart[3];
++        int   planestart[3];
+         word  planelength[3];
+         word  width,height;
+         char            name[16];
+diff -ur rott-1.0.orig/rott/fli_type.h rott-1.0/rott/fli_type.h
+--- rott-1.0.orig/rott/fli_type.h	2002-12-20 21:15:27.000000000 +0100
++++ rott-1.0/rott/fli_type.h	2008-04-10 15:04:58.000000000 +0200
+@@ -32,8 +32,8 @@
+ typedef unsigned char Uchar;	/* Unsigned 8 bits. */
+ typedef short Short;			/* Signed 16 bits please. */
+ typedef unsigned short Ushort;	/* Unsigned 16 bits please. */
+-typedef long Long;				/* Signed 32 bits. */
+-typedef unsigned long Ulong;	/* Unsigned 32 bits. */
++typedef int Long;				/* Signed 32 bits. */
++typedef unsigned int Ulong;	/* Unsigned 32 bits. */
+ 
+ typedef int Boolean;			/* TRUE or FALSE value. */
+ typedef int ErrCode;			/* ErrXXX or Success. */


Index: rott.spec
===================================================================
RCS file: /cvs/extras/rpms/rott/devel/rott.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- rott.spec	19 Feb 2008 09:35:32 -0000	1.4
+++ rott.spec	10 Apr 2008 14:40:05 -0000	1.5
@@ -1,6 +1,6 @@
 Name:           rott
 Version:        1.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Rise of the Triad
 Group:          Amusements/Games
 License:        GPLv2+
@@ -15,6 +15,7 @@
 # free datafiles. I believe this constitues fair-use. If anyone disagrees let
 # me know and I'll remove it
 Source6:        rott.png
+Source7:        rott.6
 Patch0:         rott-1.0-cvs-fixes.patch
 Patch1:         rott-1.0-compile.patch
 Patch2:         rott-1.0-fixes.patch
@@ -22,6 +23,7 @@
 Patch4:         rott-1.0-winrott.patch
 Patch5:         rott-1.0-winrott-fixes.patch
 Patch6:         rott-1.0-more-fixes.patch
+Patch7:         rott-1.0-debian.patch
 # Note: this gets applied during build, not during prep!
 Patch99:        rott-1.0-registered.patch 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -75,6 +77,18 @@
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+
+iconv -f iso-8859-1 -t utf-8 readme.txt > readme.tmp
+touch -r readme.txt readme.tmp
+mv readme.tmp readme.txt
+
+cp -a %{SOURCE7} rott-shareware.6
+cp -a %{SOURCE7} rott-registered.6
+sed -i.orig 's/rott/rott-shareware/g' rott-shareware.6
+sed -i.orig 's/rott/rott-registered/g' rott-registered.6
+touch -r rott-shareware.6.orig rott-shareware.6
+touch -r rott-registered.6.orig rott-registered.6
 
 
 %build
@@ -94,10 +108,13 @@
 #no make install target, DIY
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man6
 install -m 755 rott/rott-* $RPM_BUILD_ROOT%{_bindir}
 install -p -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/%{name}-shareware
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}-registered
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -p -m 644 %{name}-shareware.6 $RPM_BUILD_ROOT%{_mandir}/man6
+install -p -m 644 %{name}-registered.6 $RPM_BUILD_ROOT%{_mandir}/man6
 
 # below is the desktop file and icon stuff.
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
@@ -146,6 +163,7 @@
 %defattr(-,root,root,-)
 %doc README gpl.txt readme.txt
 %{_bindir}/rott-shareware*
+%{_mandir}/man6/%{name}-shareware.6*
 %{_datadir}/%{name}
 %{_datadir}/applications/fedora-%{name}-shareware.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
@@ -155,12 +173,15 @@
 %defattr(-,root,root,-)
 %doc README gpl.txt readme.txt
 %{_bindir}/rott-registered*
-%{_datadir}/%{name}
+%{_mandir}/man6/%{name}-registered.6*
 %{_datadir}/applications/fedora-%{name}-registered.desktop
 %{_datadir}/icons/hicolor/64x64/apps/%{name}.png
 
 
 %changelog
+* Thu Apr 10 2008 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0-6
+- Many fixes (and a manpage) ported over from debian
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.0-5
 - Autorebuild for GCC 4.3
 




More information about the fedora-extras-commits mailing list