- adapterized, typos, PLDified %%prep,%%build,%%install

Changed files:
    tf.spec -> 1.3

diff --git a/tf.spec b/tf.spec
index 8be64c7b0f8ece77779a50850f90160194818533..7554cd58ae217599105800a3a335a2a228d9159f 100644 (file)
--- a/tf.spec
+++ b/tf.spec
@@ -1,30 +1,32 @@
 Summary:       tf - TinyFugue - MUD client
 Summary:       tf - TinyFugue - MUD client

-Summary(pl):   tf - TinyFugue - tekstowy klient do MUDow
+Summary(pl):   tf - TinyFugue - tekstowy klient do MUD-ów

 Name:          tf
 Version:       40s1
 Release:       1
 License:       GPL
 Name:          tf
 Version:       40s1
 Release:       1
 License:       GPL

-Group:         Aplications/games
-Group(pl):     Aplikacje/gry
+Group:         Applications/Games
+Group(de):     Applikationen/Spiele
+Group(pl):     Aplikacje/Gry

 Vendor:                Ken Keys (Hawkeye) <hawkeye@tf.tcp.com>
 URL:           http://tf.tcp.com/~hawkeye/tf/  
 Vendor:                Ken Keys (Hawkeye) <hawkeye@tf.tcp.com>
 URL:           http://tf.tcp.com/~hawkeye/tf/  

-Source0:       ftp://tf.tcp.com/pub/tinyfugue/%{name}-%{version}.tar.gz 
+Source0:       ftp://tf.tcp.com/pub/tinyfugue/%{name}-%{version}.tar.gz

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/bin
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/bin
 
 %description

-TinyFugue is a MUD-Client (Multi User Dungeons) that allows the user to dive 
-into one the most fascinating 
-Multi-User-Non-Graphic-Fantasy-Role-Playing-Games.
-Just Enter "tf" and enjoy your game. 
+TinyFugue is a MUD-Client (Multi User Dungeons) that allows the user
+to dive into one the most fascinating
+Multi-User-Non-Graphic-Fantasy-Role-Playing-Games. Just Enter "tf" and
+enjoy your game.
+

 %description -l pl
 %description -l pl

-Po prostu jeden z najlepszych , jesli nie najlepszy klient do gry w MUDy.
-Oczywiscie dla trybu tekstowego :) .
-%prep
+Po prostu jeden z najlepszych, je¶li nie najlepszy klient do gry w
+MUD-y. Oczywi¶cie dla trybu tekstowego :).

 
 

-%setup -n %name-%version
-mv unix/Config unix/Config.orig
+%prep
+%setup -q
+mv -f unix/Config unix/Config.orig

 cat << EOF >> unix/Config
 TF="\${T_BIN}/tf-\${TFVER}"
 LIBDIR="\${T_SHARE}/tf-\${TFVER}"
 cat << EOF >> unix/Config
 TF="\${T_BIN}/tf-\${TFVER}"
 LIBDIR="\${T_SHARE}/tf-\${TFVER}"


@@ -34,66 +36,45 @@ MANPAGE="/usr/man/man1/tf.1"
 CCFLAGS="$RPM_OPT_FLAGS"
 EOF
 cat unix/Config.orig >> unix/Config  
 CCFLAGS="$RPM_OPT_FLAGS"
 EOF
 cat unix/Config.orig >> unix/Config  

-export T_BIN="/usr/bin"
-export T_SHARE="/usr/share"
+

 %build
 %build

-export T_BIN="/usr/bin"
-export T_SHARE="/usr/share"
+T_BIN="%{_bindir}"
+T_SHARE="%{_datadir}"
+export T_BIN T_SHARE

 ans=y sh unixmake files
 
 %install
 ans=y sh unixmake files
 
 %install

-if [ -d $RPM_BUILD_ROOT ]; then 
- rm -rf $RPM_BUILD_ROOT
-fi
-mkdir $RPM_BUILD_ROOT
-mkdir $RPM_BUILD_ROOT/usr
-mkdir $RPM_BUILD_ROOT/usr/bin
-mkdir $RPM_BUILD_ROOT/usr/share
-mkdir $RPM_BUILD_ROOT/usr/share/%name-%version 
-export T_BIN="$RPM_BUILD_ROOT/usr/bin"
-export T_SHARE="$RPM_BUILD_ROOT/usr/share"
-cp $RPM_BUILD_DIR/%name-%version/src/tf  $RPM_BUILD_ROOT/usr/bin/%name-%version
-cp $RPM_BUILD_DIR/%name-%version/tf-lib/*  $RPM_BUILD_ROOT/usr/share/%name-%version/
-gzip -9nf CHANGES COPYING CREDITS README
-cd $RPM_BUILD_ROOT/usr/bin/
-ln -s %name-%version %name
-cd $RPM_BUILD_ROOT/usr/share/%name-%version
-ln -s kb-bash.tf bind-bash.tf
-ln -s kd-emacs.tf bind-emacs.tf
-ln -s complete.tf completion.tf
-ln -s factoral.tf factorial.tf
-ln -s filexfer.tf file-xfer.tf
-ln -s local.eg.tf local.tf.sample
-ln -s psh.tf pref-shell.tf
-ln -s spc-page.tf space_page.tf
-ln -s spedwalk.tf speedwalk.tf
-ln -s stack-q.tf stack-queue.tf
-ln -s world-q.tf worldqueue.tf
+rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_bindir},%{datadir}/%{name}-%{version}}
+install src/tf  $RPM_BUILD_ROOT%{_bindir}/%{name}-%{version}
+install tf-lib/*  $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+
+(cd $RPM_BUILD_ROOT%{_bindir}
+ln -sf %{name}-%{version} %{name}
+)
+(cd $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
+ln -sf kb-bash.tf bind-bash.tf
+ln -sf kd-emacs.tf bind-emacs.tf
+ln -sf complete.tf completion.tf
+ln -sf factoral.tf factorial.tf
+ln -sf filexfer.tf file-xfer.tf
+ln -sf local.eg.tf local.tf.sample
+ln -sf psh.tf pref-shell.tf
+ln -sf spc-page.tf space_page.tf
+ln -sf spedwalk.tf speedwalk.tf
+ln -sf stack-q.tf stack-queue.tf
+ln -sf world-q.tf worldqueue.tf
+)
+
+gzip -9nf CHANGES CREDITS README
+

 %clean
 %clean

+rm -rf $RPM_BUILD_ROOT

 sh unixmake clean
 
 %files
 %defattr(644,root,root,755)
 sh unixmake clean
 
 %files
 %defattr(644,root,root,755)

-%attr(755,root,root) /usr/bin/%name-%version
-%attr(755,root,root) /usr/bin/%name
-/usr/share/%name-%version
+%attr(755,root,root) %{_bindir}/%{name}-%{version}
+%attr(755,root,root) %{_bindir}/%{name}
+%{_datadir}/%{name}-%{version}

 %doc *.gz
 %doc *.gz

-
-%changelog                                                                      
-* %{date} PLD Team <pld-list@pld.org.pl>                                        
-All persons listed below can be reached at <cvs_login>@pld.org.pl
-
-$Log: tf.spec,v $
-Revision 1.2  2001-10-17 07:30:46  qwark
-hopefully  this is the end of trouble with install script (some workaround)
-
-Revision 1.2  2001/10/17 09:30:43  qwark
-
-Revision 1.1  2001/10/16 21:50:43  qwark
-it's itial relase after some troubles with tf install script
- Added Files:
-       tf.spec
-
-Revision 1.0  2001/10/17 23:50:53  qwark                                        
-- initial release        
-Based on spec written for RH