rpms/nntpgrab/devel .cvsignore, 1.24, 1.25 nntpgrab.spec, 1.42, 1.43 sources, 1.27, 1.28 nntpgrab_apache.conf, 1.1, NONE
epienbro
epienbro at fedoraproject.org
Sat Mar 6 14:29:33 UTC 2010
Author: epienbro
Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5940/devel
Modified Files:
.cvsignore nntpgrab.spec sources
Removed Files:
nntpgrab_apache.conf
Log Message:
- Update to 0.6.0
- Merged the EL-5 and Fedora .spec file
- Dropped upstreamed EL-5 specific patch
- Renamed the nntpgrab-web subpackage to nntpgrab-php as it only
contains an PHP module
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 19 Feb 2010 17:51:26 -0000 1.24
+++ .cvsignore 6 Mar 2010 14:29:32 -0000 1.25
@@ -1 +1 @@
-nntpgrab-0.5.91.tar.bz2
+nntpgrab-0.6.0.tar.bz2
Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- nntpgrab.spec 19 Feb 2010 17:51:26 -0000 1.42
+++ nntpgrab.spec 6 Mar 2010 14:29:32 -0000 1.43
@@ -1,12 +1,11 @@
Summary: Download files from the usenet
Name: nntpgrab
-Version: 0.5.91
+Version: 0.6.0
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
Source0: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
Source1: nntpgrab_php.ini
-Source2: nntpgrab_apache.conf
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
URL: http://www.nntpgrab.nl
@@ -16,7 +15,6 @@ Requires: nntpgrab-server = %{version}-%
Requires: nntpgrab-server-gtk = %{version}-%{release}
BuildRequires: desktop-file-utils
-BuildRequires: qt-devel
BuildRequires: gtkhtml3-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
@@ -42,6 +40,7 @@ BuildRequires: PolicyKit-gnome-devel
BuildRequires: nss-devel
BuildRequires: nss_compat_ossl-devel
BuildRequires: PolicyKit-gnome-devel
+BuildRequires: qt-devel
%endif
%description
@@ -126,6 +125,7 @@ or control the program from a remote com
This the GUI version (based on GTK)
+%if 0%{?fedora} > 0
%package server-qt
Summary: NNTPGrab server (Qt GUI version)
Group: %{group}
@@ -137,17 +137,20 @@ The NNTPGrab Server is required if you w
or control the program from a remote computer
This the GUI version (based on Qt)
+%endif
-%package web
-Summary: NNTPGrab web interface
+%package php
+Summary: PHP module which allows PHP scripts to communicate with NNTPGrab
Requires: nntpgrab-core = %{version}-%{release}
Group: %{group}
-Requires: webserver
Requires: php >= 4.1.0
+Obsoletes: nntpgrab-web <= 0.5.91-2%{?dist}
+Provides: nntpgrab-web = %{version}-%{release}
-%description web
-Web interface to control NNTPGrab
+%description php
+PHP module which allows PHP scripts to communicate with NNTPGrab. NNTPGrab has an
+embedded webinterface which doesn't require this package to be installed
%prep
@@ -155,14 +158,18 @@ Web interface to control NNTPGrab
%build
-%configure
+%configure --enable-php-module
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 server_qt
- qmake-qt4 server_qt.pro -o Makefile
+ %{_libdir}/qt4/bin/qmake server_qt.pro -o Makefile
make
popd
+%endif
%install
@@ -182,10 +189,6 @@ desktop-file-install --vendor fedora --d
%{buildroot}%{_datadir}/applications/nntpgrab_server_gtk.desktop
# Rename the plugins from name_of_plugin.so.0.0.0 to name_of_plugin.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so.0
-mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
-
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0
mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
@@ -198,9 +201,16 @@ rm %{buildroot}%{_libdir}/nntpgrab/libnn
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
+# 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
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
+
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0
mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%endif
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
@@ -216,36 +226,27 @@ rm %{buildroot}%{_libdir}/libnntpgrab_gl
rm %{buildroot}%{_libdir}/libnntpgrab_utils.la
rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
-rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.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
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.la
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.la
+%endif
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.la
rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.la
-# Install the webinterface to /usr/share/nntpgrab/web
-mkdir -p %{buildroot}/%{_datadir}/%{name}/web
-cp -ad client/web/* %{buildroot}/%{_datadir}/%{name}/web
-cp -ad client/web/.htaccess %{buildroot}/%{_datadir}/%{name}/web
-rm -rf %{buildroot}/%{_datadir}/%{name}/web/module
-rm -f %{buildroot}%{_datadir}/%{name}/web/Makefile*
-
-# Webinterface configuration
-mkdir -p %{buildroot}/%{_sysconfdir}/httpd/conf.d/
-mkdir -p %{buildroot}/%{_sysconfdir}/php.d
-mkdir -p %{buildroot}/%{_sysconfdir}/%{name}
-install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/php.d/nntpgrab.ini
-install -m 644 %{SOURCE2} %{buildroot}/%{_sysconfdir}/httpd/conf.d/nntpgrab.conf
-install -m 644 client/web/config.ini %{buildroot}/%{_sysconfdir}/%{name}/config.ini
-rm -f %{buildroot}/%{_datadir}/%{name}/web/config.ini
-ln -s %{_sysconfdir}/%{name}/config.ini %{buildroot}/%{_datadir}/%{name}/web/config.ini
-
# The glade interface isn't used on GTK 2.12.0 and higher
+%if 0%{?fedora} > 0
rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.glade
+%else
+rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.ui
+rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.ui
+%endif
# Install the Qt frontend
+%if 0%{?fedora} > 0
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
@@ -256,6 +257,11 @@ pushd server_qt
--dir %{buildroot}%{_datadir}/applications \
%{buildroot}%{_datadir}/applications/nntpgrab_server_qt.desktop
popd
+%endif
+
+# Install a configuration file for the PHP module
+mkdir -p %{buildroot}/%{_sysconfdir}/php.d
+install -m 644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/php.d/nntpgrab.ini
%find_lang NNTPGrab
@@ -276,22 +282,29 @@ rm -rf %{buildroot}
%{_libdir}/libnntpgrab_glue.so.0
%{_libdir}/libnntpgrab_glue.so.0.0.0
%dir %{_libdir}/nntpgrab
-%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_jsonrpc.so
-%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_logger.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
+%if 0%{?fedora} > 0
+%{_libdir}/nntpgrab/libnntpgrab_plugin_auto_import.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_networkmanager.so
+%endif
%{_datadir}/pixmaps/nntpgrab.png
%dir %{_datadir}/nntpgrab
+%{_datadir}/nntpgrab/web
%doc COPYING ChangeLog
%files gui
%defattr(-,root,root,-)
%{_datadir}/applications/fedora-nntpgrab.desktop
%{_bindir}/nntpgrab_gui
+%if 0%{?fedora} > 0
%{_datadir}/nntpgrab/nntpgrab_gui.ui
+%else
+%{_datadir}/nntpgrab/nntpgrab_gui.glade
+%endif
%files devel
%defattr(-,root,root,-)
@@ -319,23 +332,37 @@ 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
+%{_datadir}/nntpgrab/nntpgrab_server.glade
+%endif
+%if 0%{?fedora} > 0
%files server-qt
%defattr(-,root,root,-)
%{_bindir}/nntpgrab_server_qt
%{_datadir}/applications/fedora-nntpgrab_server_qt.desktop
+%endif
-%files web
+%files php
%defattr(-,root,root,-)
%{_libdir}/php/modules/php_nntpgrab.so
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/nntpgrab.conf
%config(noreplace) %{_sysconfdir}/php.d/nntpgrab.ini
-%config(noreplace) %{_sysconfdir}/%{name}
-%{_datadir}/nntpgrab/web
%changelog
+* Sat Mar 6 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.6.0-1
+- Update to 0.6.0
+- Merged the EL-5 and Fedora .spec file
+- Dropped upstreamed EL-5 specific patch
+- Renamed the nntpgrab-web subpackage to nntpgrab-php as it only
+ contains an PHP module
+
+* Sat Feb 27 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.91-2
+- The standalone GUI and the server GUI were broken on EL-5 due to missing .glade files. Fixed
+- Backported an upstreamed patch which fixes two JSON-RPC bugs
+
* Fri Feb 19 2010 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.91-1
- Update to 0.5.91 (0.6 Beta 2)
- Renamed the nntpgrab-server-gui subpackage to nntpgrab-server-gtk
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- sources 19 Feb 2010 17:51:26 -0000 1.27
+++ sources 6 Mar 2010 14:29:32 -0000 1.28
@@ -1 +1 @@
-4165a13ccdc5005296d691df77c3ecf6 nntpgrab-0.5.91.tar.bz2
+22f21df87e2eb964a7cc7c661422745b nntpgrab-0.6.0.tar.bz2
--- nntpgrab_apache.conf DELETED ---
More information about the scm-commits
mailing list