[php-pecl-runkit] New upstream url - https://bugs.php.net/bug.php?id=61189, continue developing, new version, switch t

Pavel Alexeev hubbitus at fedoraproject.org
Thu Sep 6 14:21:07 UTC 2012


commit bed6a88a5519eb3bf5edd9a7d7d0ad488c3e406f
Author: Pavel Alexeev (aka Pahan-Hubbitus) <pahan at hubbitus.info>
Date:   Thu Sep 6 18:21:11 2012 +0400

    New upstream url - https://bugs.php.net/bug.php?id=61189, continue developing, new version, switch to git SCM.
    
    - Fix compilation error: https://github.com/zenovich/runkit/issues/26#issuecomment-8268795

 .gitignore                               |    1 +
 php-pecl-runkit-0.9-ZVAL_ADDREF.patch    |   49 -------
 php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch  |   13 --
 php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch |  214 ------------------------------
 php-pecl-runkit.spec                     |   42 +++----
 sources                                  |    2 +-
 6 files changed, 19 insertions(+), 302 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 22edb20..73192c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 runkit-0.9-CVS20090215.tar.bz2
+/runkit-1.0.4-GIT8c73eaf.tar.bz2
diff --git a/php-pecl-runkit.spec b/php-pecl-runkit.spec
index dca5753..4026543 100644
--- a/php-pecl-runkit.spec
+++ b/php-pecl-runkit.spec
@@ -2,7 +2,7 @@
 %{!?__pecl:			%{expand:	%%global __pecl	%{_bindir}/pecl}}
 %{!?php_extdir:		%{expand:	%%global php_extdir	%(php-config --extension-dir &>/dev/null)}}
 
-%global		CVS	20090215
+%global		GIT	8c73eaf
 
 %global		peclName	runkit
 
@@ -10,18 +10,21 @@ Summary:		Mangle with user defined functions and classes
 Summary(ru):	Манипулирование пользовательскими функциями и классами
 Summary(pl):	Obróbka zdefiniowanych przez użytkownika funkcji i klas
 Name:		php-pecl-%{peclName}
-Version:		0.9
-Release:		16%{?CVS:.CVS%{CVS}}%{?dist}
+Version:		1.0.4
+Release:		0.1%{?GIT:.GIT%{GIT}}%{?dist}
 License:		PHP
 Group:		Development/Libraries
-%if 0%{?CVS:1}
-# cvs -d :pserver:cvsread at cvs.php.net/repository export -D 2009-02-15 pecl/runkit ; tar cjf runkit-0.9-CVS20090215.tar.bz2 -C pecl runkit
-Source0:		%{peclName}-%{version}-CVS%{CVS}.tar.bz2
+%if 0%{?GIT:1}
+# git clone https://github.com/zenovich/runkit.git
+# cd runkit
+# git archive master | bzip2 > runkit-1.0.4-GIT$(git reflog | cut -d' ' -f1).tar.bz2
+Source0:		%{peclName}-%{version}-GIT%{GIT}.tar.bz2
 %else
 Source0:		http://pecl.php.net/get/%{peclName}-%{version}.tgz
 %endif
-# Source0-md5:	05a690f04b7d2c42193f3e0c1bb99a19
-URL:			http://pecl.php.net/package/runkit/
+#URL:			http://pecl.php.net/package/runkit/
+# New upstream URL - https://bugs.php.net/bug.php?id=61189
+URL:			https://github.com/zenovich/runkit
 BuildRequires:	php-pear >= 1:1.4.9-1.2
 BuildRequires:	php-devel >= 5.1.0, php-cli
 %if 0%{?pecl_install:1}
@@ -38,10 +41,6 @@ Requires:		php-api = %{php_apiver}
 %endif
 Provides:		php-pecl(%{peclName}) = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root-%(id -u -n)
-# 3 my patches for bug: http://pecl.php.net/bugs/bug.php?id=15969
-Patch0:		php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch
-Patch1:		php-pecl-runkit-0.9-ZVAL_ADDREF.patch
-Patch3:		php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch
 
 # RPM 4.8
 %{?filter_provides_in: %filter_provides_in %{php_extdir}/.*\.so$}
@@ -68,24 +67,13 @@ ogólnego użytku. Wykonywanie danego kodu w ograniczonym środowisku
 
 %prep
 %setup -q -c
-cd %{peclName}
-
-# Patch set intended only for PHP version greater than 5.3.0
-%if %( php -r "echo (version_compare(PHP_VERSION, '5.3.0', '>=') ? 1 : 0);" 2>/dev/null || echo 0 )
-%patch0 -p2 -b .zrefcount
-%patch1 -p2 -b .zaddref
-%patch3 -p2 -b .new_refcount
-%endif
 
 %build
-cd %{peclName}
 phpize
 %configure --enable-%{peclName} --with-%{peclName}
 make
 
 %install
-cd %{peclName}
-
 rm -rf %{buildroot}
 install -d %{buildroot}{%{_sysconfdir}/php.d,%{php_extdir}}
 
@@ -98,7 +86,7 @@ EOF
 
 # Install XML package description
 install -m 0755 -d %{buildroot}%{pecl_xmldir}
-install -m 0664 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+install -m 0664 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
 
 %post
 %if 0%{?pecl_install:1}
@@ -117,12 +105,16 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc %{peclName}/README
+%doc README LICENSE
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.d/%{peclName}.ini
 %{pecl_xmldir}/%{name}.xml
 %attr(755,root,root) %{php_extdir}/%{peclName}.so
 
 %changelog
+* Mon Sep 3 2012 Pavel Alexeev <Pahan at Hubbitus.info> - 1.0.4-0.1.GIT8c73eaf
+- New upstream url - https://bugs.php.net/bug.php?id=61189, continue developing, new version, switch to git SCM.
+- Fix compilation error: https://github.com/zenovich/runkit/issues/26#issuecomment-8268795
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-16.CVS20090215
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 5bc27a1..3a2c521 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6d9ea488d3064e0b729d63f266e91df0  runkit-0.9-CVS20090215.tar.bz2
+feeede5463b96d0d1deb3ff5c0c91511  runkit-1.0.4-GIT8c73eaf.tar.bz2


More information about the scm-commits mailing list