From: kloczek <kloczek@pld-linux.org>
Date: Sat, 6 Jan 2001 02:24:32 +0000 (+0000)
Subject: - release 14 (for allow upgrade from RH version),
X-Git-Tag: xbill-2_0-14
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxbill.git;a=commitdiff_plain;h=d8062014369066a2868a04278c24dcceeaa5bdb5

- release 14 (for allow upgrade from RH version),
- replace wmconfig file by .dessktop,
- added package icon.

Changed files:
    xbill.spec -> 1.11
---

diff --git a/xbill.spec b/xbill.spec
index f37922d..5d90a2f 100644
--- a/xbill.spec
+++ b/xbill.spec
@@ -1,17 +1,20 @@
 Summary:	Stop Bill from loading his OS into all the computers
 Name:		xbill
 Version:	2.0
-Release:	8
-Copyright:	MIT
+Release:	14
+License:	MIT
 Group:		X11/Applications/Games
 Group(de):	X11/Aplikacje/Spiele
 Group(pl):	X11/Aplikacje/Gry
 Source0:	ftp://ftp.x.org/contrib/games/%{name}-%{version}.tgz
+Source1:	%{name}.desktop
+Source2:	%{name}.png
 Patch0:		%{name}-c++.patch
 Patch1:		%{name}-imake.patch
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Icon:		xbill.xpm
 BuildRequires:	XFree86-devel
 BuildRequires:	libstdc++-devel
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
 %define		_mandir		%{_prefix}/man
@@ -30,10 +33,12 @@ option as the Linux Age progresses, and it is very popular at Red Hat.
 %build
 xmkmf
 %{__make} \
-	CXXDEBUGFLAGS="%{?debug:-g -O}%{!?debug:$RPM_OPT_FLAGS} -fno-rtti -fno-exceptions -fno-implicit-templates"
+	CXXDEBUGFLAGS="%{?debug:-g -O}%{!?debug:$RPM_OPT_FLAGS} \
+	-fno-rtti -fno-exceptions -fno-implicit-templates"
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{%{_applnkdir}/Games,%{_pixmapsdir}}
 
 %{__make} DESTDIR=$RPM_BUILD_ROOT install install.man
 
@@ -41,19 +46,14 @@ rm -rf $RPM_BUILD_ROOT
   install -d .%{_libdir}/xbill
   for i in bitmaps pixmaps
   do
-    mv -f ./var/lib/games/xbill/$i .%{_libdir}/xbill/$i
-    ln -s ../../../..%{_libdir}/xbill/$i ./var/lib/games/xbill/$i
+	mv -f ./var/lib/games/xbill/$i .%{_libdir}/xbill/$i
+	ln -s ../../../..%{_libdir}/xbill/$i ./var/lib/games/xbill/$i
   done
-
-install -d .%{_sysconfdir}/X11/wmconfig
-cat > .%{_sysconfdir}/X11/wmconfig/xbill <<EOF
-xbill name "xbill"
-xbill description "Save the world"
-xbill group Games/Video
-xbill exec "xbill &"
-EOF
 )
 
+install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Games
+install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+
 gzip -9nf README README.Ports ChangeLog
 
 %clean
@@ -61,12 +61,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %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
+%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
-%{_libdir}/xbill
-%config %{_sysconfdir}/X11/wmconfig/xbill
 %{_mandir}/man1/*
-%doc *.gz
+%{_libdir}/xbill
+%{_applnkdir}/Games/xbill.desktop
+%{_pixmapsdir}/*