commit e11cf862689bc37512dc0570bcb6030ab506aa46
Author: Nathanael D. Noblet <nathanael@xxxxxxx>
Date: Mon Jun 27 16:09:19 2011 -0600
remove and obsolete dspam-web
dspam.spec | 54 ++++++++++++------------------------------------------
1 files changed, 12 insertions(+), 42 deletions(-)
---
diff --git a/dspam.spec b/dspam.spec
index d53207d..860fde6 100644
--- a/dspam.spec
+++ b/dspam.spec
@@ -9,7 +9,7 @@
Summary: A library and Mail Delivery Agent for Bayesian SPAM filtering
Name: dspam
Version: 3.9.0
-Release: 8%{?dist}
+Release: 9%{?dist}
License: GPLv2
Group: System Environment/Daemons
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -50,6 +50,7 @@ other MTA that supports an external local delivery agent (qmail, etc.)
%package libs
Summary: The DSPAM library core processing engines
Group: System Environment/Libraries
+Obsoletes: dspam-web
%description libs
The DSPAM core processing engine, also known as libdspam, provides all
@@ -116,14 +117,14 @@ This library can be used by developers to provide 'drop-in' spam
filtering for their mail client applications, other Anti-Spam tools, or
similar projects.
-%package web
-Summary: Web-based interface for DSPAM
-Group: System Environment/Daemons
-Requires: dspam = %{version}-%{release}
-Requires: webserver
+#%package web
+#Summary: Web-based interface for DSPAM
+#Group: System Environment/Daemons
+#Requires: dspam = %{version}-%{release}
+#Requires: webserver
-%description web
-Web-based interface for DSPAM's powerful Anti-Spam engine.
+#%description web
+#Web-based interface for DSPAM's powerful Anti-Spam engine.
%prep
@@ -170,13 +171,6 @@ make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
%{__install} -d -p -m 755 $RPM_BUILD_ROOT%{_var}/run/dspam/
%{__install} -Dp -m 755 %{SOURCE5} $RPM_BUILD_ROOT%{_bindir}/dspam-front
-# webui
- %{__install} -d -p -m 755 $RPM_BUILD_ROOT%{_datadir}/dspam-web/templates/
-for foo in webui/cgi-bin/templates/??
-do
- [ -d "${foo}" ] && %{__install} -d p -m 755 $RPM_BUILD_ROOT%{_datadir}/dspam-web/templates/${foo##*\/}
-done
-
# remove .la and .a files
find $RPM_BUILD_ROOT -name *.la -exec rm {} \;
find $RPM_BUILD_ROOT -name *.a -exec rm {} \;
@@ -229,28 +223,6 @@ echo "Scanned and tagged as non-SPAM with DSPAM %{version} by Your ISP.com"> $RP
#make sure CHANGELOG is in utf-8 format
iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv CHANGELOG
-# web
-%{__mkdir} -p $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/
-%{__install} -p -m0755 webui/cgi-bin/templates/*.pl $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/
-%{__install} -p -m0644 webui/htdocs/*.{css,gif} $RPM_BUILD_ROOT%{_datadir}/%{name}-web/
-%{__install} -p -m0644 webui/cgi-bin/templates/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/
-%{__install} -p -m0644 webui/cgi-bin/{admins,default.prefs,rgb.txt} $RPM_BUILD_ROOT%{_datadir}/%{name}-web/
-
-# setup configure.pl to by default expect the url to be /dspam so css and images load
-%{__sed} -i -r -e '/CONFIG.*WEB_ROOT/s,"","/dspam",' webui/cgi-bin/configure.pl
-%{__install} -Dp -m0755 webui/cgi-bin/{configure.pl,*.cgi} $RPM_BUILD_ROOT%{_datadir}/%{name}-web/
-
-for foo in webui/cgi-bin/templates/??
-do
- if [ -d "${foo}" ]
- then
- %{__install} -Dp -m0644 ${foo}/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/${foo##*\/}
- [ -f ${foo}/*.pl ] && %{__install} -p -m0755 ${foo}/*.pl $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/${foo##*\/}
- fi
-done
-%{__mkdir} -p $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d
-%{__install} -p -m0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
-
%post
/sbin/chkconfig --add %{name}
if [ $1 -gt 1 ]; then
@@ -355,12 +327,10 @@ exit 0
%{_libdir}/pkgconfig/dspam.pc
%{_mandir}/man3/*
-%files web
-%defattr(-,root,root,-)
-%{_datadir}/dspam-web/
-%config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
-
%changelog
+* Mon Jun 27 2011 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-9
+- Remove and obsolete dspam-web
+
* Tue Jul 13 2010 Nathanael Noblet <nathanael@xxxxxxx> - 3.9.0-8
- Fix dspam data dir permissions to be writeable by mail (Reported by Jonas Pasche)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
