rpms/fortune-mod/FC-3 fortune-mod-1.99-move-offensive.patch, NONE, 1.1 fortune-mod-1.99-remove-offensive-option.patch, NONE, 1.1 fortune-mod-cflags.patch, NONE, 1.1 fortune-mod-offense.patch, 1.1, 1.2 fortune-mod.spec, 1.5, 1.6 sources, 1.3, 1.4 .cvsignore, 1.3, 1.4

[Jeff Sheltren (sheltren)]

Author: sheltren

Update of /cvs/extras/rpms/fortune-mod/FC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32440

Modified Files:
	fortune-mod-offense.patch fortune-mod.spec sources .cvsignore 
Added Files:
	fortune-mod-1.99-move-offensive.patch 
	fortune-mod-1.99-remove-offensive-option.patch 
	fortune-mod-cflags.patch 
Log Message:
update to version 1.99.1 - and a few spec file changes

fortune-mod-1.99-move-offensive.patch:

--- NEW FILE fortune-mod-1.99-move-offensive.patch ---
--- datfiles/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/riddles.pc	2005-03-14 06:09:08.290062640 -0800
@@ -419,9 +419,6 @@
 Q:	What's a light-year?
 A:	One-third less calories than a regular year.
 %
-Q:	What's a WASP's idea of open-mindedness?
-A:	Dating a Canadian.
-%
 Q:	What's buried in Grant's tomb?
 A:	A corpse.
 %
--- datfiles/off/unrotated/riddles	2004-03-05 05:29:56.000000000 -0800
+++ datfiles/off/unrotated/riddles.new	2005-03-14 06:11:01.351874632 -0800
@@ -1098,3 +1098,6 @@
 Why is it that there are so many more horses' asses than there are horses?
 		-- G. Gordon Liddy
 %
+Q:     What's a WASP's idea of open-mindedness?
+A:     Dating a Canadian.
+%

fortune-mod-1.99-remove-offensive-option.patch:

--- NEW FILE fortune-mod-1.99-remove-offensive-option.patch ---
--- fortune/fortune.c	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune.c.nooff	2005-03-13 08:47:12.815509344 -0800
@@ -275,7 +275,7 @@
 #ifndef	NO_REGEX
     (void) fprintf(stderr, "i");
 #endif /* NO_REGEX */
-    (void) fprintf(stderr, "losw]");
+    (void) fprintf(stderr, "lsw]");
 #ifndef	NO_REGEX
     (void) fprintf(stderr, " [-m pattern]");
 #endif /* NO_REGEX */
@@ -1013,9 +1013,9 @@
     ignore_case = FALSE;
 
 #ifdef DEBUG
-    while ((ch = getopt(argc, argv, "acDefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acDefilm:n:svw")) != EOF)
 #else
-    while ((ch = getopt(argc, argv, "acefilm:n:osvw")) != EOF)
+    while ((ch = getopt(argc, argv, "acefilm:n:svw")) != EOF)
 #endif /* DEBUG */
 	switch (ch)
 	  {
@@ -1040,9 +1040,6 @@
 	  case 'n':
 	      SLEN = atoi(optarg);
 	      break;
-	  case 'o':		/* offensive ones only */
-	      Offend++;
-	      break;
 	  case 's':		/* short ones only */
 	      Short_only++;
 	      Long_only = FALSE;
--- fortune/fortune-man.part1	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part1.nooff	2005-03-13 09:00:47.344682088 -0800
@@ -50,7 +50,7 @@
 .SH NAME
 fortune \- print a random, hopefully interesting, adage
 .SH SYNOPSIS
-.BR fortune " [" -acefilosw "] [" -n 
+.BR fortune " [" -acefilsw "] [" -n 
 .IR length "] ["
 .B -m 
 .IR pattern "] [[" n% "] " file/dir/all ]
@@ -58,15 +58,12 @@
 When
 .B fortune
 is run with no arguments it prints out a random epigram. Epigrams are
-divided into several categories, where each category is sub-divided
-into those which are potentially offensive and those which are not.
+divided into several categories.
 .SS Options
 The options are as follows:
 .TP
 .B -a
-Choose from all lists of maxims, both offensive and not.  (See the
-.B -o 
-option for more information on offensive fortunes.)
+Choose from all lists of maxims.
 .TP
 .B -c
 Show the cookie file from which the fortune came.
@@ -114,29 +111,6 @@
 ask for short fortunes, or too long and ask for long ones, fortune goes
 into a never-ending thrash loop.
 .TP
