SPECS: eventum.spec - order patch now works somewhat

glen glen at pld-linux.org
Wed Oct 29 16:40:51 CET 2008


Author: glen                         Date: Wed Oct 29 15:40:51 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- order patch now works somewhat

---- Files affected:
SPECS:
   eventum.spec (1.293 -> 1.294) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.293 SPECS/eventum.spec:1.294
--- SPECS/eventum.spec:1.293	Tue Oct 28 21:24:01 2008
+++ SPECS/eventum.spec	Wed Oct 29 16:40:46 2008
@@ -9,11 +9,11 @@
 #
 # Conditional build:
 %bcond_with	qmail	# build the router-qmail subpackage
-%bcond_with	order	# with experimental order patch
+%bcond_without	order	# with experimental order patch
 
 #define	snap	20060921
 %define	svn		r3765
-%define	rel		0.46
+%define	rel		0.52
 #define	_rc		RC3
 
 %include	/usr/lib/rpm/macros.php
@@ -43,6 +43,8 @@
 Source13:	%{name}-router-postfix.sh
 Source14:	%{name}.logrotate
 Source15:	%{name}-lighttpd.conf
+Source16:	http://glen.alkohol.ee/pld/eventum/updown.gif
+# Source16-md5:	6ad017595c70112a29eb553460ff7054
 Patch0:		%{name}-lf.patch
 Patch2:		%{name}-order.patch
 # packaging patches that probably never go upstream
@@ -474,6 +476,8 @@
 %patch0 -p1
 %{?with_order:%patch2 -p1}
 
+cp -a %{SOURCE16} images
+
 #%patch200 -p1
 
 # packaging
@@ -517,7 +521,7 @@
 	$RPM_BUILD_ROOT/var/lib/%{name}/routed_{emails,drafts,notes} \
 	$RPM_BUILD_ROOT%{_appdir}/{include,htdocs/misc,upgrade} \
 
-cp -a *.php css customer images js manage reports rpc setup $RPM_BUILD_ROOT%{_appdir}/htdocs
+cp -a *.php css customer images js manage reports rpc setup %{?with_order:ajax} $RPM_BUILD_ROOT%{_appdir}/htdocs
 cp -a misc/*.html $RPM_BUILD_ROOT%{_appdir}/htdocs/misc
 cp -a misc/*.php $RPM_BUILD_ROOT%{_appdir}
 cp -a templates $RPM_BUILD_ROOT%{_appdir}
@@ -791,6 +795,9 @@
 %{_appdir}/htdocs/reports
 %{_appdir}/htdocs/rpc
 %{_appdir}/htdocs/misc
+%if %{with order}
+%{_appdir}/htdocs/ajax
+%endif
 %{_appdir}/templates
 
 %dir %{_appdir}/upgrade
@@ -902,6 +909,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.294  2008/10/29 15:40:46  glen
+- order patch now works somewhat
+
 Revision 1.293  2008/10/28 20:24:01  glen
 - update to r3765; dow configurable from prefs now
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/eventum.spec?r1=1.293&r2=1.294&f=u



More information about the pld-cvs-commit mailing list