summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <fedora@famillecollet.com>2011-12-29 07:56:21 +0100
committerRemi Collet <fedora@famillecollet.com>2011-12-29 07:56:21 +0100
commit7dcec07d9a8faea754814538bc05bea88e95ac3e (patch)
tree72ca0b6e784c5485f432b6e0c7c832b72a39166d
parent21b5843491659b3676c7d299cc5b99b86873194c (diff)
ice: link to upstream bug + fix check
-rw-r--r--ice.spec9
1 files changed, 7 insertions, 2 deletions
diff --git a/ice.spec b/ice.spec
index 0b2544d..2609f8a 100644
--- a/ice.spec
+++ b/ice.spec
@@ -40,6 +40,7 @@ Patch3: Ice-3.3-dont-build-demo-test.patch
# disable the CSharp interface
Patch4: ice-3.4.1-no-mono.patch
# PHP 5.4 compatibility
+# http://www.zeroc.com/forums/patches/5603-ice-php-php-5-4-patch.html
Patch5: ice-3.4.2-php54.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -394,8 +395,12 @@ rm -rf $RPM_BUILD_ROOT
%check
-# Minimum check for php extension
-php -n -d extension_dir=$RPM_BUILD_DIR/Ice-%{version}/php/lib -d extension=IcePHP.so -m | grep ice
+# No test provided by upstream, so
+# minimal load test for the PHP extension
+LD_LIBRARY_PATH=%{buildroot}%{_libdir} php -n \
+ -d extension_dir=%{buildroot}%{php_extdir} \
+ -d extension=IcePHP.so -m \
+ | grep ice
%files