rpms/php-json/devel php-json.spec,1.5,1.6 needs.rebuild,1.1,NONE

[Brandon Holbrook (static)]

Author: static

Update of /cvs/extras/rpms/php-json/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31264

Modified Files:
	php-json.spec 
Removed Files:
	needs.rebuild 
Log Message:
New Maintainer, new PHP macros



Index: php-json.spec
===================================================================
RCS file: /cvs/extras/rpms/php-json/devel/php-json.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- php-json.spec	13 Apr 2006 09:14:14 -0000	1.5
+++ php-json.spec	4 Sep 2006 23:00:45 -0000	1.6
@@ -1,10 +1,9 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 4.3.11)}
-%define php_apiver %({ phpize --version || echo "PHP Api Version: 0" ; } | grep -i "php api" | sed 's/[^0-9]//g')
+%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%global php_extdir	%(php-config --extension-dir 2>/dev/null || echo "undefined")
 
 Name:           php-json
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 Summary:        An extremely fast PHP extension for JSON
 
 Group:          Development/Languages
@@ -32,11 +31,10 @@
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{php_extdir}
-install -p -m 0755 modules/json.so $RPM_BUILD_ROOT%{php_extdir}
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/php.d
-cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/json.ini << EOF
+rm -rf %{buildroot}
+install -D -p -m 0755 modules/json.so %{buildroot}%{php_extdir}/json.so
+mkdir -p %{buildroot}%{_sysconfdir}/php.d
+cat > %{buildroot}%{_sysconfdir}/php.d/json.ini << EOF
 ; Enable json extension module
 extension=json.so
 EOF
@@ -55,7 +53,7 @@
 }
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
@@ -64,6 +62,10 @@
 %{php_extdir}/json.so
 
 %changelog
+* Mon Sep  4 2006 Brandon Holbrook <fedora at theholbrooks.org> 1.2.1-3
+- New Maintainer
+- New FE php macros
+
 * Thu Apr 13 2006 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.2.1-1
 - Upstream update
 - Added Requires on php-api (#186903)


--- needs.rebuild DELETED ---