Author: glen Date: Wed Dec 21 00:22:53 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - 20051220 snap - use system PEAR (finally possible) - do not require any specific php version
---- Files affected: SPECS: eventum.spec (1.131 -> 1.132) ---- Diffs: ================================================================ Index: SPECS/eventum.spec diff -u SPECS/eventum.spec:1.131 SPECS/eventum.spec:1.132 --- SPECS/eventum.spec:1.131 Sun Dec 11 20:38:31 2005 +++ SPECS/eventum.spec Wed Dec 21 01:22:47 2005 @@ -1,7 +1,5 @@ # $Revision$, $Date$ # TODO -# - system pear is incompatible, at least pear DB class seems broke Eventum -# - php5 is not tested, but not placing hard conflict on it, as it prevents php4 & php coinstallation # - discard bundled packages (from INSTALL): # - JpGraph 1.5.3 (last GPL version) # - dTree 2.0.5 (http://www.destroydrop.com/javascript/tree/) @@ -10,16 +8,16 @@ # - A few other small javascript libraries # - 64bit platforms beware? http://bugs.php.net/bug.php?id=30215 (it's actually Smarty related problem) -%bcond_with pear # build with system PEAR packages (or use bundled ones) +%bcond_without pear # build with system PEAR packages (or use bundled ones) %bcond_with qmail # build the router-qmail subpackage # snapshot: DATE -%define _snap 20051209 +%define _snap 20051220 # release candidate #define _rc RC1 -%define _rel 4.28 +%define _rel 4.40 %if 0%{?_rc:1} %define _source http://pessoal.org/%{name}-%{version}-%{_rc}.tar.gz @@ -31,6 +29,7 @@ %endif %endif +%{?with_pear:%include /usr/lib/rpm/macros.php} Summary: Eventum Issue / Bug tracking system Summary(pl): Eventum - system śledzenia spraw/błędów Name: eventum @@ -39,7 +38,7 @@ License: GPL Group: Applications/WWW Source0: %{_source} -# Source0-md5: 439586216294bfb6f949b5fd057b0fe0 +# Source0-md5: c5b20fbfc2fdb5da490f6acac8897818 Source1: %{name}-apache.conf Source2: %{name}-mail-queue.cron Source3: %{name}-mail-download.cron @@ -68,16 +67,17 @@ Patch11: %{name}-php440.patch Patch12: %{name}-htmloptions-truncate.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: php >= 3:4.2.0 +Requires: %{name}-base = %{epoch}:%{version}-%{release} +Requires: Smarty >= 2.6.2 Requires: php-gd Requires: php-imap Requires: php-mysql Requires: php-pcre Requires: php-session -Requires: %{name}-base = %{epoch}:%{version}-%{release} -Requires: Smarty >= 2.6.2 +Requires: php >= 3:4.2.0 %if %{with pear} Requires: php-pear-Benchmark Requires: php-pear-DB @@ -86,26 +86,28 @@ Requires: php-pear-Mail Requires: php-pear-Math_Stats Requires: php-pear-Net_DIME -Requires: php-pear-Net_POP3 Requires: php-pear-Net_SMTP Requires: php-pear-Net_Socket Requires: php-pear-Net_URL Requires: php-pear-Net_UserAgent_Detect -Requires: php-pear-PEAR +Requires: php-pear-PEAR-core Requires: php-pear-Text_Diff Requires: php-pear-XML_RPC +#Suggests: php-pear-Net_POP3 %endif +Requires(triggerpostun): sed >= 4.0 +Requires: apache(mod_dir) Requires: webapps Requires: webserver = apache -Requires: apache(mod_dir) -Requires(triggerpostun): sed >= 4.0 -Conflicts: apache1 < 1.3.33-2 BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _noautoreq 'pear(/etc/webapps/.*)' 'pear(jpgraph_dir.php)' 'pear(.*Smarty.class.php)' 'pear(Net/POP3.php)' + %define _libdir %{_prefix}/lib/%{name} %define _appdir %{_datadir}/%{name} %define _smartyplugindir %{_appdir}/include/smarty +%define _smartydir /usr/share/php/Smarty %define _webapps /etc/webapps %define _webapp %{name} %define _sysconfdir %{_webapps}/%{_webapp} @@ -129,12 +131,12 @@ Summary: Eventum base package Summary(pl): Podstawowy pakiet Eventum Group: Applications/WWW +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Requires(pre): /bin/id Requires(pre): /usr/bin/getgid -Requires(pre): /usr/sbin/useradd Requires(pre): /usr/sbin/groupadd -Requires(postun): /usr/sbin/userdel -Requires(postun): /usr/sbin/groupdel +Requires(pre): /usr/sbin/useradd Provides: user(eventum) Provides: group(eventum) @@ -235,8 +237,8 @@ Summary(pl): Monitor życia dla Eventum Group: Applications/WWW Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: php-posix Requires: crondaemon +Requires: php-posix %description monitor The heartbeat monitor is a feature designed for the administrator that @@ -356,8 +358,8 @@ Group: Applications/WWW Requires(triggerpostun): sed >= 4.0 Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: php-sockets #Requires: php-pear-Net_SmartIRC +Requires: php-sockets Requires: rc-scripts >= 0.4.0.18 %description irc @@ -389,11 +391,11 @@ Summary(pl): Interfejs linii poleceń dla Eventum Group: Applications/WWW Requires: %{name}-base = %{epoch}:%{version}-%{release} -Requires: php-common >= 3:4.1.0 Requires: php-cli +Requires: php-common >= 3:4.1.0 Requires: php-curl -Requires: php-xml Requires: php-pear-XML_RPC +Requires: php-xml %description cli The Eventum command-line interface allows you to access most of the @@ -408,8 +410,8 @@ Summary(pl): Integracja SCM dla Eventum Group: Applications/WWW Requires: %{name}-base = %{epoch}:%{version}-%{release} -Requires: php-common >= 3:4.1.0 Requires: php-cli +Requires: php-common >= 3:4.1.0 Requires: php-pcre %description scm @@ -498,12 +500,12 @@ 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}/php4,' \ +sed -e '1s,#!.*/bin/php,#!%{_bindir}/php,' \ misc/cli/eventum > $RPM_BUILD_ROOT%{_bindir}/%{name} cp -f misc/cli/eventumrc_example eventumrc # scm -echo '#!%{_bindir}/php4 -q' > %{name}-scm +echo '#!%{_bindir}/php' > %{name}-scm cat misc/scm/process_cvs_commits.php >> %{name}-scm install %{name}-scm $RPM_BUILD_ROOT%{_libdir}/scm @@ -524,8 +526,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 + +sed -e ' +s,%%{APP_VERSION}%%,%{version}%{?_snap:-%{_snap}}, +s,%%{PHP_PEAR_DIR}%%,%{?with_pear:%{php_pear_dir}}%{!?with_pear:%{_appdir}/includes/pear}, +s,%%{APP_PATH}%%,%{_appdir}, +s,%%{SMARTY_DIR}%%,%{_smartydir}, +s,%%{SYSCONFDIR}%%,%{_sysconfdir}, +' %{SOURCE10} > $RPM_BUILD_ROOT%{_sysconfdir}/core.php # config > $RPM_BUILD_ROOT%{_sysconfdir}/setup.php @@ -925,6 +933,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.132 2005/12/21 00:22:47 glen +- 20051220 snap +- use system PEAR (finally possible) +- do not require any specific php version + Revision 1.131 2005/12/11 19:38:31 glen - adapterized (evil source of PreReq) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/eventum.spec?r1=1.131&r2=1.132&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
