Author: glen                         Date: Tue Feb 22 18:10:28 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system Smarty (bundled one is identical version)
- separate distribution specific config (core.php) and installation specific 
config(config.php), so it would be possible to have at least some kind of 
updates to file paths
- raise php version requirement to 4.2.0, not to create wrapper is_a() function 
in config
- allow installation with php5 (never tested altho)

---- Files affected:
SPECS:
   eventum.spec (1.53 -> 1.54) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.53 SPECS/eventum.spec:1.54
--- SPECS/eventum.spec:1.53     Tue Feb 22 17:42:27 2005
+++ SPECS/eventum.spec  Tue Feb 22 19:10:22 2005
@@ -23,7 +23,7 @@
 %define _source 
http://mysql.wildyou.net/Downloads/%{name}/%{name}-%{version}.tar.gz
 %endif
 
-%define _rel 1.153
+%define _rel 2.161
 
 Summary:       Eventum Issue - a bug tracking system
 Summary(pl):   Eventum - system śledzenia spraw/błędów
@@ -43,6 +43,7 @@
 Source7:       %{name}-irc.php
 Source8:       %{name}-irc.init
 Source9:       %{name}-irc.sysconfig
+Source10:      %{name}-config.php
 Patch0:                %{name}-paths.patch
 Patch1:                %{name}-scm-encode.patch
 Patch2:                %{name}-cvs-config.patch
@@ -60,14 +61,15 @@
 URL:           http://dev.mysql.com/downloads/other/eventum/index.html
 BuildRequires: rpmbuild(macros) >= 1.177
 BuildRequires: sed >= 4.0
-Requires:      php >= 4.1.0
+# is_a(), which wrapper we removed from config, is from 4.2.0
+Requires:      php >= 4.2.0
 Requires:      php-gd
 Requires:      php-imap
 Requires:      php-mysql
 Requires:      php-pcre
 Requires:      %{name}-base = %{epoch}:%{version}-%{release}
-%if %{with pear}
 Requires:      Smarty >= 2.6.2
+%if %{with pear}
 Requires:      php-pear-Benchmark
 Requires:      php-pear-DB
 Requires:      php-pear-Date
@@ -146,7 +148,7 @@
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
 Requires:      crondaemon
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 
 %description mail-queue
 Beginning with the first release of Eventum, emails are not directly
@@ -192,7 +194,7 @@
 Summary(pl):   System przypominania dla Eventum
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 Requires:      crondaemon
 
 %description reminder
@@ -218,7 +220,7 @@
 Summary(pl):   Monitor życia dla Eventum
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 Requires:      crondaemon
 
 %description monitor
@@ -252,7 +254,7 @@
 Summary(pl):   Przekazywanie poczty dla Eventum
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 #Requires:     eventum-router
 
 %description route-emails
@@ -278,7 +280,7 @@
 Summary(pl):   Przekazywanie notatek dla Eventum
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 #Requires:     eventum-router
 
 %description route-notes
@@ -338,10 +340,10 @@
 Summary(pl):   Interfejs linii poleceń dla Eventum
 Group:         Applications/WWW
 Requires:      %{name} = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
-Requires:      php4-cli
-Requires:      php4-curl
-Requires:      php4-xml
+Requires:      php >= 4.1.0
+Requires:      php-cli
+Requires:      php-curl
+Requires:      php-xml
 Requires:      php-pear-XML_RPC
 
 %description cli
@@ -357,7 +359,7 @@
 Summary(pl):   Integracja SCM dla Eventum
 Group:         Applications/WWW
 Requires:      %{name}-base = %{epoch}:%{version}-%{release}
-Requires:      php4 >= 4.1.0
+Requires:      php >= 4.1.0
 
 %description scm
 This feature allows your software development teams to integrate your
@@ -435,13 +437,14 @@
 install %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/irc.php
 install %{SOURCE8} $RPM_BUILD_ROOT/etc/rc.d/init.d/eventum-irc
 install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/eventum-irc
