SPECS: eventum.spec - use /usr/bin/php virtual, let rpm autogenera...

Wed Dec 28 00:32:57 CET 2005

Author: glen                         Date: Tue Dec 27 23:32:57 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use /usr/bin/php virtual, let rpm autogenerate where possible

---- Files affected:
SPECS:
   eventum.spec (1.133 -> 1.134) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.133 SPECS/eventum.spec:1.134

--- SPECS/eventum.spec:1.133	Wed Dec 21 17:10:23 2005
+++ SPECS/eventum.spec	Wed Dec 28 00:32:52 2005
@@ -12,12 +12,12 @@
 %bcond_with	qmail	# build the router-qmail subpackage
 
 # snapshot: DATE
-%define	_snap 20051221
+%define	_snap 20051227
 
 # release candidate
 #define _rc		RC1
 
-%define	_rel	4.42
+%define	_rel	4.45
 
 %if 0%{?_rc:1}
 %define	_source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz
@@ -38,7 +38,7 @@
 License:	GPL
 Group:		Applications/WWW
 Source0:	%{_source}
-# Source0-md5:	96b6fa8fb2e288a6b2121ac24128da5a
+# Source0-md5:	37185deab6f5a1e388800e1fe182e64c
 Source1:	%{name}-apache.conf
 Source2:	%{name}-mail-queue.cron
 Source3:	%{name}-mail-download.cron
@@ -67,18 +67,19 @@
 Patch10:	%{name}-cli-wr-separated.patch
 Patch11:	%{name}-php440.patch
 Patch12:	%{name}-htmloptions-truncate.patch
+Patch13:	http://glen.alkohol.ee/pld/%{name}-link_filter-updates.patch
 URL:		http://dev.mysql.com/downloads/other/eventum/
 %{?with_pear:BuildRequires:	rpm-php-pearprov >= 4.0.2-98}
 BuildRequires:	rpmbuild(macros) >= 1.223
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-base = %{epoch}:%{version}-%{release}
 Requires:	Smarty >= 2.6.2
+Requires:	php >= 3:4.2.0
 Requires:	php-gd
 Requires:	php-imap
 Requires:	php-mysql
 Requires:	php-pcre
 Requires:	php-session
-Requires:	php >= 3:4.2.0
 %if %{with pear}
 Requires:	php-pear-Benchmark
 Requires:	php-pear-DB
@@ -96,6 +97,7 @@
 Requires:	php-pear-XML_RPC
 #Suggests:	php-pear-Net_POP3
 %endif
+Requires(triggerpostun):	/usr/bin/php
 Requires(triggerpostun):	sed >= 4.0
 Requires:	apache(mod_dir)
 Requires:	webapps
@@ -138,8 +140,8 @@
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/groupadd
 Requires(pre):	/usr/sbin/useradd
-Provides:	user(eventum)
 Provides:	group(eventum)
+Provides:	user(eventum)
 
 %description base
 This package contains base directory structure for Eventum.
@@ -168,6 +170,7 @@
 Summary(pl):	Przetwarzanie kolejki poczty Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	crondaemon
 
 %description mail-queue
@@ -193,6 +196,7 @@
 Summary(pl):	Ściąganie poczty Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	crondaemon
 
 %description mail-download
@@ -213,6 +217,7 @@
 Summary(pl):	System przypominania dla Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	crondaemon
 
 %description reminder
@@ -238,6 +243,7 @@
 Summary(pl):	Monitor życia dla Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	crondaemon
 Requires:	php-posix
 
@@ -272,6 +278,7 @@
 Summary(pl):	Przekazywanie poczty dla Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	eventum(router)
 
 %description route-emails
@@ -297,6 +304,7 @@
 Summary(pl):	Przekazywanie notatek dla Eventum
 Group:		Applications/WWW
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 Requires:	eventum(router)
 
 %description route-notes
@@ -359,6 +367,7 @@
 Group:		Applications/WWW
 Requires(triggerpostun):	sed >= 4.0
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	/usr/bin/php
 #Requires:	php-pear-Net_SmartIRC
 Requires:	php-sockets
 Requires:	rc-scripts >= 0.4.0.18
@@ -445,6 +454,9 @@
 rm -rf misc/upgrade/*v1.[123]* # too old to support in PLD
 rm -rf misc/upgrade/flush_compiled_templates.php
 
+sed -e '1s,#!.*/bin/php -q,#!%{_bindir}/php,' misc/cli/eventum > %{name}-cli
+sed -e '1i#!%{_bindir}/php' misc/scm/process_cvs_commits.php > %{name}-scm
+
 # using system package
 #rm -rf include/pear/Net/SmartIRC*
 
@@ -464,6 +476,7 @@
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 
 # replace in remaining scripts config.inc.php to system one
 grep -rl 'include_once(".*config.inc.php")' . | xargs sed -i -e '
@@ -502,13 +515,10 @@
 install -d $RPM_BUILD_ROOT%{_appdir}/cli
 install misc/cli/include/class.{misc,command_line}.php $RPM_BUILD_ROOT%{_appdir}/cli
 install misc/cli/config.inc.php $RPM_BUILD_ROOT%{_sysconfdir}/cli.php
-sed -e '1s,#!.*/bin/php,#!%{_bindir}/php,' \
-	misc/cli/eventum > $RPM_BUILD_ROOT%{_bindir}/%{name}
+install %{name}-cli $RPM_BUILD_ROOT%{_bindir}/%{name}
 cp -f misc/cli/eventumrc_example eventumrc
 
 # scm
-echo '#!%{_bindir}/php' > %{name}-scm
-cat misc/scm/process_cvs_commits.php >> %{name}-scm
 install %{name}-scm $RPM_BUILD_ROOT%{_libdir}/scm
 
 # private key
@@ -937,6 +947,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.134  2005/12/27 23:32:52  glen
+- use /usr/bin/php virtual, let rpm autogenerate where possible
+
 Revision 1.133  2005/12/21 16:10:23  glen
 - package routed drafts and notes dirs
 - prevent world writable files and dirs being created
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.133&r2=1.134&f=u

