- FHS patch: moved /var/lib/games/xbill to /var/games/xbill (acc. to FHS 2.x)

  and removed symlinks from /var
- release 16

Changed files:
    xbill-FHS.patch -> 1.1
    xbill.spec -> 1.16

diff --git a/xbill-FHS.patch b/xbill-FHS.patch
new file mode 100644 (file)
index 0000000..35cc8ea
--- /dev/null
+++ b/xbill-FHS.patch
@@ -0,0 +1,39 @@
+diff -Nur xbill-2.0.orig/Imakefile xbill-2.0/Imakefile
+--- xbill-2.0.orig/Imakefile   Wed Oct 31 21:20:20 2001
++++ xbill-2.0/Imakefile        Wed Oct 31 21:25:57 2001
+@@ -1,4 +1,5 @@
+-XBILL_DIR = /var/lib/games/xbill/
++XBILL_DIR = /usr/X11R6/lib/xbill/
++XBILL_VAR_DIR = /var/games/xbill/
+ XCOMM XBILL_DIR = $(HOME)/.xbill/
+ 
+ XCOMM Which widget set?  Motif looks slightly better; Athena is free.
+@@ -15,7 +16,7 @@
+ 
+ XCOMM You shouldn't have to change anything below this line.
+ 
+-XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\"
++XBILL_DEF = -DXBILL_HOME=\"$(XBILL_DIR)\" -DXBILL_VAR=\"$(XBILL_VAR_DIR)\"
+ 
+ INCLUDES = -I. $(XPMINC)
+ CXXDEFINES = $(XBILL_DEF) $(DEFS) $(INCS)
+@@ -136,6 +137,6 @@
+ 
+ ComplexProgramTarget($(TARGET))
+ 
+-InstallMultipleFlags(scores,$(XBILL_DIR), -m 777)
++InstallMultipleFlags(scores,$(XBILL_VAR_DIR), -m 777)
+ InstallMultiple ($(XPMS),$(XBILL_DIR)pixmaps)
+ InstallMultiple ($(XBMS),$(XBILL_DIR)bitmaps)
+diff -Nur xbill-2.0.orig/Scorelist.cc xbill-2.0/Scorelist.cc
+--- xbill-2.0.orig/Scorelist.cc        Thu Jan 23 17:22:50 1997
++++ xbill-2.0/Scorelist.cc     Wed Oct 31 21:26:12 2001
+@@ -2,7 +2,7 @@
+ 
+ FILE *Scorelist::open_file(char *mode) {
+       char file[255];
+-      sprintf (file, "%sscores", XBILL_HOME);
++      sprintf (file, "%sscores", XBILL_VAR);
+       return fopen (file, mode);
+ }
+ 

diff --git a/xbill.spec b/xbill.spec
index afd3446e59ff5c1af531e9e02027ff5f9ab5342a..003c82cb6870107ea0e324b3d7a39620315812a2 100644 (file)
--- a/xbill.spec
+++ b/xbill.spec
@@ -2,7 +2,7 @@ Summary:        Stop Bill from loading his OS into all the computers
 Summary(pl):   Powstrzymaj Billa przed instalowaniem jego systemu na wszystkich komputerach
 Name:          xbill
 Version:       2.0
-Release:       15
+Release:       16
 License:       MIT
 Group:         X11/Applications/Games
 Group(de):     X11/Applikationen/Spiele
@@ -12,6 +12,7 @@ Source1:      %{name}.desktop
 Source2:       %{name}.png
 Patch0:                %{name}-c++.patch
 Patch1:                %{name}-imake.patch
+Patch2:                %{name}-FHS.patch
 Icon:          xbill.xpm
 BuildRequires: XFree86-devel
 BuildRequires: libstdc++-devel
@@ -26,10 +27,18 @@ forms of Bill, establish new operating systems and boldly go where no
 geek has gone before. Xbill has become an increasingly attractive
 option as the Linux Age progresses, and it is very popular at Red Hat.
 
+%description -l pl
+Gra xbill sprawdza refleks przy wy³apywaniu i niszczeniu wszelkich
+form Billa, instalowaniu nowych systemów operacyjnych oraz docieraniu
+tam, gdzie nikt wcze¶niej nie dotar³. Xbill stawa³ siê ci±gle coraz
+bardziej przyci±gaj±cy w miarê postêpu Ery Linuksa, jest tak¿e bardzo
+popularny w Red Hacie.
+
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 xmkmf
@@ -42,15 +51,6 @@ install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games,%{_pixmapsdir}}
 
 %{__make} DESTDIR=$RPM_BUILD_ROOT install install.man
 
-( cd $RPM_BUILD_ROOT
-  install -d .%{_libdir}/xbill
-  for i in bitmaps pixmaps
-  do
-       mv -f ./var/lib/games/xbill/$i .%{_libdir}/xbill/$i
-       ln -sf ../../../..%{_libdir}/xbill/$i ./var/lib/games/xbill/$i
-  done
-)
-
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
@@ -63,10 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc *.gz
 %attr(2755,root,games) %{_bindir}/xbill
-%attr(775,root,games)  %dir /var/lib/games/xbill
-%attr(664,root,games)  %config /var/lib/games/xbill/scores
-/var/lib/games/xbill/bitmaps
-/var/lib/games/xbill/pixmaps
+%attr(775,root,games)  %dir /var/games/xbill
+%attr(664,root,games)  %config /var/games/xbill/scores
 %{_mandir}/man1/*
 %{_libdir}/xbill
 %{_applnkdir}/Games/xbill.desktop