commit fortune

22 May 2006

Hello community,

here is the log from the commit of package fortune
checked in at Tue May 23 01:07:39 CEST 2006.

--------

--- fortune/fortune.changes	2006-01-25 21:35:59.000000000 +0100
+++ fortune/fortune.changes	2006-05-22 17:49:54.000000000 +0200
@@ -1,0 +2,6 @@
+Mon May 22 17:49:40 CEST 2006 - schwab@suse.de
+
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
+
+-------------------------------------------------------------------

New:
----
  fortune-decl.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ fortune.spec ++++++
--- /var/tmp/diff_new_pack.ZDDL5S/_old	2006-05-23 01:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZDDL5S/_new	2006-05-23 01:07:23.000000000 +0200
@@ -1,11 +1,11 @@
 #
 # spec file for package fortune (Version 1.0)
 #
-# Copyright (c) 2004 SUSE LINUX AG, Nuernberg, Germany.
+# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
-# Please submit bugfixes or comments via http://www.suse.de/feedback/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
@@ -15,12 +15,13 @@
 Group:        Amusements/Toys/Other
 Autoreqprov:  on
 Version:      1.0
-Release:      858
-Summary:      Talk big.
+Release:        872
+Summary:        Random Saying
 Source:       ftp://ftp.jurix.org/pub/jurix/source/games/fortune.tar.bz2
 Patch:        fortune.dif
 Patch1:       fortune-ia64.patch
 Patch2:       %{name}-%{version}-filepermissions.patch
+Patch3:         fortune-decl.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -41,13 +42,12 @@
 %patch
 %patch1
 %patch2
+%patch3
 
 %build
 make all
 
 %install
-rm -rf "$RPM_BUILD_ROOT"
-mkdir "$RPM_BUILD_ROOT"
 mkdir -p "$RPM_BUILD_ROOT"/usr/bin "$RPM_BUILD_ROOT"/usr/sbin
 mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man8
 make prefix="$RPM_BUILD_ROOT" install
@@ -55,7 +55,6 @@
 %clean
 rm -rf "$RPM_BUILD_ROOT"
  
-
 %files
 %defattr(-,root,root)
 %doc README Notes
@@ -67,6 +66,9 @@
 /usr/share/fortune
 
 %changelog -n fortune
+* Mon May 22 2006 - schwab@suse.de
+- Use RPM_OPT_FLAGS.
+- Don't strip binaries.
 * Wed Jan 25 2006 - mls@suse.de
 - converted neededforbuild to BuildRequires
 * Fri May 07 2004 - hmacht@suse.de

++++++ fortune-decl.patch ++++++
--- fortune/fortune.c
+++ fortune/fortune.c
@@ -61,6 +61,8 @@
 # include	<ctype.h>
 # include	<stdlib.h>
 # include	<string.h>
+# include	<time.h>
+# include	<netinet/in.h>
 #if !(defined __GLIBC__ && __GLIBC__ >= 2)
 # include	<rx.h>
 #endif
--- strfile/strfile.c
+++ strfile/strfile.c
@@ -56,6 +56,8 @@
 # include	<ctype.h>
 # include	<stdlib.h>
 # include	<string.h>
+# include	<unistd.h>
+# include	<netinet/in.h>
 # include	"strfile.h"
 
 # ifndef MAXPATHLEN
@@ -135,6 +137,11 @@
 
 STR	*Firstch;			/* first chars of each string */
 
+void getargs(int, char **);
+void add_offset(FILE *, off_t);
+void do_order(void);
+void randomize(void);
+void usage(void);
 
 /*
  * main:
@@ -145,6 +152,7 @@
  *	CHUNKSIZE blocks; if the latter, we just write each pointer,
  *	and then seek back to the beginning to write in the table.
  */
+int
 main(ac, av)
 int	ac;
 char	**av;
@@ -230,7 +238,7 @@
 		if (Num_pts == 2)
 			puts("There was 1 string");
 		else
-			printf("There were %d strings\n", Num_pts - 1);
+			printf("There were %ld strings\n", Num_pts - 1);
 		printf("Longest string: %lu byte%s\n", Tbl.str_longlen,
 		       Tbl.str_longlen == 1 ? "" : "s");
 		printf("Shortest string: %lu byte%s\n", Tbl.str_shortlen,
@@ -256,6 +264,7 @@
 /*
  *	This routine evaluates arguments from the command line
  */
+void
 getargs(argc, argv)
 int	argc;
 char	**argv;
@@ -309,6 +318,7 @@
 	}
 }
 