+sed -e 's,%%{APP_VERSION}%%,%{version}%{?_snap:-%{_snap}},' %{SOURCE10} > 
$RPM_BUILD_ROOT%{_sysconfdir}/core.php
 
 # in conf
 mv $RPM_BUILD_ROOT%{_appdir}/config.inc.php 
$RPM_BUILD_ROOT%{_sysconfdir}/config.php
 mv $RPM_BUILD_ROOT%{_appdir}/setup.conf.php 
$RPM_BUILD_ROOT%{_sysconfdir}/setup.php
 mv $RPM_BUILD_ROOT%{_appdir}/include/private_key.php 
$RPM_BUILD_ROOT%{_sysconfdir}
 mv $RPM_BUILD_ROOT%{_appdir}/misc/cli/config.inc.php 
$RPM_BUILD_ROOT%{_sysconfdir}/cli.php
-ln -s %{_sysconfdir}/config.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
+ln -s %{_sysconfdir}/core.php $RPM_BUILD_ROOT%{_appdir}/config.inc.php
 ln -s %{_sysconfdir}/setup.php $RPM_BUILD_ROOT%{_appdir}/setup.conf.php
 ln -s %{_sysconfdir}/private_key.php 
$RPM_BUILD_ROOT%{_appdir}/include/private_key.php
 
@@ -460,13 +463,14 @@
 # provided by PEAR
 rm -rf $RPM_BUILD_ROOT%{_appdir}/misc/cli/include/pear
 rm -rf $RPM_BUILD_ROOT%{_appdir}/include/pear
+%endif
 
 # use system Smarty
 rm -rf $RPM_BUILD_ROOT%{_appdir}/include/Smarty
 install -d $RPM_BUILD_ROOT%{_smartyplugindir}
 # These plugins are not in Smarty package (Smarty-2.6.2-3)
-cp -a 
include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php
 $RPM_BUILD_ROOT%{_smartyplugindir}
-%endif
+cp -a 
include/Smarty/plugins/function.{calendar,get_{display_style,innerhtml,textarea_size}}.php
 \
+       $RPM_BUILD_ROOT%{_smartyplugindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -552,6 +556,12 @@
        chown root:http %{_sysconfdir}/{config,private_key}.php
 fi
 
+%triggerpostun -- eventum < 2.160
+cp -f %{_sysconfdir}/config.php{,.rpmsave}
+# very loose trigger
+sed -i -e '
+/config.php/,/SQL 
variables/d;/_LOG/d;/APP_VERSION/d;/APP_BENCHMARK/,/content-type:/d' 
%{_sysconfdir}/config.php
+
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog FAQ INSTALL README UPGRADE
@@ -560,6 +570,7 @@
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/config.php
 %attr(640,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/private_key.php
 %attr(660,root,http) %config(noreplace) %verify(not md5 mtime size) 
%{_sysconfdir}/setup.php
+%attr(660,root,http) %verify(not md5 mtime size) %{_sysconfdir}/core.php
 
 %dir %{_appdir}
 %dir %{_appdir}/misc
@@ -577,11 +588,9 @@
 %{_appdir}/rpc
 %{_appdir}/templates
 
-%if %{with pear}
 %{_smartyplugindir}/*
-%else
+%if %{without pear}
 %{_appdir}/include/pear
-%{_appdir}/include/Smarty
 %endif
 
 %dir %{_appdir}/include
@@ -659,6 +668,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.54  2005/02/22 18:10:22  glen
+- use system Smarty (bundled one is identical version)
+- separate distribution specific config (core.php) and installation specific 
config(config.php), so it would be possible to have at least some kind of 
updates to file paths
+- raise php version requirement to 4.2.0, not to create wrapper is_a() 
function in config
+- allow installation with php5 (never tested altho)
+
 Revision 1.53  2005/02/22 16:42:27  glen
 - use apache virtual packages
 - add sysconfig for irc
================================================================

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


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to