packages: php-xhp/php-xhp.spec - package xhp_preprocess.hpp in a way hiphop...

[glen]

Author: glen                         Date: Mon Jul 25 17:37:32 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- package xhp_preprocess.hpp in a way hiphop-php wants it

---- Files affected:
packages/php-xhp:
   php-xhp.spec (1.16 -> 1.17) 

---- Diffs:

================================================================
Index: packages/php-xhp/php-xhp.spec
diff -u packages/php-xhp/php-xhp.spec:1.16 packages/php-xhp/php-xhp.spec:1.17
--- packages/php-xhp/php-xhp.spec:1.16	Mon Jul 25 19:26:52 2011
+++ packages/php-xhp/php-xhp.spec	Mon Jul 25 19:37:27 2011
@@ -14,7 +14,7 @@
 Summary:	Inline XML For PHP
 Name:		php-%{modname}
 Version:	1.3.9
-Release:	4
+Release:	5
 License:	PHP 3.01
 Group:		Development/Languages/PHP
 Source0:	http://github.com/facebook/xhp/tarball/%{version}/%{name}-%{version}.tar.gz
@@ -92,7 +92,6 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
-	INSTALL_HEADERS=xhp/xhp_preprocess.hpp \
 	EXTENSION_DIR=%{php_extensiondir} \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
@@ -105,8 +104,10 @@
 install -d $RPM_BUILD_ROOT%{php_data_dir}/xhp
 cp -a php-lib/* $RPM_BUILD_ROOT%{php_data_dir}/xhp
 
-install -d $RPM_BUILD_ROOT%{_libdir}
+# files used by hiphop-php
+install -d $RPM_BUILD_ROOT{%{_libdir},%{_includedir}}
 ln -s %{php_extensiondir}/libxhp.so $RPM_BUILD_ROOT%{_libdir}/libxhp.so
+cp -p xhp/xhp_preprocess.hpp $RPM_BUILD_ROOT%{_includedir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -128,8 +129,7 @@
 
 %files devel
 %defattr(644,root,root,755)
-%dir %{_includedir}/php/xhp
-%{_includedir}/php/xhp/xhp_preprocess.hpp
+%{_includedir}/xhp_preprocess.hpp
 %{_libdir}/libxhp.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -138,6 +138,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.17  2011/07/25 17:37:27  glen
+- package xhp_preprocess.hpp in a way hiphop-php wants it
+
 Revision 1.16  2011/07/25 17:26:52  glen
 - package -lxhp
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-xhp/php-xhp.spec?r1=1.16&r2=1.17&f=u