rpms/nntpgrab/F-8 nntpgrab_apache.conf, NONE, 1.1 nntpgrab_php.ini, NONE, 1.1 .cvsignore, 1.1, 1.2 nntpgrab.spec, 1.7, 1.8 sources, 1.6, 1.7

Erik van Pienbroek (epienbro) fedora-extras-commits at redhat.com
Sat Jul 19 20:59:47 UTC 2008 

Author: epienbro

Update of /cvs/pkgs/rpms/nntpgrab/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31780/F-8

Modified Files:
	.cvsignore nntpgrab.spec sources 
Added Files:
	nntpgrab_apache.conf nntpgrab_php.ini 
Log Message:
Update to version 0.3.2



--- NEW FILE nntpgrab_apache.conf ---
# NNTPGrab - Communicate with an NNTPGrab server using a webinterface
# 
# Allows only localhost by default
#
# But allowing NNTPGrab to anyone other than localhost should be considered
# dangerous unless properly secured by SSL

Alias /nntpgrab /usr/share/nntpgrab/web
<Directory /usr/share/nntpgrab/web>
   order deny,allow
   deny from all
   allow from 127.0.0.1
</Directory>



--- NEW FILE nntpgrab_php.ini ---
extension=php_nntpgrab.so



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	13 Jan 2008 18:10:41 -0000	1.1
+++ .cvsignore	19 Jul 2008 20:58:57 -0000	1.2
@@ -0,0 +1 @@
+nntpgrab-0.3.2.tar.bz2


Index: nntpgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/nntpgrab.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nntpgrab.spec	29 Apr 2008 15:50:25 -0000	1.7
+++ nntpgrab.spec	19 Jul 2008 20:58:57 -0000	1.8
@@ -1,10 +1,12 @@
 Summary: NNTPGrab is a program to download files from the usenet
 Name: nntpgrab
-Version: 0.2.5
+Version: 0.3.2
 Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Internet
-Source: http://www.nntpgrab.nl/releases/nntpgrab-%{version}.tar.bz2
+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
@@ -25,6 +27,9 @@
 BuildRequires:  libnotify-devel
 BuildRequires:  sqlite-devel
 BuildRequires:  openssl-devel
+BuildRequires:  php-devel
+BuildRequires:  dbus-devel
+BuildRequires:  intltool
 
 %description
 With this program it is possible to download files from the usenet
@@ -75,6 +80,24 @@
 %description devel
 Development files for NNTPGrab
 
+%package server
+Summary:	NNTPGrab server
+Group:		%{group}
+Requires:	%{name}-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
+
+%package web
+Summary:	NNTPGrab web interface
+Requires:	nntpgrab-core = %{version}-%{release}
+Group:		%{group}
+Requires:	webserver 
+Requires:	php >= 4.1.0
+%description web
+Web interface to control NNTPGrab
+
 %prep
 %setup -q
 
@@ -84,7 +107,7 @@
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL_ROOT=%{buildroot}
 
 desktop-file-install --vendor fedora --delete-original \
   --add-category Network \
@@ -92,27 +115,57 @@
   --dir %{buildroot}%{_datadir}/applications \
   %{buildroot}%{_datadir}/applications/nntpgrab.desktop
 
+desktop-file-install --vendor fedora --delete-original \
+  --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
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so.0
-mv %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.so
-
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so.0
-mv %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.so
-
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so.0
-mv %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.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
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
+
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
+rm %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0
+mv %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so.0.0.0 %{buildroot}%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
 
 # Libtool files are unnecessary
 rm %{buildroot}%{_libdir}/libnntpgrab.la
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_decoder.la
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_nntp.la
-rm %{buildroot}%{_libdir}/libnntpgrab_plugin_schedular.la
+rm %{buildroot}%{_libdir}/libnntpgrab_glue.la
+rm %{buildroot}%{_libdir}/libnntpgrab_utils.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
+
+# Install the webinterface to /usr/share/nntpgrab/web
+mkdir -p %{buildroot}/%{_datadir}/%{name}/web
+cp -ad client/web/* %{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 server part of NNTPGrab isn't operational yet
-rm %{buildroot}%{_bindir}/nntpgrab_server
+# The glade interface isn't used on GTK 2.12.0 and higher
+rm -f %{buildroot}%{_datadir}/nntpgrab/nntpgrab_gui.glade
 
 %find_lang NNTPGrab
 
@@ -125,25 +178,49 @@
 %files core
 %{_libdir}/libnntpgrab.so.0
 %{_libdir}/libnntpgrab.so.0.0.0
+%{_libdir}/libnntpgrab_glue.so.0
+%{_libdir}/libnntpgrab_glue.so.0.0.0
+%{_libdir}/libnntpgrab_utils.so.0
+%{_libdir}/libnntpgrab_utils.so.0.0.0
+%{_datadir}/pixmaps/nntpgrab.png
 %doc COPYING ChangeLog
 
 %files plugins
-%{_libdir}/libnntpgrab_plugin_nntp.so
-%{_libdir}/libnntpgrab_plugin_decoder.so
-%{_libdir}/libnntpgrab_plugin_schedular.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_nntp.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_decoder.so
+%{_libdir}/nntpgrab/libnntpgrab_plugin_schedular.so
 
 %files gui -f NNTPGrab.lang
 %{_datadir}/applications/fedora-nntpgrab.desktop
+%{_datadir}/applications/fedora-nntpgrab_networked.desktop
 %{_bindir}/nntpgrab_gui
+%{_bindir}/nntpgrab_gui_networked
 %{_datadir}/nntpgrab
-%{_datadir}/pixmaps/nntpgrab.png
+%{_datadir}/nntpgrab/nntpgrab_gui.ui
 
 %files devel
 %{_libdir}/libnntpgrab.so
+%{_libdir}/libnntpgrab_glue.so
+%{_libdir}/libnntpgrab_utils.so
 %{_includedir}/nntpgrab
 %{_libdir}/pkgconfig/nntpgrab.pc
 
+%files server
+%{_bindir}/nntpgrab_server
+%{_bindir}/start_nntpgrab_server
+%{_datadir}/applications/fedora-nntpgrab_server.desktop
+
+%files web
+%{_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 Jul 19 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.3.2-1
+- Update to version 0.3.2
+
 * Tue Apr 29 2008 Erik van Pienbroek <info at nntpgrab.nl> - 0.2.5-1
 - Update to version 0.2.5
 - Small packaging fix


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nntpgrab/F-8/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	29 Apr 2008 15:50:25 -0000	1.6
+++ sources	19 Jul 2008 20:58:57 -0000	1.7
@@ -1 +1 @@
-87598c84b470d127ec45373b8b40a8b6  nntpgrab-0.2.5.tar.bz2
+ad5af50272852663ad992d7d4a663054  nntpgrab-0.3.2.tar.bz2

More information about the fedora-extras-commits mailing list