- spec adapterized,

- added package icon, desktop file and menu icon,
- removed antiroot patch,
- removed some files from %doc,
- added --enable-ipv6 to ./configure parameters,
- fixed passing LDFLAGS to ./configure enviroment (stripping in %install is
  not neccessary now).

Changed files:
    BitchX.spec -> 1.19

diff --git a/BitchX.spec b/BitchX.spec
index 329b6e9defed18885c72546f7a59b2ecce834458..84191dfa521599867b8dee667530a7b57981adf7 100644 (file)
--- a/BitchX.spec
+++ b/BitchX.spec
@@ -3,84 +3,86 @@ Summary(pl):  Ulepszony, kolorowy klient IRC z wbudowanymi skryptami
 Name:          BitchX
 Version:       1.0c15
 Release:       2       
+License:       GPL
+Group:         Applications/Networking
+Group(pl):     Aplikacje/Sieciowe
 Source0:       ftp://ftp.bitchx.com/pub/BitchX/source/%{name}-%{version}.tar.gz
 Source1:       BitchX-config.h
 Source2:       ircII.servers
-Copyright:     GPL
-Group:         Applications/Networking
-Group(pl):     Aplikacje/Sieciowe
-Patch0:                %{name}-configure.patch
-Patch1:                %{name}-pld.patch
-Patch2:         %{name}-antiroot.patch
+Source3:       BitchX.desktop
+Patch0:                BitchX-configure.patch
+Patch1:                BitchX-pld.patch
+Icon:          BitchX.xpm
 URL:           http://www.bitchx.com/
+BuildRequires: ncurses-devel >= 5.0
 BuildRoot:     /tmp/%{name}-%{version}-root
+
+%define                _applnkdir      /usr/X11R6/share/applnk
  
 %description 
-BitchX is a popular ANSI color ircII client by panasync. It
-incorporates various features that would normally require a
-script. It's interface is more colorful and cleaner than ircII.
+BitchX is a popular ANSI color ircII client by panasync. It incorporates
+various features that would normally require a script. It's interface is
+more colorful and cleaner than ircII.
 
 %description -l pl 
-BitchX jest popularnym klientem ircII. Jego interfejs jest bardziej 
+BitchX jest popularnym klientem ircII. Jego interfejs jest bardziej
 kolorowy i przejrzysty ni¿ interfejs standardowego kilienta ircII.
 
 %prep
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 cp -f %{SOURCE1} include/config.h
 
 autoconf
 
-CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -w -I/usr/include/ncurses" LDFLAGS="-s" \
-%configure
+CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE -w -I%{_includedir}/ncurses" LDFLAGS="-s"
+export CFLAGS LDFLAGS
+%configure \
+       --enable-ipv6
 
 make all 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/usr/{bin,share/BitchX/{script,translation,help}}
-install -d $RPM_BUILD_ROOT/{%{_mandir}/man1,etc/irc}
-
-strip source/BitchX
-strip source/wserv
-strip source/scr-bx
+install -d $RPM_BUILD_ROOT%{_datadir}/BitchX/{script,translation,help} \
+       $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1,/etc/irc} \
+       $RPM_BUILD_ROOT{%{_applnkdir}/Networking/IRC,/usr/X11R6/share/pixmaps}
 
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/irc
-install doc/BitchX.1.gz $RPM_BUILD_ROOT%{_mandir}/man1
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/irc
+gzip -d doc/BitchX.1.gz
+install doc/BitchX.1 $RPM_BUILD_ROOT%{_mandir}/man1
+rm -f doc/{bitchx.1.gz,BitchX{.1,-macros.tar.gz}}
 
 install source/BitchX $RPM_BUILD_ROOT%{_bindir}
 install source/wserv $RPM_BUILD_ROOT%{_bindir}/wserv-bx
 install source/scr-bx $RPM_BUILD_ROOT%{_bindir}
-#install install-bitchx $RPM_BUILD_ROOT%{_bindir}
 
 install BitchX.help $RPM_BUILD_ROOT%{_datadir}/BitchX
 
+install %{SOURCE3} $RPM_BUILD_ROOT%{_applnkdir}/Networking/IRC
+install doc/BitchX.png $RPM_BUILD_ROOT/usr/X11R6/share/pixmaps
+
 cp -a bitchx-docs/* $RPM_BUILD_ROOT%{_datadir}/BitchX/help
 cp -a translation $RPM_BUILD_ROOT%{_datadir}/BitchX
 rm -rf $RPM_BUILD_ROOT%{_datadir}/BitchX/help/CVS
 
-gzip -9nf  doc/* BitchX.quit BitchX.reasons || :
-#\
-       #$RPM_BUILD_ROOT%{_mandir}/man1/* || :
-
-#changes
+gzip -9nf doc/{functions,README.hooks,BitchX{-format,.faq,.doc,.bot}} \
+       BitchX.quit BitchX.reasons \
+       $RPM_BUILD_ROOT%{_mandir}/man1/*
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(644,root,root,755) 
-#changes.gz
-%doc doc/* BitchX* 
-
+%defattr(644,root,root,755)
+%doc doc/*.gz BitchX* 
 %attr(755,root,root) %{_bindir}/*
-
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/irc/*
 %{_datadir}/BitchX
-
-#%config(noreplace) %verify(not md5 size mtime) /etc/irc/*
-#%{_mandir}/man1/*
+%{_applnkdir}/Networking/IRC/*
+/usr/X11R6/share/pixmaps/*
+%{_mandir}/man1/*