[nntpgrab] - Dropped the Requires: nntpgrab-gui-base from the server-qt subpackage - Added support for EL6

Sat Aug 21 20:04:59 UTC 2010

commit dae4ce96dd26202caffdd2c305de9671222f52df
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 21 22:04:41 2010 +0200

    - Dropped the Requires: nntpgrab-gui-base from the server-qt subpackage
    - Added support for EL6

 nntpgrab.spec |   63 ++++++++++++++++++++++++++++++++++----------------------
 sources       |    2 +-
 2 files changed, 39 insertions(+), 26 deletions(-)
---

diff --git a/nntpgrab.spec b/nntpgrab.spec
index 4233e2e..1957b57 100644
--- a/nntpgrab.spec
+++ b/nntpgrab.spec
@@ -1,7 +1,7 @@
 Summary: Download files from the usenet
 Name: nntpgrab
 Version: 0.6.90
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
@@ -28,19 +28,21 @@ BuildRequires:	intltool
 BuildRequires:	libsoup-devel
 BuildRequires:	par2cmdline
 BuildRequires:	NetworkManager-glib-devel
-%if 0%{?rhel} > 0
-BuildRequires:	pcre-devel
-BuildRequires:	curl-devel
 BuildRequires:	openssl-devel
-%endif
-%if 0%{?fedora} > 0
+%if 0%{?rhel} != 5
 BuildRequires:	libproxy-devel
 BuildRequires:	PolicyKit-gnome-devel
+BuildRequires:	qt-devel
+%global have_qt 1
+%if 0%{?fedora} > 0
 BuildRequires:	nss-devel
 BuildRequires:	nss_compat_ossl-devel
-BuildRequires:	PolicyKit-gnome-devel
-BuildRequires:	qt-devel
 BuildRequires:	gobject-introspection-devel
+BuildRequires:	gtk-doc
+%endif
+%else
+BuildRequires:	pcre-devel
+BuildRequires:	curl-devel
 %endif
 
 %description
@@ -93,7 +95,7 @@ Provides:	nntpgrab-gui-networked = %{version}-%{release}
 GUI Frontend of NNTPGrab (written in GTK)
 
 
-%if 0%{?fedora} > 0
+%if 0%{?have_qt} > 0
 %package gui-qt
 Summary:	GUI Frontend of NNTPGrab (Qt version)
 Group:		%{group}
@@ -142,12 +144,11 @@ or control the program from a remote computer
 This the GUI version (based on GTK)
 
 
-%if 0%{?fedora} > 0
+%if 0%{?have_qt} > 0
 %package server-qt
 Summary:	NNTPGrab server (Qt GUI version)
 Group:		%{group}
 Requires:	nntpgrab-core = %{version}-%{release}
-Requires:	nntpgrab-gui-base = %{version}-%{release}
 
 %description server-qt
 The NNTPGrab Server is required if you want to use the NNTPGrab webinterface
@@ -175,11 +176,15 @@ embedded webinterface which doesn't require this package to be installed
 
 
 %build
+%if 0%{?fedora}
 %configure --enable-php-module --disable-gtk3 --enable-gtk-doc
+%else
+%configure --enable-php-module --disable-gtk3
+%endif
 make %{?_smp_mflags}
 
 # The Qt frontend has a seperate build process
-%if 0%{?fedora} > 0
+%if 0%{?have_qt} > 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
@@ -222,7 +227,7 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 
-%if 0%{?fedora} > 0
+%if 0%{?rhel} != 5
 # The NetworkManager and auto_import plugins can't be built on EL-5
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so.0
@@ -250,7 +255,7 @@ rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.la
-%if 0%{?fedora} > 0
+%if 0%{?rhel} != 5
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
 %endif
@@ -258,7 +263,7 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
 
 # The glade interface isn't used on GTK 2.12.0 and higher
-%if 0%{?fedora} > 0
+%if 0%{?rhel} != 5
 rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
 rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.glade
 %else
@@ -267,7 +272,7 @@ rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.ui
 %endif
 
 # Install the Qt frontends
-%if 0%{?fedora} > 0
+%if 0%{?have_qt} > 0
 pushd client/gui_qt
 	make install INSTALL_ROOT=%{buildroot}
 	install -m 644 nntpgrab_qt.desktop %{buildroot}%{_datadir}/applications/nntpgrab_qt.desktop
@@ -321,7 +326,7 @@ rm -rf %{buildroot}
 %{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
-%if 0%{?fedora} > 0
+%if 0%{?rhel} != 5
 %{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
 %endif
@@ -333,16 +338,18 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-nntpgrab.desktop
 %{_bindir}/nntpgrab_gui
-%if 0%{?fedora} > 0
-%{_datadir}/nntpgrab/nntpgrab_gui.ui
-%else
+%if 0%{?rhel} == 5
 %{_datadir}/nntpgrab/nntpgrab_gui.glade
+%else
+%{_datadir}/nntpgrab/nntpgrab_gui.ui
 %endif
 
+%if 0%{?have_qt} > 0
 %files gui-qt
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-nntpgrab_qt.desktop
 %{_bindir}/nntpgrab_gui_qt
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -356,9 +363,11 @@ rm -rf %{buildroot}
 %{_libdir}/pkgconfig/nntpgrab_automation.pc
 %{_libdir}/pkgconfig/nntpgrab_glue.pc
 %{_libdir}/pkgconfig/nntpgrab_utils.pc
+%{_datadir}/gtk-doc/html/NNTPGrab/
+%if 0%{?fedora}
 %{_libdir}/girepository-1.0/Nntpgrab-1.0.typelib
 %{_datadir}/gir-1.0/Nntpgrab-1.0.gir
-%{_datadir}/gtk-doc/html/NNTPGrab/
+%endif
 
 %files gui-base
 %defattr(-,root,root,-)
@@ -373,13 +382,13 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_bindir}/nntpgrab_server_gtk
 %{_datadir}/applications/fedora-nntpgrab_server_gtk.desktop
-%if 0%{?fedora} > 0
-%{_datadir}/nntpgrab/nntpgrab_server.ui
-%else
+%if 0%{?rhel} == 5
 %{_datadir}/nntpgrab/nntpgrab_server.glade
+%else
+%{_datadir}/nntpgrab/nntpgrab_server.ui
 %endif
 
-%if 0%{?fedora} > 0
+%if 0%{?have_qt} > 0
 %files server-qt
 %defattr(-,root,root,-)
 %{_bindir}/nntpgrab_server_qt
@@ -393,6 +402,10 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Sat Aug 21 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.6.90-2
+- Dropped the Requires: nntpgrab-gui-base from the server-qt subpackage
+- Added support for EL6
+
 * 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
diff --git a/sources b/sources
index 6ada026..13b6344 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f910f23f6c9e2486dd958501ae3ee06  nntpgrab-0.6.90.tar.bz2
+e24a754e533af18ee4188d7e2634ee48  nntpgrab-0.6.90.tar.bz2
