rpms/dspam/EL-4 dspam.spec,1.4,1.5 import.log,1.1,1.2

[Nathanael Noblet]

Author: gnat

Update of /cvs/pkgs/rpms/dspam/EL-4
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11262/EL-4

Modified Files:
	dspam.spec import.log 
Log Message:
added as a new package for EL4
fixed EL4 spec file issues



Index: dspam.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dspam/EL-4/dspam.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- dspam.spec	3 Mar 2010 17:27:15 -0000	1.4
+++ dspam.spec	31 Mar 2010 21:18:33 -0000	1.5
@@ -230,10 +230,11 @@ echo "Scanned and tagged as non-SPAM wit
 iconv -f iso8859-1 -t utf-8 CHANGELOG > CHANGELOG.conv && mv -f CHANGELOG.conv CHANGELOG
 
 # web 
-%{__install} -Dp -m0644 webui/htdocs/*.{css,gif} $RPM_BUILD_ROOT%{_datadir}/%{name}-web/
-%{__install} -Dp -m0644 webui/cgi-bin/templates/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates
-%{__install} -Dp -m0755 webui/cgi-bin/templates/*.pl $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates
-%{__install} -Dp -m0644 webui/cgi-bin/{admins,default.prefs,rgb.txt} $RPM_BUILD_ROOT%{_datadir}/%{name}-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
@@ -244,10 +245,11 @@ do
     if [ -d "${foo}" ]
     then
         %{__install} -Dp -m0644 ${foo}/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}-web/templates/${foo##*\/}
-        [ -f ${foo}/*.pl ] && %{__install} -Dp -m0644 ${foo}/*.pl $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
-%{__install} -Dp -m 0644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/
+%{__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}
@@ -359,10 +361,16 @@ exit 0
 %config(noreplace) %{_sysconfdir}/httpd/conf.d/dspam-web.conf
 
 %changelog
-* Wed Mar 3 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-7
+* Wed Mar 31 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-7
+- Fix copying files to cgi-templates directory
+
+* Wed Mar 3 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-6
 - Updated dspam initscript default start position to be after DBs
 - reset initscript priorities
 
+* Tue Feb 9 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-5
+- Bump release version to fix packaging mistake
+
 * Tue Feb 9 2010 Nathanael Noblet <nathanael at gnat.ca> - 3.9.0-4
 - Updated dspam cron file to be able to find sql purge scripts
 


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/dspam/EL-4/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	24 Jan 2010 21:23:23 -0000	1.1
+++ import.log	31 Mar 2010 21:18:33 -0000	1.2
@@ -1 +1,2 @@
 dspam-3_9_0-3_fc12:HEAD:dspam-3.9.0-3.fc12.src.rpm:1264367988
+dspam-3_9_0-7_fc12:EL-4:dspam-3.9.0-7.fc12.src.rpm:1270070274