- ANSI C++ violation patch

- Imakefile patch
- use RPM_OPT_FLAGS
- release 8

Changed files:
    xbill.spec -> 1.9

diff --git a/xbill.spec b/xbill.spec
index ae932655ee97f7f83f65a24ca450f76d21ce07b2..fcddfd5ae029788e083785b756045e3b3e12d9c6 100644 (file)
--- a/xbill.spec
+++ b/xbill.spec
@@ -1,13 +1,17 @@
 Summary:       Stop Bill from loading his OS into all the computers
 Name:          xbill
 Version:       2.0
-Release:       7
+Release:       8
 Copyright:     MIT
-Group:         X11/Games
-Group(pl):     X11/Gry
+Group:         X11/Applications/Games
+Group(de):     X11/Applikationen/Spiele
+Group(pl):     X11/Aplikacje/Gry
 Source0:       ftp://ftp.x.org/contrib/games/%{name}-%{version}.tgz
-Patch0:                xbill-2.0-rh.patch
+Patch0:                %{name}-c++.patch
+Patch1:                %{name}-imake.patch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+BuildRequires: XFree86-devel
+BuildRequires: libstdc++-devel
 
 %define                _prefix         /usr/X11R6
 %define                _mandir         %{_prefix}/man
@@ -20,11 +24,13 @@ option as the Linux Age progresses, and it is very popular at Red Hat.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
 xmkmf
-%{__make}
+%{__make} \
+       CXXDEBUGFLAGS="%{?debug:-g -O}%{!?debug:$RPM_OPT_FLAGS} -fno-rtti -fno-exceptions -fno-implicit-templates"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -35,7 +41,7 @@ rm -rf $RPM_BUILD_ROOT
   install -d .%{_libdir}/xbill
   for i in bitmaps pixmaps
   do
-    mv ./var/lib/games/xbill/$i .%{_libdir}/xbill/$i
+    mv -f ./var/lib/games/xbill/$i .%{_libdir}/xbill/$i
     ln -s ../../../..%{_libdir}/xbill/$i ./var/lib/games/xbill/$i
   done
 
@@ -48,15 +54,19 @@ xbill exec "xbill &"
 EOF
 )
 
+gzip -9nf README README.Ports ChangeLog
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%attr(2755,root,games) %{_prefix}/X11R6/bin/xbill
+%attr(2755,root,games) %{_prefix}/bin/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
 %{_libdir}/xbill
 %config %{_sysconfdir}/X11/wmconfig/xbill
+%{_mandir}/man1/*
+%doc *.gz