rpms/php-pecl-pdflib/devel .cvsignore, 1.5, 1.6 php-pecl-pdflib.spec, 1.11, 1.12 sources, 1.5, 1.6 pdflib-php54.patch, 1.1, NONE

[Remi Collet]

Author: remi

Update of /cvs/nonfree/rpms/php-pecl-pdflib/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28179

Modified Files:
	.cvsignore php-pecl-pdflib.spec sources 
Removed Files:
	pdflib-php54.patch 
Log Message:
Update to 2.1.9, provide ZTS extension


Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	7 May 2010 04:42:10 -0000	1.5
+++ .cvsignore	9 Jun 2012 05:21:05 -0000	1.6
@@ -1 +1 @@
-pdflib-2.1.8.tgz
+pdflib-2.1.9.tgz


Index: php-pecl-pdflib.spec
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/php-pecl-pdflib.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- php-pecl-pdflib.spec	2 May 2012 08:36:49 -0000	1.11
+++ php-pecl-pdflib.spec	9 Jun 2012 05:21:05 -0000	1.12
@@ -1,6 +1,7 @@
 %{!?__pecl:     %{expand: %%global __pecl     %{_bindir}/pecl}}
+%{!?php_inidir: %{expand: %%global php_inidir %{_sysconfdir}/php.d}}
 %{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}
-%{!?php_apiver: %{expand: %%global php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
+%{!?php_apiver: %{expand: %%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)}}
 
 %global pecl_name pdflib
 %global extname   pdf
@@ -8,19 +9,15 @@
 Summary:        Package for generating PDF files
 Summary(fr):    Extension pour générer des fichiers PDF
 Name:           php-pecl-pdflib
-Version:        2.1.8
-Release:        4%{?dist}
+Version:        2.1.9
+Release:        1%{?dist}
 License:        PHP
 Group:          Development/Languages
 URL:            http://pecl.php.net/package/pdflib
 
 Source:         http://pecl.php.net/get/pdflib-%{version}.tgz
-
 Source2:        xml2changelog
 
-# https://bugs.php.net/60397 php 5.4 build
-Patch0:         pdflib-php54.patch
-
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  php-devel, pdflib-lite-devel, php-pear
 
@@ -62,8 +59,6 @@
 %setup -c -q
 %{_bindir}/php -n %{SOURCE2} package.xml >CHANGELOG
 
-%patch0 -p0 -b .php54
-
 # Check version
 extver=$(sed -n '/#define PHP_PDFLIB_VERSION/{s/.* "//;s/".*$//;p}' %{pecl_name}-%{version}/php_pdflib.h)
 if test "x${extver}" != "x%{version}"; then
@@ -71,38 +66,59 @@
    exit 1
 fi
 
+cp -pr %{pecl_name}-%{version} %{pecl_name}-zts
+
+# Create the config file
+cat > %{extname}.ini << 'EOF'
+; Enable PDFlib extension module
+extension=%{extname}.so
+EOF
+
 
 %build
-cd pdflib-%{version}
-phpize
-%configure
+cd %{pecl_name}-%{version}
+%{_bindir}/phpize
+%configure --with-php-config=%{_bindir}/php-config
+make %{?_smp_mflags}
+
+%if 0%{?__ztsphp:1}
+cd ../%{pecl_name}-zts
+%{_bindir}/zts-phpize
+%configure --with-php-config=%{_bindir}/zts-php-config
 make %{?_smp_mflags}
+%endif
 
 
 %install
-cd pdflib-%{version}
 rm -rf %{buildroot}
-make install INSTALL_ROOT=%{buildroot}
+
+make -C %{pecl_name}-%{version} install-modules INSTALL_ROOT=%{buildroot}
 
 # Drop in the bit of configuration
-mkdir -p %{buildroot}%{_sysconfdir}/php.d
-cat > %{buildroot}%{_sysconfdir}/php.d/%{extname}.ini << 'EOF'
-; Enable PDFlib extension module
-extension=%{extname}.so
-EOF
+install -D -m 644 %{extname}.ini %{buildroot}%{php_inidir}/%{extname}.ini
 
 # Install XML package description
-mkdir -p %{buildroot}%{pecl_xmldir}
-install -m 644 ../package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+
+%if 0%{?__ztsphp:1}
+make -C %{pecl_name}-zts        install-modules INSTALL_ROOT=%{buildroot}
+install -D -m 644 %{extname}.ini %{buildroot}%{php_ztsinidir}/%{extname}.ini
+%endif
 
 
 %check
-cd %{pecl_name}-%{version}
-php -n \
-    -d extension_dir=modules \
+%{_bindir}/php -n \
+    -d extension_dir=%{pecl_name}-%{version}/modules \
     -d extension=%{extname}.so \
     -m | grep %{extname}
 
+%if 0%{?__ztsphp:1}
+%{__ztsphp} -n \
+    -d extension_dir=%{pecl_name}-zts/modules \
+    -d extension=%{extname}.so \
+    -m | grep %{extname}
+%endif
+
 
 %if 0%{?pecl_install:1}
 %post
@@ -124,13 +140,22 @@
 
 %files
 %defattr(-, root, root, -)
-%doc CHANGELOG pdflib-%{version}/CREDITS
-%config(noreplace) %{_sysconfdir}/php.d/%{extname}.ini
+%doc CHANGELOG %{pecl_name}-%{version}/CREDITS
+%config(noreplace) %{php_inidir}/%{extname}.ini
 %{php_extdir}/%{extname}.so
 %{pecl_xmldir}/%{name}.xml
 
+%if 0%{?__ztsphp:1}
+%config(noreplace) %{php_ztsinidir}/%{extname}.ini
+%{php_ztsextdir}/%{extname}.so
+%endif
+
 
 %changelog
+* Sat Jun 09 2012 Remi Collet <RPMS at FamilleCollet.com> 2.1.9-1
+- update to 2.1.9
+- add ZTS extension
+
 * Wed May 02 2012 Remi Collet <rpmfusion at FamilleCollet.com> 2.1.8-4
 - add patch for php 5.4
 - fix filter for private .so


Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/php-pecl-pdflib/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	7 May 2010 04:42:10 -0000	1.5
+++ sources	9 Jun 2012 05:21:05 -0000	1.6
@@ -1 +1 @@
-ee1b7c30b68b2caba8a95ef9a45e9b84  pdflib-2.1.8.tgz
+04b4e0a2a8731c5f087f40620aca4ddf  pdflib-2.1.9.tgz


--- pdflib-php54.patch DELETED ---