rpms/nntpgrab/devel nntpgrab.spec,1.30,1.31

Erik van Pienbroek epienbro at fedoraproject.org
Sun Mar 15 20:56:51 UTC 2009 

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10332

Modified Files:
	nntpgrab.spec 
Log Message:
- Update to 0.4.90
- Removed the core-libs subpackage (obsoleted by the core subpackage)
- Removed the gui-networked subpackage (obsoleted by the gui subpackage)
- Added the server-gui subpackage
- Drop upstreamed patch



Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/devel/nntpgrab.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nntpgrab.spec	26 Feb 2009 11:41:43 -0000	1.30
+++ nntpgrab.spec	15 Mar 2009 20:56:20 -0000	1.31
@@ -1,22 +1,19 @@
 Summary: Download files from the usenet
 Name: nntpgrab
-Version: 0.4.2
-Release: 3%{?dist}
+Version: 0.4.90
+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
-Patch0:  nntpgrab_0_4_2_gcc_4_4_fix.patch
 
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 URL: http://www.nntpgrab.nl
 
-Requires:	nntpgrab-core-libs = %{version}-%{release}
-Requires:	nntpgrab-core = %{version}-%{release}
 Requires:	nntpgrab-gui = %{version}-%{release}
-Requires:	nntpgrab-gui-networked = %{version}-%{release}
 Requires:	nntpgrab-server = %{version}-%{release}
+Requires:	nntpgrab-server-gui = %{version}-%{release}
 
 BuildRequires:	pcre-devel
 BuildRequires:	desktop-file-utils
@@ -40,16 +37,6 @@
 %description
 With this program it is possible to download files from the usenet
 
-%package core-libs
-Summary:	Libraries required for NNTPGrab
-Group:		%{group}
-
-%post	core-libs -p /sbin/ldconfig
-%postun	core-libs -p /sbin/ldconfig
-
-%description core-libs
-These libraries are required by both the NNTPGrab Core and the NNTPGrab GUI
-
 %package core
 Summary:	NNTPGrab Core library
 Group:		%{group}
@@ -62,6 +49,8 @@
 Provides:	nntpgrab-plugin-schedular = %{version}-%{release}
 Obsoletes:	nntpgrab-plugins <= 0.3.3-2%{?dist}
 Provides:	nntpgrab-plugins = %{version}-%{release}
+Obsoletes:	nntpgrab-core-libs <= 0.4.2-3%{?dist}
+Provides:	nntpgrab-core-libs = %{version}-%{release}
 
 %post	core -p /sbin/ldconfig
 %postun	core -p /sbin/ldconfig
@@ -86,39 +75,44 @@
 Requires:	nntpgrab-gui-base = %{version}-%{release}
 Requires:	xdg-utils
 Group:		%{group}
+Obsoletes:	nntpgrab-gui-networked <= 0.4.2-3%{?dist}
+Provides:	nntpgrab-gui-networked = %{version}-%{release}
 
 %description gui
-GUI Frontend of NNTPGrab (fully standalone)
-
-%package gui-networked
-Summary:	Networked GUI Frontend of NNTPGrab
-Requires:	nntpgrab-core-libs = %{version}-%{release}
-Requires:	nntpgrab-gui-base = %{version}-%{release}
-Requires:	xdg-utils
-Group:		%{group}
-
-%description gui-networked
-GUI frontend of NNTPGrab which can connect to a NNTPGrab Server
+GUI Frontend of NNTPGrab
 
 %package devel
 Summary:	Development files for NNTPGrab
 Group:		%{group}
-Requires:	%{name} = %{version}-%{release}
+Requires:	nntpgrab = %{version}-%{release}
 Requires:	glib2-devel
 
 %description devel
 Development files needed to create NNTPGrab frontends
 
 %package server
-Summary:	NNTPGrab server
+Summary:	NNTPGrab server (Console version)
 Group:		%{group}
-Requires:	%{name}-core = %{version}-%{release}
-Requires:	%{name}-gui-base = %{version}-%{release}
+Requires:	nntpgrab-core = %{version}-%{release}
 
 %description server
 The NNTPGrab Server is required if you want to use the NNTPGrab webinterface
 or control the program from a remote computer
 
+This is the console version
+
+%package server-gui
+Summary:	NNTPGrab server (GUI version)
+Group:		%{group}
+Requires:	nntpgrab-core = %{version}-%{release}
+Requires:	nntpgrab-gui-base = %{version}-%{release}
+
+%description server-gui
+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
+
 %package web
 Summary:	NNTPGrab web interface
 Requires:	nntpgrab-core = %{version}-%{release}
@@ -131,7 +125,6 @@
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
 %configure
@@ -151,12 +144,6 @@
   --add-category Network \
   --copy-generic-name-to-name \
   --dir %{buildroot}%{_datadir}/applications \
-  %{buildroot}%{_datadir}/applications/nntpgrab_networked.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.desktop
 
 # Rename the plugins from name_of_plugin.so.0.0.0 to name_of_plugin.so