-.B -o
-Choose only from potentially offensive aphorisms.  The -o option is
-ignored if a fortune directory is specified.
-.sp
-.B Please, please, please request a potentially
-.B offensive fortune if and only if
-.B you believe, deep in your heart,
-.B that you are willing to be
-.B offended. (And that you'll just quit
-.BR using " -o " rather
-.B than give us grief about it,
-.B okay?)
-.sp
-.RS
-\&... let us keep in mind the basic governing philosophy of The
-Brotherhood, as handsomely summarized in these words: we believe in
-healthy, hearty laughter -- at the expense of the whole human race, if
-needs be.  Needs be.
-.RS
---H. Allen Smith, "Rude Jokes"
-.RE
-.RE
-.TP
 .B -s
 Short apothegms only.  See
 .B -n
@@ -207,30 +181,6 @@
 .RI "50% " funny " 50% " not-funny
 .sp
 .RE
-This fortune also supports the BSD method of appending ``-o'' to
-database names to specify offensive fortunes.  However this is
-.B not
-how fortune stores them: offensive fortunes are stored in a seperate
-directory without the ``-o'' infix.  A plain name (i.e., not a path to a
-file or directory) that ends in ``-o'' will be assumed to be an
-offensive database, and will have its suffix stripped off and be
-searched in the offensive directory (even if the neither of the
-.IR -a " or " -o
-options were specified).  This feature is not only for
-backwards-compatibility, but also to allow users to distinguish between
-inoffensive and offensive databases of the same name.
-.PP
-For example, assuming there is a database named
-.I definitions
-in both the inoffensive and potentially offensive collections, then the
-following command will select an inoffensive definition 90% of the time,
-and a potentially offensive definition for the remaining 10%:
-.RS
-.sp
-.B fortune
-90%
-.I definitions definitions-o
-.RE
 .SH FILES
 Note: these are the defaults as defined at compile time.
 .PP
--- fortune/fortune-man.part2	2004-03-05 05:29:56.000000000 -0800
+++ fortune/fortune-man.part2.nooff	2005-03-13 09:13:40.985070872 -0800
@@ -8,16 +8,6 @@
 .B fortune
 no longer finds the pointers file, it ignores the text file.
 .SH BUGS
