[nntpgrab] Update to 0.6.92 (0.7 Beta 3)

[epienbro]

commit 5d19944946f0699141d96077c71d1ad2c079d461
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Wed Jul 20 00:57:50 2011 +0200

    Update to 0.6.92 (0.7 Beta 3)
    
    - Update to 0.6.92 (0.7 Beta 3)
    - Build against gtk3 on Fedora 15 and rawhide
    - Dropped upstreamed NetworkManager 0.9 patch

 .gitignore    |    1 +
 nm09.patch    |   44 ---------------------------------
 nntpgrab.spec |   74 +++++++++++++++++++++++++++++++++++++-------------------
 sources       |    2 +-
 4 files changed, 51 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 153c40a..4c69ecc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /nntpgrab-0.6.90.tar.bz2
 /nntpgrab-0.6.91.tar.bz2
+/nntpgrab-0.6.92.tar.bz2
diff --git a/nntpgrab.spec b/nntpgrab.spec
index d41d33e..40c12e6 100644
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@ -1,12 +1,11 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.6.91
-Release: 4%{?dist}
+Version: 0.6.92
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
 Source1: nntpgrab_php.ini
-Patch1: nm09.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
@@ -17,7 +16,11 @@ Requires:	nntpgrab-server-gtk = %{version}-%{release}
 
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
+%if 0%{?fedora} >= 15
+BuildRequires:	gtk3-devel
+%else
 BuildRequires:	gtk2-devel
+%endif
 BuildRequires:	libxml2-devel
 BuildRequires:	libnotify-devel
 BuildRequires:	php-devel
@@ -30,18 +33,15 @@ BuildRequires:	gnutls-devel
 %if 0%{?rhel} != 5
 BuildRequires:	libproxy-devel
 BuildRequires:	PolicyKit-gnome-devel
-%if 0%{?fedora} > 0
-# Qt dependencies. Can be moved outside this %%if when
-# all packages are available in EPEL-6
-BuildRequires:	qt-devel
-BuildRequires:	qtsingleapplication-devel
-%global have_qt	1
-%endif
+BuildRequires:	qt4-devel
 %else
 BuildRequires:	pcre-devel
 BuildRequires:	curl-devel
 BuildRequires:	libglade2-devel
 %endif
+%if 0%{?fedora} > 0
+BuildRequires:  qtsingleapplication-devel
+%endif
 %if 0%{?fedora} >= 15
 BuildRequires:	gobject-introspection-devel
 %endif
@@ -86,7 +86,7 @@ Provides:	nntpgrab-gui-networked = %{version}-%{release}
 GUI Frontend of NNTPGrab (written in GTK)
 
 
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 %package gui-qt
 Summary:	GUI Frontend of NNTPGrab (Qt version)
 Group:		%{group}
@@ -134,7 +134,7 @@ or control the program from a remote computer
 This the GUI version (based on GTK)
 
 
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 %package server-qt
 Summary:	NNTPGrab server (Qt GUI version)
 Group:		%{group}
@@ -163,20 +163,21 @@ embedded webinterface which doesn't require this package to be installed
 
 %prep
 %setup -q
-%patch1 -p1 -b .nm09
 
 
 %build
+INTROSPECTION_ARGS=""
+
 %if 0%{?fedora} == 14
 INTROSPECTION_ARGS="--enable-introspection=no"
-%else
-INTROSPECTION_ARGS=""
 %endif
-%configure --enable-php-module --disable-gtk3 $INTROSPECTION_ARGS
+
+%configure --enable-php-module --disable-online-tests $INTROSPECTION_ARGS
+
 make %{?_smp_mflags}
 
 # The Qt frontend has a seperate build process
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 # 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
@@ -190,6 +191,13 @@ popd
 %endif
 
 
+%check
+# The testsuite only works on GLib 2.16.0+
+%if 0%{?rhel} != 5
+make check
+%endif
+
+
 %install
 rm -rf %{buildroot}
 make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
@@ -227,16 +235,23 @@ done
 find $RPM_BUILD_ROOT -name \*.la -exec rm -f {} \;
 
 # The glade interface isn't used on GTK 2.12.0 and higher
-%if 0%{?rhel} != 5
-rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
-rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.glade
+# The gtk2 interface isn't used on GTK 3.x and higher
+%if 0%{?rhel} == 5
+	rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.ui
+	rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui_gtk3.ui
+	rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.ui
 %else
-rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.ui
-rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.ui
+	rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
+	rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.glade
+	%if 0%{?fedora} >= 15
+		rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.ui
+	%else
+		rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui_gtk3.ui
+	%endif
 %endif
 
 # Install the Qt frontends
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 pushd client/gui_qt
 	install -m 755 nntpgrab_gui_qt %{buildroot}%{_bindir}
 	mkdir -p %{buildroot}%{_datadir}/nntpgrab/translations/
@@ -307,10 +322,14 @@ rm -rf %{buildroot}
 %if 0%{?rhel} == 5
 %{_datadir}/nntpgrab/nntpgrab_gui.glade
 %else
+%if 0%{?fedora} >= 15
+%{_datadir}/nntpgrab/nntpgrab_gui_gtk3.ui
+%else
 %{_datadir}/nntpgrab/nntpgrab_gui.ui
 %endif
+%endif
 
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 %files gui-qt
 %defattr(-,root,root,-)
 %{_bindir}/nntpgrab_gui_qt
@@ -355,7 +374,7 @@ rm -rf %{buildroot}
 %{_datadir}/nntpgrab/nntpgrab_server.ui
 %endif
 
-%if 0%{?have_qt} > 0
+%if 0%{?rhel} != 5
 %files server-qt
 %defattr(-,root,root,-)
 %{_bindir}/nntpgrab_server_qt
@@ -369,6 +388,11 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Wed Jul 20 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 0.6.92-1
+- Update to 0.6.92 (0.7 Beta 3)
+- Build against gtk3 on Fedora 15 and rawhide
+- Dropped upstreamed NetworkManager 0.9 patch
+
 * Sun Mar 27 2011 Christopher Aillon <caillon at redhat.com> - 0.6.91-4
 - Rebuild against NetworkManager 0.9
 
diff --git a/sources b/sources
index e6c7840..9baaea1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2a0f49735c74668dd379279e433b6a9c  nntpgrab-0.6.91.tar.bz2
+2cc4912a7f53c7e9c90e0d63c335216b  nntpgrab-0.6.92.tar.bz2