rpms/nntpgrab/F-11 .cvsignore, 1.23, 1.24 nntpgrab.spec, 1.39, 1.40 sources, 1.26, 1.27
epienbro
epienbro at fedoraproject.org
Fri Feb 19 17:51:25 UTC 2010
Author: epienbro
Update of /cvs/pkgs/rpms/nntpgrab/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25450/F-11
Modified Files:
.cvsignore nntpgrab.spec sources
Log Message:
* 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
- Added a new nntpgrab-server-qt subpackage
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- .cvsignore 25 Dec 2009 22:09:46 -0000 1.23
+++ .cvsignore 19 Feb 2010 17:51:25 -0000 1.24
@@ -1 +1 @@
-nntpgrab-0.5.90.tar.bz2
+nntpgrab-0.5.91.tar.bz2
Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/nntpgrab.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- nntpgrab.spec 25 Dec 2009 22:09:46 -0000 1.39
+++ nntpgrab.spec 19 Feb 2010 17:51:25 -0000 1.40
@@ -1,6 +1,6 @@
Summary: Download files from the usenet
Name: nntpgrab
-Version: 0.5.90
+Version: 0.5.91
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Internet
@@ -13,9 +13,10 @@ URL: http://www.nntpgrab.nl
Requires: nntpgrab-gui = %{version}-%{release}
Requires: nntpgrab-server = %{version}-%{release}
-Requires: nntpgrab-server-gui = %{version}-%{release}
+Requires: nntpgrab-server-gtk = %{version}-%{release}
BuildRequires: desktop-file-utils
+BuildRequires: qt-devel
BuildRequires: gtkhtml3-devel
BuildRequires: gettext
BuildRequires: gtk2-devel
@@ -110,17 +111,33 @@ or control the program from a remote com
This is the console version
-%package server-gui
-Summary: NNTPGrab server (GUI version)
+%package server-gtk
+Summary: NNTPGrab server (GTK GUI version)
Group: %{group}
Requires: nntpgrab-core = %{version}-%{release}
Requires: nntpgrab-gui-base = %{version}-%{release}
+Obsoletes: nntpgrab-server-gui <= 0.5.90-1%{?dist}
+Provides: nntpgrab-server-gui = %{version}-%{release}
-%description server-gui
+%description server-gtk
The NNTPGrab Server is required if you want to use the NNTPGrab webinterface
or control the program from a remote computer
-This the GUI version
+This the GUI version (based on GTK)
+
+
+%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
+or control the program from a remote computer
+
+This the GUI version (based on Qt)
+
%package web
Summary: NNTPGrab web interface
@@ -132,13 +149,22 @@ Requires: php >= 4.1.0
%description web
Web interface to control NNTPGrab
+
%prep
%setup -q
+
%build
%configure
make %{?_smp_mflags}
+# The Qt frontend has a seperate build process
+pushd server_qt
+ qmake-qt4 server_qt.pro -o Makefile
+ make
+popd
+
+
%install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
@@ -153,9 +179,13 @@ desktop-file-install --vendor fedora --d
--add-category Network \
--copy-generic-name-to-name \
--dir %{buildroot}%{_datadir}/applications \
- %{buildroot}%{_datadir}/applications/nntpgrab_server.desktop
+ %{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
@@ -186,6 +216,7 @@ 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
@@ -214,6 +245,18 @@ ln -s %{_sysconfdir}/%{name}/config.ini
rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_server.glade
+# Install the Qt frontend
+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
+
+ desktop-file-install --vendor fedora --delete-original \
+ --add-category Network \
+ --copy-generic-name-to-name \
+ --dir %{buildroot}%{_datadir}/applications \
+ %{buildroot}%{_datadir}/applications/nntpgrab_server_qt.desktop
+popd
+
%find_lang NNTPGrab
%clean
@@ -233,6 +276,7 @@ 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
@@ -271,12 +315,17 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_bindir}/nntpgrab_server
-%files server-gui
+%files server-gtk
%defattr(-,root,root,-)
-%{_bindir}/nntpgrab_server_gui
-%{_datadir}/applications/fedora-nntpgrab_server.desktop
+%{_bindir}/nntpgrab_server_gtk
+%{_datadir}/applications/fedora-nntpgrab_server_gtk.desktop
%{_datadir}/nntpgrab/nntpgrab_server.ui
+%files server-qt
+%defattr(-,root,root,-)
+%{_bindir}/nntpgrab_server_qt
+%{_datadir}/applications/fedora-nntpgrab_server_qt.desktop
+
%files web
%defattr(-,root,root,-)
%{_libdir}/php/modules/php_nntpgrab.so
@@ -287,6 +336,11 @@ rm -rf %{buildroot}
%changelog
+* 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
+- Added a new nntpgrab-server-qt subpackage
+
* Fri Dec 25 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.5.90-1
- Update to 0.5.90 (0.6 Beta 1)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-11/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- sources 25 Dec 2009 22:09:47 -0000 1.26
+++ sources 19 Feb 2010 17:51:25 -0000 1.27
@@ -1 +1 @@
-5ba5feb638e2d2ac5d896ffe8616668d nntpgrab-0.5.90.tar.bz2
+4165a13ccdc5005296d691df77c3ecf6 nntpgrab-0.5.91.tar.bz2
More information about the scm-commits
mailing list