--- xchat.spec.fedora	2006-11-03 15:28:05.000000000 +0200
+++ xchat.spec	2007-01-25 21:55:32.000000000 +0200
@@ -1,13 +1,9 @@
-# Enable this for Fedora Core 2 builds and newer.  For Fedora Core 1,
-# Red Hat Linux 9, and Red Hat Enterprise Linux 3, set to 0
-%define build_fc2		1
-
 %define gconf_version 2.14
 
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
-Version:   2.6.6
-Release:   8%{?dist}
+Version:   2.8.0
+Release:   1.n0i.1%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPL
@@ -19,22 +15,14 @@
 Patch10: xchat-2.4.4-redhat-desktop.patch
 Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch
 Patch19: xchat-2.0.2-freenode.patch
-Patch21: xchat-2.6.6-nonblock.patch
-Patch22: xchat-2.6.6-simplify-to-use-gnome-open-for-default-webbrowser.patch
-Patch23: xchat-2.6.6-simplify-to-use-htmlview-for-default-webbrowser.patch
 Patch33: xchat-2.4.3-im_context_filter_keypress.patch
 # filed as 1262423 in the xchat bug tracker
 Patch34: xchat-2.4.4-unrealize.patch
 
-# upstream 2.6.6 fi patch
-Patch35: xchat-2.6.6-fi.patch
-# upstream 2.6.6 es patch
-Patch36: xchat-2.6.6-es.patch
-
 BuildRequires: perl python-devel openssl-devel pkgconfig
 BuildRequires: GConf2-devel, gtkspell-devel
 BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
-BuildRequires: glib2-devel >= 2.0.3, gtk2-devel >= 2.0.3, bison >= 1.35
+BuildRequires: glib2-devel >= 2.10.0, gtk2-devel >= 2.10.0, bison >= 1.35
 BuildRequires: gettext /bin/sed
 BuildRequires: libtool
 # For gconftool-2:
@@ -55,16 +43,9 @@
 %patch10 -p1 -b .redhat-desktop-file
 %patch12 -p0 -b .use-sysconf-to-detect-cpus
 %patch19 -p0 -b .freenode
-%patch21 -p1 -b .nonblock
-%if %{build_fc2}
-%patch22 -p1 -b .simplify-to-use-gnome-open-for-default-webbrowser
-%else
-%patch23 -p1 -b .simplify-to-use-htmlview-for-default-webbrowser
-%endif
 %patch33 -p1 -b .im_context_filter_keypress
 %patch34 -p1 -b .unrealize
-%patch35 -p1 -b .fi266
-%patch36 -p1 -b .es266
+
 
 %build
 # Remove CVS files from source dirs so they're not installed into doc dirs.
@@ -79,35 +60,41 @@
            --enable-python \
 	   --disable-tcl \
            --enable-ipv6 \
-           --enable-spell=static
+           --enable-spell=static \
+           --enable-shm
 
 # gtkspell breaks Input Method commit with ENTER
-# static works if the optional exchant package is installed
+# static works if the optional enchant package is installed
 
 make %{?_smp_mflags}
 
+
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-%makeinstall
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+%{__make} install DESTDIR=$RPM_BUILD_ROOT GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 
 # Get rid of static libs
-%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/*.la
-
-# Move plugins around
-%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/xchat/plugins
-for plugin in perl.so python.so dbus.so; do
-  %{__mv} $RPM_BUILD_ROOT%{_libdir}/$plugin $RPM_BUILD_ROOT%{_libdir}/xchat/plugins/
-done
+%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/xchat/plugins/*.la
 
 %find_lang %name
 
+# do not Provide plugins .so
+%define _use_internal_dependency_generator 0
+%{__cat} << \EOF > %{name}.prov
+#!%{_buildshell}
+%{__grep} -v %{_docdir} - | %{__find_provides} $* \
+	| %{__sed} '/\.so$/d'
+EOF
+%define __find_provides %{_builddir}/%{name}-%{version}/%{name}.prov
+%{__chmod} +x %{__find_provides}
+
+
 %post
 # Install schema
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule /etc/gconf/schemas/apps_xchat_url_handler.schemas >& /dev/null || :
 
+
 %pre
 if [ "$1" -gt 1 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
@@ -126,15 +113,33 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc README ChangeLog
+%doc plugins/plugin20.html plugins/perl/xchat2-perl.html
 %{_bindir}/xchat
-%{_bindir}/xchat-remote
-%dir %{_libdir}/xchat/plugins
-%{_libdir}/xchat/plugins/*.so
+%{_libdir}/xchat
 %{_datadir}/applications/xchat.desktop
 %{_datadir}/pixmaps/*
+%{_datadir}/dbus-1/services/*
 %{_sysconfdir}/gconf/schemas/apps_xchat_url_handler.schemas
 
 %changelog
+* Thu Jan 25 2007 Marius FERARU <altblue@n0i.net> - 1:2.8.0-1.n0i.1
+- version 2.8.0
+- disabled some patches: nonblock, locale (fi, es)
+- enabled fast tinting
+- fixed "exchant" typo
+- switched to using the "make install" (DESTDIR works)
+- simplified gconf schema disabling method
+- dropped plugins mover
+- updated "Get rid of static libs"
+- dropped xchat-remote
+- updated build requirements
+- dropped "default-webbrowser" patches (xchat tries to do it better now)
+- do not provide "perl.so", "python.so", etc
+- own everything under %%{_libdir}/xchat
+- converted spec file to UTF8
+- fixed desktop entry category (dropping "Application")
+- keep plugins documentation
+
 * Fri Nov  3 2006 Matthias Clasen <mclasen@redhat.com> - 1.2.6.6-8
 - Silence %%pre (#213838)
 
@@ -546,7 +551,7 @@
 * Mon Jun 25 2001 Karsten Hopp <karsten@redhat.de>
 - use konqueror, not kfmclient on URLs
 
-* Fri Feb 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
+* Fri Feb 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
 - langify
 - use %%{_tmppath}
 - make it compile