X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLCAPI.spec;h=51a5ba87d5127ba8a22ee157b34be2d081a21878;hb=69315814e7db26dffacea0d905b868fd51f44bcf;hp=95103e162f88100bd7223db142aee174abe101b6;hpb=577d466866021e7ab7f17560c70da9bafd018fc6;p=plcapi.git

diff --git a/PLCAPI.spec b/PLCAPI.spec
index 95103e1..51a5ba8 100644
--- a/PLCAPI.spec
+++ b/PLCAPI.spec
@@ -1,7 +1,7 @@
 Summary: PlanetLab Central API
 Name: PLCAPI
 Version: 4.0
-Release: 1
+Release: 1%{?pldistro:.%{pldistro}}%{?date:.%{date}}
 License: PlanetLab
 Group: System Environment/Daemons
 URL: http://cvs.planet-lab.org/cvs/new_plc_api
@@ -10,6 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Obsoletes: plcapilib
 
+# Standard xmlrpc.so that ships with PHP does not marshal NULL
+Obsoletes: php-xmlrpc
+Provides: php-xmlrpc
+
 # OpenJade does not honor XML catalog files and tries to access
 # www.oasis-open.org even if DTDs are locally installed. Disable
 # documentation generation for now.
@@ -29,7 +33,7 @@ through Apache mod_python.
 %build
 # Build __init__.py metafiles and PHP API. Do not build documentation
 # for now.
-%{__make} %{?_smp_mflags} SUBDIRS=php
+%{__make} %{?_smp_mflags} SUBDIRS="php php/xmlrpc"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +43,12 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 ln -s %{_datadir}/plc_api/Shell.py $RPM_BUILD_ROOT/%{_bindir}/plcsh
 
+mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/php.d
+cat > $RPM_BUILD_ROOT/%{_sysconfdir}/php.d/xmlrpc.ini <<EOF
+; Enable xmlrpc extension module
+extension=xmlrpc.so
+EOF
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -48,6 +58,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/plc_api
 %{_datadir}/plc_api/*
 %{_bindir}/plcsh
+%{_libdir}/php/modules/xmlrpc.so
+%{_sysconfdir}/php.d/xmlrpc.ini
 
 %changelog
 * Fri Oct 27 2006 Mark Huang <mlhuang@CS.Princeton.EDU> -