[nntpgrab] - Update to 0.6.90 (0.7 Beta 1) - Added nntpgrab-qt subpackage which contains a Qt frontend - Disabl

[epienbro]

commit bd839a7d228c281a51e34e3c1b1c43644cb8429b
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 18:13:19 2010 +0200

    - Update to 0.6.90 (0.7 Beta 1)
    - Added nntpgrab-qt subpackage which contains a Qt frontend
    - Disable gtk3 support for now
    - Bundle the gtk-doc API documentation with the devel subpackage

 nntpgrab.spec |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 53 insertions(+), 6 deletions(-)
---
diff --git a/nntpgrab.spec b/nntpgrab.spec
index 7c5b995..4233e2e 100644
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@ -1,6 +1,6 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.6.2
+Version: 0.6.90
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
@@ -15,7 +15,6 @@ Requires:	nntpgrab-server = %{version}-%{release}
 Requires:	nntpgrab-server-gtk = %{version}-%{release}
 
 BuildRequires:	desktop-file-utils
-BuildRequires:	gtkhtml3-devel
 BuildRequires:	gettext
 BuildRequires:	gtk2-devel
 BuildRequires:	libxml2-devel
@@ -41,6 +40,7 @@ BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
 BuildRequires:	PolicyKit-gnome-devel
 BuildRequires:	qt-devel
+BuildRequires:	gobject-introspection-devel
 %endif
 
 %description
@@ -67,6 +67,7 @@ Provides:	nntpgrab-core-libs = %{version}-%{release}
 %description core
 Core library of NNTPGrab containing all the internal plugins
 
+
 %package gui-base
 Summary:	Libraries required for the NNTPGrab GUI and NNTPGrab Server
 Group:		%{group}
@@ -78,6 +79,7 @@ Group:		%{group}
 The libraries in this package contains functions which are required
 by both the NNTPGrab GUI and the NNTPGrab Server
 
+
 %package gui
 Summary:	GUI Frontend of NNTPGrab
 Requires:	nntpgrab-core = %{version}-%{release}
@@ -88,17 +90,31 @@ Obsoletes:	nntpgrab-gui-networked <= 0.4.2-3%{?dist}
 Provides:	nntpgrab-gui-networked = %{version}-%{release}
 
 %description gui
-GUI Frontend of NNTPGrab
+GUI Frontend of NNTPGrab (written in GTK)
+
+
+%if 0%{?fedora} > 0
+%package gui-qt
+Summary:	GUI Frontend of NNTPGrab (Qt version)
+Group:		%{group}
+Requires:	nntpgrab-core = %{version}-%{release}
+
+%description gui-qt
+GUI Frontend of NNTPGrab written in Qt
+%endif
+
 
 %package devel
 Summary:	Development files for NNTPGrab
 Group:		%{group}
 Requires:	nntpgrab = %{version}-%{release}
 Requires:	glib2-devel
+Requires:	gtk-doc
 
 %description devel
 Development files needed to create NNTPGrab frontends
 
+
 %package server
 Summary:	NNTPGrab server (Console version)
 Group:		%{group}
@@ -110,6 +126,7 @@ or control the program from a remote computer
 
 This is the console version
 
+
 %package server-gtk
 Summary:	NNTPGrab server (GTK GUI version)
 Group:		%{group}
@@ -158,13 +175,17 @@ embedded webinterface which doesn't require this package to be installed
 
 
 %build
-%configure --enable-php-module
+%configure --enable-php-module --disable-gtk3 --enable-gtk-doc
 make %{?_smp_mflags}
 
 # The Qt frontend has a seperate build process
 %if 0%{?fedora} > 0
 # We only build for Fedora environments as the Qt which is bundled with RHEL5 is too old or broken
 # (uic bails out on RHEL5 with the error: 'uic: File generated with too old version of Qt Designer')
+pushd client/gui_qt
+	%{_libdir}/qt4/bin/qmake gui_qt.pro -o Makefile
+	make
+popd
 pushd server_qt
 	%{_libdir}/qt4/bin/qmake server_qt.pro -o Makefile
 	make
@@ -245,8 +266,18 @@ rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.ui
 rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.ui
 %endif
 
-# Install the Qt frontend
+# Install the Qt frontends
 %if 0%{?fedora} > 0
+pushd client/gui_qt
+	make install INSTALL_ROOT=%{buildroot}
+	install -m 644 nntpgrab_qt.desktop %{buildroot}%{_datadir}/applications/nntpgrab_qt.desktop
+
+	desktop-file-install --vendor fedora --delete-original \
+	  --add-category Network \
+	  --copy-generic-name-to-name \
+	  --dir %{buildroot}%{_datadir}/applications \
+	  %{buildroot}%{_datadir}/applications/nntpgrab_qt.desktop
+popd
 pushd server_qt
 	install -m 755 nntpgrab_server_qt %{buildroot}%{_bindir}/nntpgrab_server_qt
 	install -m 644 nntpgrab_server_qt.desktop %{buildroot}%{_datadir}/applications/nntpgrab_server_qt.desktop
@@ -265,14 +296,17 @@ install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/php.d/nntpgrab.ini
 
 %find_lang NNTPGrab
 
+
 %clean
 rm -rf %{buildroot}
 	
+
 %files
 %defattr(-,root,root,-)
 
 %files core -f NNTPGrab.lang
 %defattr(-,root,root,-)
+%doc COPYING ChangeLog
 %{_libdir}/libnntpgrab.so.0
 %{_libdir}/libnntpgrab.so.0.0.0
 %{_libdir}/libnntpgrab_automation.so.0
@@ -294,7 +328,6 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/nntpgrab.png
 %dir %{_datadir}/nntpgrab
 %{_datadir}/nntpgrab/web
-%doc COPYING ChangeLog
 
 %files gui
 %defattr(-,root,root,-)
@@ -306,6 +339,11 @@ rm -rf %{buildroot}
 %{_datadir}/nntpgrab/nntpgrab_gui.glade
 %endif
 
+%files gui-qt
+%defattr(-,root,root,-)
+%{_datadir}/applications/fedora-nntpgrab_qt.desktop
+%{_bindir}/nntpgrab_gui_qt
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libnntpgrab.so
@@ -318,6 +356,9 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/nntpgrab_automation.pc
 %{_libdir}/pkgconfig/nntpgrab_glue.pc
 %{_libdir}/pkgconfig/nntpgrab_utils.pc
+%{_libdir}/girepository-1.0/Nntpgrab-1.0.typelib
+%{_datadir}/gir-1.0/Nntpgrab-1.0.gir
+%{_datadir}/gtk-doc/html/NNTPGrab/
 
 %files gui-base
 %defattr(-,root,root,-)
@@ -352,6 +393,12 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 21 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.6.90-1
+- Update to 0.6.90 (0.7 Beta 1)
+- Added nntpgrab-qt subpackage which contains a Qt frontend
+- Disable gtk3 support for now
+- Bundle the gtk-doc API documentation with the devel subpackage
+
 * Sat Jun  5 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.6.2-1
 - Update to 0.6.2