+void
 usage()
 {
 	(void) fprintf(stderr,
@@ -320,6 +330,7 @@
  * add_offset:
  *	Add an offset to the list, or write it out, as appropriate.
  */
+void
 add_offset(fp, off)
 FILE	*fp;
 off_t	off;
@@ -340,6 +351,7 @@
  * do_order:
  *	Order the strings alphabetically (possibly ignoring case).
  */
+void
 do_order()
 {
 	register int	i;
@@ -385,6 +397,7 @@
 	return buf;
 }
 
+int
 cmp_str(p1, p2)
 STR	*p1, *p2;
 {
@@ -436,6 +449,7 @@
  *	not to randomize across delimiter boundaries.  All
  *	randomization is done within each block.
  */
+void
 randomize()
 {
 	register int	cnt, i;
--- unstr/unstr.c
+++ unstr/unstr.c
@@ -65,6 +65,7 @@
 # include	<stdio.h>
 # include	<stdlib.h>
 # include	<ctype.h>
+# include	<netinet/in.h>
 
 # ifndef MAXPATHLEN
 # define	MAXPATHLEN	1024
@@ -78,7 +79,11 @@
 
 char	*strcat(), *strcpy();
 
+void getargs(char **);
+void order_unstr(STRFILE *);
+
 /* ARGSUSED */
+int
 main(ac, av)
 int	ac;
 char	**av;
@@ -111,6 +116,7 @@
 	exit(0);
 }
 
+void
 getargs(av)
 register char	*av[];
 {
@@ -123,6 +129,7 @@
 	(void) strcat(Datafile, ".dat");
 }
 
+void
 order_unstr(tbl)
 register STRFILE	*tbl;
 {
++++++ fortune.dif ++++++
--- /var/tmp/diff_new_pack.ZDDL5S/_old	2006-05-23 01:07:23.000000000 +0200
+++ /var/tmp/diff_new_pack.ZDDL5S/_new	2006-05-23 01:07:23.000000000 +0200
@@ -1,8 +1,8 @@
 --- Makefile
-+++ Makefile	2001/01/31 15:20:15
++++ Makefile
 @@ -0,0 +1,12 @@
 +SUBDIRS=strfile unstr fortune datfiles
-+flags="O=-O2 -fomit-frame-pointer -pipe" LDFLAGS=-s
++flags="O=$(RPM_OPT_FLAGS)" LDFLAGS=
 +
 +all:
 +	for i in ${SUBDIRS}; do make -C $$i ${flags}; done
@@ -14,7 +14,7 @@
 +	for i in ${SUBDIRS}; do make clean -C $$i ${flags}; done
 +
 --- datfiles/Makefile
-+++ datfiles/Makefile	2001/01/31 15:20:15
++++ datfiles/Makefile
 @@ -0,0 +1,37 @@
 +SRCS=	fortunes fortunes2 linuxcookie osfortune startrek zippy
 +BLDS=	fortunes.dat fortunes2.dat startrek.dat zippy.dat \
@@ -54,7 +54,7 @@
 +	rm -f ${BLDS}
 +
 --- datfiles/linuxcookie
-+++ datfiles/linuxcookie	2001/01/31 15:20:15
++++ datfiles/linuxcookie
 @@ -0,0 +1,499 @@
 +A Linux machine! because a 486 is a terrible thing to waste!
 +(By jjs@wintermute.ucr.edu, Joe Sloan)
@@ -556,7 +556,7 @@
 +(Linus Torvalds to Andrew Tanenbaum)
 +%
 --- datfiles/osfortune
-+++ datfiles/osfortune	2001/01/31 15:20:15
++++ datfiles/osfortune
 @@ -0,0 +1,192 @@
 +%
 +"It is a relief and a joy when I see a regiment of hackers digging in
@@ -751,7 +751,7 @@
 +%
 +
 --- fortune/Makefile
-+++ fortune/Makefile	2001/01/31 15:20:15
++++ fortune/Makefile
 @@ -0,0 +1,12 @@
 +CFLAGS=$(O) -I../strfile
 +
@@ -766,7 +766,7 @@
 +	rm -f fortune.o fortune
 +
 --- fortune/fortune.6
-+++ fortune/fortune.6	2001/01/31 15:20:15
++++ fortune/fortune.6
 @@ -167,7 +167,7 @@
  .Ed
  .Sh FILES
@@ -777,7 +777,7 @@
  .Sh SEE ALSO
  .Xr regex 3 ,
 --- fortune/fortune.c
-+++ fortune/fortune.c	2001/01/31 15:20:15
++++ fortune/fortune.c
 @@ -61,6 +61,9 @@
  # include	<ctype.h>
  # include	<stdlib.h>
@@ -802,7 +802,7 @@
  			fp->num_children++;
  		else
 --- fortune/pathnames.h
-+++ fortune/pathnames.h	2001/01/31 15:20:15
++++ fortune/pathnames.h
 @@ -35,4 +35,4 @@
   *	@(#)pathnames.h	8.1 (Berkeley) 5/31/93
   */
@@ -810,7 +810,7 @@
 -#define	FORTDIR		"/usr/share/games/fortune"
 +#define	FORTDIR		"/usr/share/fortune"
 --- strfile/Makefile
-+++ strfile/Makefile	2001/01/31 15:20:15
++++ strfile/Makefile
 @@ -0,0 +1,11 @@
 +CFLAGS= $(O)
 +
@@ -824,7 +824,7 @@
 +	rm -f strfile.o strfile
 +
 --- strfile/strfile.c
-+++ strfile/strfile.c	2001/01/31 15:20:15
++++ strfile/strfile.c
 @@ -50,7 +50,7 @@
  #endif
  #endif /* not lint */
@@ -835,7 +835,7 @@
  # include	<stdio.h>
  # include	<ctype.h>
 --- unstr/Makefile
-+++ unstr/Makefile	2001/01/31 15:20:15
++++ unstr/Makefile
 @@ -0,0 +1,10 @@
 +CFLAGS=$(O) -I../strfile
 +
@@ -848,7 +848,7 @@
 +	rm -f unstr.o unstr
 +
 --- unstr/unstr.c
-+++ unstr/unstr.c	2001/01/31 15:20:15
++++ unstr/unstr.c
 @@ -59,7 +59,7 @@
   *	Ken Arnold		Aug 13, 1978
   */


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

    

root＠suse.de

tags

participants (1)