@@ -176,17 +163,21 @@
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0
 mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
 
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
+
 # Libtool files are unnecessary
 rm %{buildroot}%{_libdir}/libnntpgrab.la
 rm %{buildroot}%{_libdir}/libnntpgrab_glue.la
 rm %{buildroot}%{_libdir}/libnntpgrab_utils.la
 rm %{buildroot}%{_libdir}/libnntpgrab_automation.la
-rm %{buildroot}%{_libdir}/libnntpgrab_automation_networked.la
 rm %{buildroot}%{_libdir}/libnntpgrab_gui_base.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.la
 rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.la
 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
@@ -217,39 +208,31 @@
 %files
 %defattr(-,root,root,-)
 
-%files core-libs -f NNTPGrab.lang
-%defattr(-,root,root,-)
-%{_libdir}/libnntpgrab_utils.so.0
-%{_libdir}/libnntpgrab_utils.so.0.0.0
-%{_libdir}/libnntpgrab_automation_networked.so.0
-%{_libdir}/libnntpgrab_automation_networked.so.0.0.0
-%{_libdir}/libnntpgrab_glue.so.0
-%{_libdir}/libnntpgrab_glue.so.0.0.0
-%{_datadir}/pixmaps/nntpgrab.png
-%dir %{_datadir}/nntpgrab
-%doc COPYING ChangeLog
-
-%files core
+%files core -f NNTPGrab.lang
 %defattr(-,root,root,-)
 %{_libdir}/libnntpgrab.so.0
 %{_libdir}/libnntpgrab.so.0.0.0
 %{_libdir}/libnntpgrab_automation.so.0
 %{_libdir}/libnntpgrab_automation.so.0.0.0
+%{_libdir}/libnntpgrab_utils.so.0
+%{_libdir}/libnntpgrab_utils.so.0.0.0
+%{_libdir}/libnntpgrab_glue.so.0
+%{_libdir}/libnntpgrab_glue.so.0.0.0
 %dir %{_libdir}/nntpgrab
 %{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
 %{_libdir}/nntpgrab/libnntpgrab_plugin_par2.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_unpack.so
+%{_datadir}/pixmaps/nntpgrab.png
+%dir %{_datadir}/nntpgrab
+%doc COPYING ChangeLog
 
 %files gui
 %defattr(-,root,root,-)
 %{_datadir}/applications/fedora-nntpgrab.desktop
 %{_bindir}/nntpgrab_gui
-
-%files gui-networked
-%defattr(-,root,root,-)
-%{_datadir}/applications/fedora-nntpgrab_networked.desktop
-%{_bindir}/nntpgrab_gui_networked
+%{_datadir}/nntpgrab/nntpgrab_gui.ui
 
 %files devel
 %defattr(-,root,root,-)
@@ -257,22 +240,27 @@
 %{_libdir}/libnntpgrab_glue.so
 %{_libdir}/libnntpgrab_utils.so
 %{_libdir}/libnntpgrab_automation.so
-%{_libdir}/libnntpgrab_automation_networked.so
 %{_libdir}/libnntpgrab_gui_base.so
 %{_includedir}/nntpgrab
 %{_libdir}/pkgconfig/nntpgrab.pc
+%{_libdir}/pkgconfig/nntpgrab_automation.pc
+%{_libdir}/pkgconfig/nntpgrab_glue.pc
+%{_libdir}/pkgconfig/nntpgrab_utils.pc
 
 %files gui-base
 %defattr(-,root,root,-)
 %{_libdir}/libnntpgrab_gui_base.so.0
 %{_libdir}/libnntpgrab_gui_base.so.0.0.0
-%{_datadir}/nntpgrab/nntpgrab_gui.ui
-%{_datadir}/nntpgrab/nntpgrab_server.ui
 
 %files server
 %defattr(-,root,root,-)
 %{_bindir}/nntpgrab_server
+
+%files server-gui
+%defattr(-,root,root,-)
+%{_bindir}/nntpgrab_server_gui
 %{_datadir}/applications/fedora-nntpgrab_server.desktop
+%{_datadir}/nntpgrab/nntpgrab_server.ui
 
 %files web
 %defattr(-,root,root,-)
@@ -283,6 +271,13 @@
 %{_datadir}/nntpgrab/web
 
 %changelog
+* Sun Mar 15 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.90-1
+- Update to 0.4.90
+- Removed the core-libs subpackage (obsoleted by the core subpackage)
+- Removed the gui-networked subpackage (obsoleted by the gui subpackage)
+- Added the server-gui subpackage
+- Drop upstreamed patch
+
 * Thu Feb 26 2009 Erik van Pienbroek <info at nntpgrab.nl> - 0.4.2-3
 - Disabled the test_nntp_connection and test_configuration testcases
   as they relied on internal library data which isn't exported

More information about the fedora-extras-commits mailing list