-The division of fortunes into offensive and non-offensive by directory,
-rather than via the `-o' file infix, is not 100% compatible with
-original BSD fortune. Although the `-o' infix is recognised as referring
-to an offensive database, the offensive database files still need to be
-in a separate directory.  The workaround, of course, is to move the `-o'
-files into the offensive directory (with or without renaming), and to
-use the
-.B -a
-option.
-.PP
 The supplied fortune databases have been attacked, in order to correct
 orthographical and grammatical errors, and particularly to reduce
 redundancy and repetition and redundancy.  But especially to avoid
@@ -26,13 +16,7 @@
 .PP
 The fortune databases are now divided into a larger number of smaller
 files, some organized by format (poetry, definitions), and some by
-content (religion, politics).  There are parallel files in the main
-directory and in the offensive files directory (e.g., fortunes/definitions and
-fortunes/off/definitions).  Not all the potentially offensive fortunes are in
-the offensive fortunes files, nor are all the fortunes in the offensive
-files potentially offensive, probably, though a strong attempt has been
-made to achieve greater consistency.  Also, a better division might be
-made.
+content (religion, politics).
 .SH HISTORY
 This version of fortune is based on the NetBSD fortune 1.4, but with a
 number of bug fixes and enhancements.

fortune-mod-cflags.patch:

--- NEW FILE fortune-mod-cflags.patch ---
--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
+++ fortune-mod-1.99.1/Makefile.cflags	2005-03-13 08:34:26.910944536 -0800
@@ -65,8 +65,8 @@
 RECODELIBS=-lrecode
 
 DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\"" -DLOCFORTDIR="\"$(LOCALDIR)\"" -DLOCOFFDIR="\"$(LOCALODIR)\""
-CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe -fsigned-char
-LDFLAGS=-s
+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
+LDFLAGS=
 
 # The above flags are used by default; the debug flags are used when make
 # is called with a debug target, such as 'make debug'

fortune-mod-offense.patch:

Index: fortune-mod-offense.patch
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod-offense.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fortune-mod-offense.patch	8 Nov 2004 04:20:02 -0000	1.1
+++ fortune-mod-offense.patch	17 Mar 2005 23:31:36 -0000	1.2
@@ -1,32 +1,7 @@
---- fortune-mod-9708/Makefile.mike	Thu Aug 28 15:36:15 1997
-+++ fortune-mod-9708/Makefile	Tue Jun  6 17:57:18 2000
-@@ -3,27 +3,27 @@
- #
- 
- # Where does the fortune program go?
--FORTDIR=/usr/local/games
-+FORTDIR=/usr/games
- # Where do the data files (fortunes, or cookies) go?
--COOKIEDIR=/usr/local/share/games/fortunes
-+COOKIEDIR=/usr/share/games/fortunes
- # Offensive ones?
- OCOOKIEDIR=$(COOKIEDIR)/off
- # The ones with html tags?
- WCOOKIEDIR=$(COOKIEDIR)/html
- # Where do strfile and unstr go?
--BINDIR=/usr/local/bin
-+BINDIR=/usr/sbin
- # What is the proper mode for strfile and unstr? 755= everyone, 700= root only
- BINMODE=0755
- #BINMODE=0700
- # Where do the man pages for strfile and unstr go?
--BINMANDIR=/usr/local/man/man1
-+BINMANDIR=/usr/man/man1
- # What is their proper extension?
- BINMANEXT=1
- # And the same for the fortune man page
--FORTMANDIR=/usr/local/man/man6
-+FORTMANDIR=/usr/man/man6
+--- fortune-mod-1.99.1/Makefile	2004-03-05 05:29:56.000000000 -0800
++++ fortune-mod-1.99.1/Makefile.nooff	2005-03-13 09:08:19.087006816 -0800
+@@ -29,7 +29,7 @@
+ FORTMANDIR=$(prefix)/usr/share/man/man6
  FORTMANEXT=6
  # Do we want to install the offensive files? (0 no, 1 yes)
 -OFFENSIVE=1
@@ -34,14 +9,15 @@
  # Do we want to install files with html tags? (0 no, 1 yes)
  # (Note: These files are not yet available)
  WEB=0
-@@ -55,8 +55,8 @@
- REGEXLIBS=
- 
- DEFINES=-DFORTDIR="\"$(COOKIEDIR)\"" -DOFFDIR="\"$(OCOOKIEDIR)\""
--CFLAGS=-O2 $(DEFINES) -Wall -fomit-frame-pointer -pipe
--LDFLAGS=-s
-+CFLAGS=$(RPM_OPT_FLAGS) $(DEFINES)
-+LDFLAGS=
+@@ -156,10 +156,7 @@
+ 	@echo -n "Building fortune/fortune.man ... "
+ 	@cat fortune/fortune-man.part1 >fortune/fortune.man
+ 	@echo ".I $(COOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for innoffensive fortunes." >>fortune/fortune.man
+-	@echo ".TP" >>fortune/fortune.man
+-	@echo ".I $(OCOOKIEDIR)" >>fortune/fortune.man
+-	@echo "Directory for offensive fortunes." >>fortune/fortune.man
++	@echo "Directory for fortunes." >>fortune/fortune.man
+ 	@cat fortune/fortune-man.part2 >>fortune/fortune.man
+ 	@echo done.
  
- # The above flags are used by default; the debug flags are used when make
- # is called with a debug target, such as 'make debug'


Index: fortune-mod.spec
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/fortune-mod.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fortune-mod.spec	14 Nov 2004 16:23:47 -0000	1.5
+++ fortune-mod.spec	17 Mar 2005 23:31:36 -0000	1.6
@@ -1,14 +1,14 @@
 %define DisableOffensiveFortunes 1
 %define CookieDir %{_prefix}/games/fortune
 
-Summary: A program which will display a fortune.
-Name:		fortune-mod
-Version:	1.0
-Release:	25
-URL:		http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.README
+Summary: A program which will display a fortune
+Name: fortune-mod
+Version: 1.99.1
+Release: 2
+URL: http://www.redellipse.net/code/fortune
 License: BSD
 Group: Amusements/Games
-Source: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.tar.gz
+Source: http://www.redellipse.net/code/downloads/fortune-mod-1.99.1.tar.gz
 Source1: kernelnewbies-fortunes.tar.gz
 Source2: bofh-excuses.tar.bz2
 Source3: http://www.aboleo.net/software/misc/fortune-tao.tar.gz
@@ -16,9 +16,11 @@
 Source5: http://www.dibona.com/opensources/osfortune.tar.gz
 Source6: http://humorix.org/downloads/humorixfortunes-1.4.tar.gz
 Patch0: fortune-mod-offense.patch
-Patch1: fortune-mod-1.0-remove-offensive.patch
-Patch2: fortune-mod-1.0-remove-offensive-option.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Patch1: fortune-mod-1.99-remove-offensive-option.patch
+Patch2: fortune-mod-cflags.patch
+Patch3: fortune-mod-1.99-move-offensive.patch
+BuildRequires: recode-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 %description
 Fortune-mod contains the ever-popular fortune program, which will
@@ -27,14 +29,19 @@
 wisdom each time they log in.
 
 %prep
-%setup -q -n fortune-mod-9708
+%setup -q
 
+# disable offensive fortunes completely
 %if %{DisableOffensiveFortunes}
 %patch0 -p1 -b .disable-offensive1
-%patch1 -p0 -b .disable-offensive2
-%patch2 -p0 -b .remove-offensive-option
+%patch1 -p0 -b .remove-offensive-option
 %endif
 
+# use CFLAGS from rpmbuld
+%patch2 -p1 -b .cflags
+# move possibly offensive fortunes into the offensive directory
+%patch3 -p0 -b .move-offensive
+
 %build
 make COOKIEDIR=%{CookieDir} \
 	FORTDIR=%{_bindir} BINDIR=%{_sbindir}
@@ -45,6 +52,7 @@
 make    COOKIEDIR=%{CookieDir} fortune/fortune.man
 make	FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \
 	COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \
+	LOCALDIR=$RPM_BUILD_ROOT%{CookieDir} \
 	BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \
 	BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \
 	FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \
@@ -52,13 +60,14 @@
 
 tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir}
 %if %{DisableOffensiveFortunes}
-rm $RPM_BUILD_ROOT%{CookieDir}/men-women*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/men-women*
 %endif
 
-# Using bzcat for portability because tar keeps randomly changing the switch
-# for bzip.  It was "y" at one point, then "I", and now it is "j".  God knows
-# WTF they'll change it too next.
+# this isn't debian
+rm -f $RPM_BUILD_ROOT%{CookieDir}/debian*
+rm -f $RPM_BUILD_ROOT%{CookieDir}/off/debian*
 
+# Using bzcat for portability because tar keeps changing the switch
 bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
 
 # Non-standard source files, need to move things around
@@ -88,7 +97,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %doc README ChangeLog TODO
 %{_bindir}/fortune
 %{_sbindir}/strfile
@@ -97,6 +106,15 @@
 %{_mandir}/man*/*
 
 %changelog
+* Mon Mar 14 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-2
+- Add patch for moving fortunes into offensive directory
+
+* Sun Mar 13 2005 Jeff Sheltren <sheltren at cs.ucsb.edu> 1.99.1-1
+- Update to newer source (see URL)
+- Update patches as necessary, separate cflags patch as it was only applied if applying offensive patches
+- New source has recode-devel buildreq
+- Remove debian fortunes which are included in new source
+
 * Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-25
 - Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279.
 - Use %%CookieDir everywhere.


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	8 Nov 2004 04:20:06 -0000	1.3
+++ sources	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+f208805b3b712e32997d7667e0ec52d8  fortune-mod-1.99.1.tar.gz
 50ea110b4a9dd719a410045700760401  bofh-excuses.tar.bz2
 dc2860793725fce93445035b4aa8c812  fortune-hitchhiker.tgz
-81a87a44f9d94b0809dfc2b7b140a379  fortune-mod-9708.tar.gz
 9dd679fee3a8fff17daaf6563fd2cd8f  fortune-tao.tar.gz
 a0f5eb298aa5982aa54571f6e46aa58b  humorixfortunes-1.4.tar.gz
 73d25d1b7cfb9f82376e61fa3d8e58f2  kernelnewbies-fortunes.tar.gz


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/fortune-mod/FC-3/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	8 Nov 2004 04:20:06 -0000	1.3
+++ .cvsignore	17 Mar 2005 23:31:36 -0000	1.4
@@ -1,6 +1,6 @@
+fortune-mod-1.99.1.tar.gz
 bofh-excuses.tar.bz2
 fortune-hitchhiker.tgz
-fortune-mod-9708.tar.gz
 fortune-tao.tar.gz
 humorixfortunes-1.4.tar.gz
 kernelnewbies-fortunes.tar.gz