SPECS: eventum.spec - drop pear bcond - always using system PEAR

[glen]

Author: glen                         Date: Tue Mar 28 18:57:13 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- drop pear bcond - always using system PEAR

---- Files affected:
SPECS:
   eventum.spec (1.161 -> 1.162) 

---- Diffs:

================================================================
Index: SPECS/eventum.spec
diff -u SPECS/eventum.spec:1.161 SPECS/eventum.spec:1.162
--- SPECS/eventum.spec:1.161	Tue Mar 28 20:49:14 2006
+++ SPECS/eventum.spec	Tue Mar 28 20:57:07 2006
@@ -9,15 +9,14 @@
 # - 64bit platforms beware? http://bugs.php.net/bug.php?id=30215 (it's actually Smarty related problem)
 #
 # Conditional build:
-%bcond_without	pear	# build with system PEAR packages (or use bundled ones)
 %bcond_with	qmail	# build the router-qmail subpackage
 #
 # snapshot: DATE
 %define	_snap 20060328
 
-%define	_rel	0.1
+%define	_rel	0.2
 
-%{?with_pear:%include	/usr/lib/rpm/macros.php}
+%include	/usr/lib/rpm/macros.php
 Summary:	Eventum Issue / Bug tracking system
 Summary(pl):	Eventum - system śledzenia spraw/błędów
 Name:		eventum
@@ -68,7 +67,7 @@
 Patch25:	%{name}-scm-pluscharisbad.patch
 Patch26:	%{name}-scm-updates.patch
 URL:		http://dev.mysql.com/downloads/other/eventum/
-%{?with_pear:BuildRequires:	rpm-php-pearprov >= 4.0.2-98}
+BuildRequires:	rpm-php-pearprov >= 4.0.2-98
 BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	sed >= 4.0
 Requires:	%{name}-base = %{version}-%{release}
@@ -79,7 +78,6 @@
 Requires:	php-mysql
 Requires:	php-pcre
 Requires:	php-session
-%if %{with pear}
 Requires:	php-pear-Benchmark
 Requires:	php-pear-DB
 Requires:	php-pear-Date
@@ -95,7 +93,6 @@
 Requires:	php-pear-PEAR-core
 Requires:	php-pear-Text_Diff
 Requires:	php-pear-XML_RPC
-%endif
 Requires(triggerpostun):	/usr/bin/php
 Requires(triggerpostun):	sed >= 4.0
 Requires:	apache(mod_dir)
@@ -485,7 +482,7 @@
 %patch1 -p1
 %patch14 -p1
 %patch2 -p1
-%{?with_pear:%patch3 -p1}
+%patch3 -p1
 
 # bug fixes.
 %patch4 -p1
@@ -581,7 +578,7 @@
 
 sed -e '
 s,%%{APP_VERSION}%%,%{version}%{?_snap:-%{_snap}},
-s,%%{PHP_PEAR_DIR}%%,%{?with_pear:%{php_pear_dir}}%{!?with_pear:%{_appdir}/includes/pear},
+s,%%{PHP_PEAR_DIR}%%,%{php_pear_dir},
 s,%%{APP_PATH}%%,%{_appdir},
 s,%%{SMARTY_DIR}%%,%{_smartydir},
 s,%%{SYSCONFDIR}%%,%{_webappdir},
@@ -591,10 +588,8 @@
 > $RPM_BUILD_ROOT%{_webappdir}/setup.php
 mv $RPM_BUILD_ROOT{%{_appdir}/htdocs/config.inc,%{_webappdir}/config}.php
 
-%if %{with pear}
 # provided by PEAR
 rm -rf $RPM_BUILD_ROOT%{_appdir}/include/pear
-%endif
 
 # use system Smarty
 rm -rf $RPM_BUILD_ROOT%{_appdir}/include/Smarty
@@ -871,16 +866,11 @@
 %{_appdir}/htdocs/reports
 %{_appdir}/htdocs/rpc
 %{_appdir}/htdocs/misc
-
 %{_appdir}/templates
 %dir %{_appdir}/upgrade
 %attr(755,root,root) %{_appdir}/upgrade/upgrade.sh
 %{_appdir}/upgrade/[!u]*
-
 %{_smartyplugindir}
-%if %{without pear}
-%{_appdir}/include/pear
-%endif
 
 %dir %{_appdir}/include
 %{_appdir}/include/customer
@@ -982,6 +972,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.162  2006/03/28 18:57:07  glen
+- drop pear bcond - always using system PEAR
+
 Revision 1.161  2006/03/28 18:49:14  glen
 - add scm updates patch
 - 20060328 snap
================================================================

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