rpms/php-idn/F-12 .cvsignore, 1.3, 1.4 php-idn.spec, 1.9, 1.10 sources, 1.3, 1.4 idn-php53.patch, 1.1, NONE

[Robert Scheck]

Author: robert

Update of /cvs/extras/rpms/php-idn/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4761/F-12

Modified Files:
	.cvsignore php-idn.spec sources 
Removed Files:
	idn-php53.patch 
Log Message:
Upgrade to 1.2c (includes a minor fix for the 1.2 release)



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/php-idn/F-12/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	24 Nov 2006 19:37:06 -0000	1.3
+++ .cvsignore	6 Apr 2010 21:42:46 -0000	1.4
@@ -1 +1 @@
-idn_1.2b.tar.gz
+idn_1.2c.tar.gz


Index: php-idn.spec
===================================================================
RCS file: /cvs/extras/rpms/php-idn/F-12/php-idn.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- php-idn.spec	31 Jul 2009 06:59:38 -0000	1.9
+++ php-idn.spec	6 Apr 2010 21:42:46 -0000	1.10
@@ -1,25 +1,25 @@
-%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}
+%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
 
 Summary:	PHP API for GNU LibIDN
 Name:		php-idn
-Version:	1.2
-Release:	7%{?dist}
+Version:	1.2c
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		Development/Languages
-Source0:	http://php-idn.bayour.com/idn_%{version}b.tar.gz
+Source0:	http://php-idn.bayour.com/idn_%{version}.tar.gz
 Source1:	idn.ini
-
-Patch0:		idn-php53.patch
-
 URL:		http://php-idn.bayour.com/
 BuildRequires:	php-devel >= 4.3.0, libidn-devel >= 0.4.0, autoconf, automake, libtool
-%if %{?php_zend_api}0
-Requires:	php(zend-abi) = %{php_zend_api}
-Requires:	php(api) = %{php_core_api}
+%if 0%{?rhel}%{?fedora} > 4
+%if 0%{?php_zend_api}
+Requires:	php(zend-abi) = %{php_zend_api}, php(api) = %{php_core_api}
 %else
 Requires:	php-api = %{php_apiver}
 %endif
+%if 0%{?php_zend_api} >= 20090626
+Requires:	php-intl
+%endif
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,10 +28,7 @@ made by Simon Josefsson. It's intention 
 have international characters in the DNS system.
 
 %prep
-%setup -q -n idn-%{version}b
-
-%patch0 -p1 -b .php53
-
+%setup -q -n idn-%{version}
 export PHP_RPATH=no
 phpize
 %configure
@@ -42,18 +39,25 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install-modules INSTALL_ROOT=$RPM_BUILD_ROOT
-install -D -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/idn.ini
+install -D -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/php.d/idn.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
-%doc CHANGES CREDITS GPL README.documentation THANX_TO idn.php
-%{php_extdir}/idn.so
+%defattr(-,root,root,-)
+%doc CHANGES COPYRIGHT CREDITS README.documentation THANX_TO idn.php
+%if 0%{?rhel}%{?fedora} > 4
+%{_libdir}/php/modules/idn.so
+%else
+%{_libdir}/php4/idn.so
+%endif
 %config(noreplace) %{_sysconfdir}/php.d/idn.ini
 
 %changelog
+* Tue Apr 06 2010 Robert Scheck <robert at fedoraproject.org> 1.2c-1
+- Upgrade to 1.2c (includes a minor fix for the 1.2 release)
+
 * Fri Jul 31 2009 Remi Collet <Fedora at FamilleCollet.com> 1.2-7
 - rebuild for new PHP 5.3.0 ABI (20090626)
 - better PHP ABI check


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/php-idn/F-12/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	24 Nov 2006 19:37:06 -0000	1.3
+++ sources	6 Apr 2010 21:42:47 -0000	1.4
@@ -1 +1 @@
-518ed0ee59c901987096599af58f4530  idn_1.2b.tar.gz
+d47be0c38ad91e6464e599825b82e6b0  idn_1.2c.tar.gz


--- idn-php53.patch DELETED ---