Changeset from: mschwendt
Update of /cvs/extras/rpms/fortune-mod/FC-2 In directory cvs.fedora.redhat.com:/tmp/cvs-serv21307
Modified Files: fortune-mod.spec Log Message: Sync with fedora.us update bug 2279
Index: fortune-mod.spec =================================================================== RCS file: /cvs/extras/rpms/fortune-mod/FC-2/fortune-mod.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- fortune-mod.spec 8 Nov 2004 04:20:17 -0000 1.4 +++ fortune-mod.spec 27 Nov 2004 15:53:22 -0000 1.5 @@ -4,7 +4,7 @@ Summary: A program which will display a fortune. Name: fortune-mod Version: 1.0 -Release: 24.fdr.4.2 +Release: 24.fdr.5.2 Epoch: 0 URL: http://www.ibiblio.org/pub/Linux/games/amusements/fortune/fortune-mod-9708.R... License: BSD @@ -37,30 +37,30 @@ %endif
%build -make COOKIEDIR=%{_prefix}/games/fortune \ +make COOKIEDIR=%{CookieDir} \ FORTDIR=%{_bindir} BINDIR=%{_sbindir}
%install rm -rf $RPM_BUILD_ROOT
-make COOKIEDIR=%{_prefix}/games/fortune fortune/fortune.man +make COOKIEDIR=%{CookieDir} fortune/fortune.man make FORTDIR=$RPM_BUILD_ROOT/%{_bindir} \ - COOKIEDIR=$RPM_BUILD_ROOT%{_prefix}/games/fortune \ + COOKIEDIR=$RPM_BUILD_ROOT%{CookieDir} \ BINDIR=$RPM_BUILD_ROOT/%{_sbindir} \ BINMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man1 \ FORTMANDIR=$RPM_BUILD_ROOT/%{_mandir}/man6 \ install
-tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{_prefix}/games/fortune/ +tar zxvf %{SOURCE1} -C $RPM_BUILD_ROOT%{CookieDir} %if %{DisableOffensiveFortunes} -rm $RPM_BUILD_ROOT%{_prefix}/games/fortune/men-women* +rm $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.
-bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{_prefix}/games/fortune/ +bzcat %{SOURCE2} | tar xvf - -C $RPM_BUILD_ROOT%{CookieDir}
# Non-standard source files, need to move things around tar zxvf %{SOURCE3} -C $RPM_BUILD_ROOT%{CookieDir}/ fortune-tao/tao* @@ -78,6 +78,13 @@ mv $RPM_BUILD_ROOT%{CookieDir}/humorixfortunes-1.4/* $RPM_BUILD_ROOT%{CookieDir}/ rmdir $RPM_BUILD_ROOT%{CookieDir}/humorixfortunes-1.4
+# Recreate random access files for the added fortune files. +for i in \ + kernelnewbies bofh-excuses tao hitchhiker \ + osfortune humorix-misc humorix-stories \ +; do util/strfile $RPM_BUILD_ROOT%{CookieDir}/$i ; done + + %clean rm -rf $RPM_BUILD_ROOT
@@ -87,10 +94,14 @@ %{_bindir}/fortune %{_sbindir}/strfile %{_sbindir}/unstr -%{_prefix}/games/fortune +%{CookieDir} %{_mandir}/man*/*
%changelog +* Sat Nov 13 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.0-24.fdr.5 +- Recreate .dat files at build-time to fix x86_64 fedora.us bug #2279. +- Use %%CookieDir everywhere. + * Sun Jun 08 2003 Michel Alexandre Salim <salimma[AT]users.sourceforge.net> 1.0-24.fdr.4 - Added Humorix fortunes - Used $RPM_BUILD_ROOT