- updated to 1.0c18

Changed files:
    BitchX.spec -> 1.42

diff --git a/BitchX.spec b/BitchX.spec
index 004d35413d8eede86b572a4ef068b7897295b6b6..673fa691b47742805570eb3a64aed20faeb4795a 100644 (file)
--- a/BitchX.spec
+++ b/BitchX.spec
@@ -1,25 +1,24 @@
 Summary:       Improved color IRC client with built-in scripts
 Summary(pl):   Ulepszony, kolorowy klient IRC z wbudowanymi skryptami
 Name:          BitchX
-Version:       1.0c17
-Release:       8
+Version:       1.0c18
+Release:       1
 License:       GPL
 Group:         Applications/Networking
 Group(de):     Applikationen/Netzwerkwesen
 Group(pl):     Aplikacje/Sieciowe
-Source0:       ftp://ftp.bitchx.com/pub/BitchX/source/%{name}-%{version}.tar.gz
-Source1:       %{name}-config.h
-Source2:       ircII.servers
-Source3:       %{name}.desktop
-Source4:       %{name}-bxglobal.script
-Patch0:                %{name}-configure.patch
-Patch1:                %{name}-pld.patch
-Patch2:                %{name}-plugindir.patch
+Source0:       ftp://ftp.bitchx.com/pub/BitchX/source/ircii-pana-%{version}.tar.gz
+Source1:       ircII.servers
+Source2:       %{name}.desktop
+Source3:       %{name}-bxglobal.script
+Patch0:                %{name}-config.h.patch
 Icon:          BitchX.xpm
 URL:           http://www.bitchx.com/
 BuildRequires: ncurses-devel >= 5.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _datadir %{_libdir}
+
 %description 
 BitchX is a popular ANSI color ircII client by panasync. It
 incorporates various features that would normally require a script.
@@ -31,56 +30,41 @@ kolorowy i przejrzysty ni
 
 %prep
 %setup -q -n %{name}
-find . -type d -name 'CVS'| xargs rm -rf
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
-cp -f %{SOURCE1} include/config.h
-
-autoconf
-
-CFLAGS="%{rpmcflags} -D_GNU_SOURCE -w -I%{_includedir}/ncurses"
-%configure \
+CFLAGS="%{rpmcflags} -I%{_includedir}/ncurses"
+%configure2_13 \
        --enable-ipv6 \
-       --with-plugins=abot,acro,aim,amp,arcfour,blowfish,cavlink,cdrom,encrypt,fserv,hint,mail,nap,nicklist,possum,qbx,qmail,wavplay \
-       --with-plugindir=%{_libdir}/BitchX
+       --with-plugins=all
 
-%{__make} INSTALL_WSERV=%{_bindir}/wserv-bx
+%{__make} \
+       IRCLIB="%{_libdir}/%{name}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_prefix}/X11R6/share/pixmaps,%{_libdir}/BitchX,%{_applnkdir}/Network/Communications,%{_sysconfdir}/irc,%{_datadir}/BitchX/{script,translation,help},%{_mandir}/man1}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_applnkdir}/Network/Communications,%{_sysconfdir}/irc,%{_mandir}/man1,%{_libdir}/%{name}/{script,translation,help,plugins}}
 
 install source/{BitchX,scr-bx} \
                        $RPM_BUILD_ROOT%{_bindir}
+install dll/*/*.so     $RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
 install source/wserv \
-                       $RPM_BUILD_ROOT%{_bindir}/wserv-bx
-
-install doc/BitchX.png $RPM_BUILD_ROOT%{_prefix}/X11R6/share/pixmaps
-
-install BitchX.{ircnames,quit,reasons,help} \
-                       $RPM_BUILD_ROOT%{_datadir}/BitchX
+                       $RPM_BUILD_ROOT%{_libdir}/%{name}
 
-install script/{bxtcl.tcl,example-.bitchxrc,file.tcl,fserve+vfs.tar.gz,menu.bx,query.bx} \
-                       $RPM_BUILD_ROOT%{_datadir}/BitchX/script
+install script/*       $RPM_BUILD_ROOT%{_libdir}/%{name}/script
+install translation/*  $RPM_BUILD_ROOT%{_libdir}/%{name}/translation
+cp -pfr bitchx-docs/*  $RPM_BUILD_ROOT%{_libdir}/%{name}/help
 
-install %{SOURCE2}     $RPM_BUILD_ROOT%{_sysconfdir}/irc/ircII.servers
-install %{SOURCE3}     $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications/BitchX.desktop
-install %{SOURCE4}     $RPM_BUILD_ROOT%{_datadir}/BitchX/script/bxglobal
-
-install translation/*  $RPM_BUILD_ROOT%{_datadir}/BitchX/translation
-
-cp -pr bitchx-docs/[1-9]* bitchx-docs/{commands,functions,out,README_FIRST} \
-                       $RPM_BUILD_ROOT%{_datadir}/BitchX/help
-
-install dll/*.so       $RPM_BUILD_ROOT%{_libdir}/BitchX
+install doc/BitchX.png $RPM_BUILD_ROOT%{_pixmapsdir}
 
 install doc/BitchX.1   $RPM_BUILD_ROOT%{_mandir}/man1
 
+install %{SOURCE1}     $RPM_BUILD_ROOT%{_sysconfdir}/irc/ircII.servers
+install %{SOURCE2}     $RPM_BUILD_ROOT%{_applnkdir}/Network/Communications/BitchX.desktop
+install %{SOURCE3}     $RPM_BUILD_ROOT%{_datadir}/%{name}/script/bxglobal
+
 gzip -9nf doc/BitchX{-format,-idea,.bot,.doc,.faq,.tcl} IPv6-support
 
 %clean
@@ -90,9 +74,8 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc doc/*.gz *.gz 
 %attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/BitchX
 %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/irc/*
-%{_datadir}/BitchX
+%{_libdir}/BitchX
 %{_applnkdir}/Network/Communications/*
-%{_prefix}/X11R6/share/pixmaps/*
+%{_pixmapsdir}/*
 %{_mandir}/man1/*