rpms/php-pecl-runkit/F-10 import.log, NONE, 1.1 php-pecl-runkit-0.9-ZVAL_ADDREF.patch, NONE, 1.1 php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch, NONE, 1.1 php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch, NONE, 1.1 php-pecl-runkit.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Pavel Alexeev hubbitus at fedoraproject.org
Tue Mar 24 21:19:43 UTC 2009


Author: hubbitus

Update of /cvs/pkgs/rpms/php-pecl-runkit/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2940/F-10

Modified Files:
	.cvsignore sources 
Added Files:
	import.log php-pecl-runkit-0.9-ZVAL_ADDREF.patch 
	php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch 
	php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch php-pecl-runkit.spec 
Log Message:
Initial push php-pecl-runkit to Fedora


--- NEW FILE import.log ---
php-pecl-runkit-0_9-10_CVS20090215_fc9:F-10:php-pecl-runkit-0.9-10.CVS20090215.fc9.src.rpm:1237929381

php-pecl-runkit-0.9-ZVAL_ADDREF.patch:

--- NEW FILE php-pecl-runkit-0.9-ZVAL_ADDREF.patch ---
diff -NaurEbBH php-pecl-runkit-0.9.orig/runkit-0.9/runkit_constants.c php-pecl-runkit-0.9/runkit-0.9/runkit_constants.c
--- php-pecl-runkit-0.9.orig/runkit-0.9/runkit_constants.c	2007-10-24 06:43:27.000000000 +0400
+++ php-pecl-runkit-0.9/runkit-0.9/runkit_constants.c	2008-03-10 15:30:44.000000000 +0300
@@ -71,7 +71,8 @@
 	zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)php_runkit_update_children_consts, 4, ce, c, cname, cname_len);
 
 	zend_hash_del(&ce->constants_table, cname, cname_len + 1);
-	ZVAL_ADDREF(c);
+//*Hu	ZVAL_ADDREF(c);
+	Z_ADDREF_P(c);
 	if (zend_hash_add(&ce->constants_table, cname, cname_len + 1, c, sizeof(zval*), NULL) ==  FAILURE) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error updating child class");
 		return ZEND_HASH_APPLY_KEEP;
diff -NaurEbBH php-pecl-runkit-0.9.orig/runkit-0.9/runkit_import.c php-pecl-runkit-0.9/runkit-0.9/runkit_import.c
--- php-pecl-runkit-0.9.orig/runkit-0.9/runkit_import.c	2006-10-26 20:18:52.000000000 +0400
+++ php-pecl-runkit-0.9/runkit-0.9/runkit_import.c	2008-03-10 15:32:00.000000000 +0300
@@ -193,7 +193,8 @@
 					goto import_const_skip;
 				}
 			}
-			ZVAL_ADDREF(*c);
+//*Hu			ZVAL_ADDREF(*c);
+			Z_ADDREF_P(*c);
 			if (zend_hash_add_or_update(&dce->constants_table, key, key_len, (void*)c, sizeof(zval*), NULL, action) == FAILURE) {
 				zval_ptr_dtor(c);
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to import %s::%s", dce->name, key);
@@ -241,7 +242,8 @@
 					goto import_prop_skip;
 				}
 			}
-			ZVAL_ADDREF(*p);
+//*Hu			ZVAL_ADDREF(*p);
+			Z_ADDREF_P(*p);
 			if (zend_hash_add_or_update(&dce->default_properties, key, key_len, (void*)p, sizeof(zval*), NULL, action) == FAILURE) {
 				zval_ptr_dtor(p);
 				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to import %s->%s", dce->name, pname);
diff -NaurEbBH php-pecl-runkit-0.9.orig/runkit-0.9/runkit_props.c php-pecl-runkit-0.9/runkit-0.9/runkit_props.c
--- php-pecl-runkit-0.9.orig/runkit-0.9/runkit_props.c	2007-10-24 06:43:27.000000000 +0400
+++ php-pecl-runkit-0.9/runkit-0.9/runkit_props.c	2008-03-10 15:32:16.000000000 +0300
@@ -45,7 +45,8 @@
 	zend_hash_apply_with_arguments(EG(class_table), (apply_func_args_t)php_runkit_update_children_def_props, 4, ce, p, pname, pname_len);
 
 	zend_hash_del(&ce->default_properties, pname, pname_len + 1);
-	ZVAL_ADDREF(p);
+//*Hu	ZVAL_ADDREF(p);
+	Z_ADDREF_P(p);
 	if (zend_hash_add(&ce->default_properties, pname, pname_len + 1, p, sizeof(zval*), NULL) ==  FAILURE) {
 		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error updating child class");
 		return ZEND_HASH_APPLY_KEEP;

php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch:

--- NEW FILE php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch ---
diff -NaurEbBH php-pecl-runkit-0.9.orig/runkit-0.9/runkit.c php-pecl-runkit-0.9/runkit-0.9/runkit.c
--- php-pecl-runkit-0.9.orig/runkit-0.9/runkit.c	2007-10-24 06:43:27.000000000 +0400
+++ php-pecl-runkit-0.9/runkit-0.9/runkit.c	2008-03-10 15:20:40.000000000 +0300
@@ -61,7 +61,8 @@
 	add_assoc_stringl(return_value, "address", addr, addr_len, 0);
 
 #if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || (PHP_MAJOR_VERSION >= 6)
-	add_assoc_long(return_value, "refcount", ZVAL_REFCOUNT(value));
+//*Hu	add_assoc_long(return_value, "refcount", ZVAL_REFCOUNT(value));
+	add_assoc_long(return_value, "refcount", Z_REFCOUNT_P(value));
 	add_assoc_bool(return_value, "is_ref", Z_ISREF_P(value));
 #else
 	add_assoc_long(return_value, "refcount", value->refcount);

php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch:

--- NEW FILE php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch ---
diff -NaurEbBH php-pecl-runkit-0.9.ORIG/runkit/runkit_sandbox.c php-pecl-runkit-0.9.WORK/runkit/runkit_sandbox.c
--- php-pecl-runkit-0.9.ORIG/runkit/runkit_sandbox.c	2006-11-28 15:31:26.000000000 +0300
+++ php-pecl-runkit-0.9.WORK/runkit/runkit_sandbox.c	2008-05-12 19:15:56.000000000 +0400
@@ -471,7 +471,7 @@
 						op_array = zend_compile_file(&file_handle, type TSRMLS_CC);
 						zend_destroy_file_handle(&file_handle TSRMLS_CC);
 					} else {
-						zend_file_handle_dtor(&file_handle);
+						zend_file_handle_dtor(&file_handle TSRMLS_CC);
 						RETVAL_TRUE;
 						already_included = 1;
 					}
@@ -730,7 +730,7 @@
 		/* ZE expects refcount == 0 for unowned values */
 		INIT_PZVAL(return_value);
 		PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(return_value);
-		return_value->refcount--;
+		Z_DELREF_P(return_value);
 
 		return return_value;
 	} else {
@@ -803,7 +803,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT(member, 1);
 		convert_to_string(member);
 	}
 
@@ -877,7 +877,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT(member, 1);
 		convert_to_string(member);
 	}
 
@@ -1392,8 +1392,8 @@
 		zval callback_copy = *callback;
 
 		zval_copy_ctor(&callback_copy);
-		callback_copy.is_ref = 0;
-		callback_copy.refcount = 1;
+		Z_UNSET_ISREF(callback_copy);
+		Z_SET_REFCOUNT(callback_copy, 1);
 		callback_is_true = zval_is_true(&callback_copy);
 		zval_dtor(&callback_copy);
 	}
@@ -1413,8 +1413,8 @@
 	if (objval->output_handler && return_value_used) {
 		*return_value = *objval->output_handler;
 		zval_copy_ctor(return_value);
-		return_value->refcount = 1;
-		return_value->is_ref = 0;
+		Z_SET_REFCOUNT(return_value, 1);
+		Z_UNSET_ISREF(return_value);
 	} else {
 		RETVAL_FALSE;
 	}
@@ -1430,14 +1430,14 @@
 
 	if (callback && callback_is_true) {
 		zval *cb = callback;
-		if (callback->is_ref) {
+		if (Z_ISREF_P(callback)) {
 			MAKE_STD_ZVAL(cb);
 			*cb = *callback;
 			zval_copy_ctor(cb);
-			cb->refcount = 0;
-			cb->is_ref = 0;
+			Z_SET_REFCOUNT(cb, 0);
+			Z_UNSET_ISREF_P(cb);
 		}
-		cb->refcount++;
+		Z_ADDREF_P(cb);
 		objval->output_handler = cb;
 	}
 }
@@ -1469,10 +1469,9 @@
 	zval *retval; \
 \
 	ALLOC_ZVAL(retval); \
-	Z_TYPE_P(retval) = IS_BOOL; \
-	Z_LVAL_P(retval) = objval->name; \
-	retval->refcount = 0; \
-	retval->is_ref = 0; \
+	ZVAL_BOOL(retval, objval->name); \
+	Z_SET_REFCOUNT(retval, 0); \
+	Z_UNSET_ISREF(retval); \
 \
 	return retval; \
 }
@@ -1499,7 +1498,7 @@
 		zval_ptr_dtor(&objval->output_handler);
 	}
 
-	value->refcount++;
+	Z_ADDREF_P(value);
 	objval->output_handler = value;
 }
 
@@ -1514,7 +1513,7 @@
 	} else {
 		ZVAL_LONG(retval, objval->parent_scope);
 	}
-	retval->refcount = 0;
+	Z_SET_REFCOUNT(retval, 0);
 
 	return retval;
 }
@@ -1620,7 +1619,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT(member, 1);
 		convert_to_string(member);
 	}
 
@@ -1656,7 +1655,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT(member, 1);
 		convert_to_string(member);
 	}
 
@@ -1692,7 +1691,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT(member, 1);
 		convert_to_string(member);
 	}
 
diff -NaurEbBH php-pecl-runkit-0.9.ORIG/runkit/runkit_sandbox_parent.c php-pecl-runkit-0.9.WORK/runkit/runkit_sandbox_parent.c
--- php-pecl-runkit-0.9.ORIG/runkit/runkit_sandbox_parent.c	2006-06-07 21:35:33.000000000 +0400
+++ php-pecl-runkit-0.9.WORK/runkit/runkit_sandbox_parent.c	2008-05-12 19:22:39.000000000 +0400
@@ -94,8 +94,8 @@
 					ALLOC_INIT_ZVAL(hidden);
 					array_init(hidden);
 					ht = Z_ARRVAL_P(hidden);
-					if ((*symtable)->refcount > 1 &&
-						!(*symtable)->is_ref) {
+					if (Z_REFCOUNT_PP(symtable) > 1 &&
+						!Z_ISREF_PP(symtable)) {
 						zval *cv;
 
 						MAKE_STD_ZVAL(cv);
@@ -105,8 +105,8 @@
 						INIT_PZVAL(cv);
 						*symtable = cv;
 					}
-					(*symtable)->is_ref = 1;
-					(*symtable)->refcount++;
+					Z_SET_ISREF_PP(symtable);
+					Z_ADDREF_PP(symtable);
 					zend_hash_update(ht, objval->self->parent_scope_name, objval->self->parent_scope_namelen + 1, (void*)symtable, sizeof(zval*), NULL);
 
 					/* Store that dummy array in the sandbox's hidden properties table so that it gets cleaned up on dtor */
@@ -278,7 +278,7 @@
 					op_array = zend_compile_file(&file_handle, type TSRMLS_CC);
 					zend_destroy_file_handle(&file_handle TSRMLS_CC);
 				} else {
-					zend_file_handle_dtor(&file_handle);
+					zend_file_handle_dtor(&file_handle TSRMLS_CC);
 					RETVAL_TRUE;
 					already_included = 1;
 				}
@@ -534,7 +534,7 @@
 		/* ZE expects refcount == 0 for unowned values */
 		INIT_PZVAL(return_value);
 		PHP_SANDBOX_CROSS_SCOPE_ZVAL_COPY_CTOR(return_value);
-		return_value->refcount--;
+		Z_DELREF_P(return_value);
 
 		return return_value;
 	} else {
@@ -607,7 +607,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT_P(member, 1);
 		convert_to_string(member);
 	}
 
@@ -680,7 +680,7 @@
 		member_copy = *member;
 		member = &member_copy;
 		zval_copy_ctor(member);
-		member->refcount = 1;
+		Z_SET_REFCOUNT_P(member, 1);
 		convert_to_string(member);
 	}
 
diff -NaurEbBH php-pecl-runkit-0.9.ORIG/runkit/php_runkit.h php-pecl-runkit-0.9.WORK/runkit/php_runkit.h
--- php-pecl-runkit-0.9.ORIG/runkit/php_runkit.h	2008-03-31 14:11:36.000000000 +0400
+++ php-pecl-runkit-0.9.WORK/runkit/php_runkit.h	2008-05-12 20:05:14.000000000 +0400
@@ -261,8 +261,8 @@
 		default: \
 			zval_copy_ctor(pzv); \
 	} \
-	(pzv)->refcount = 1; \
-	(pzv)->is_ref = 0; \
+	Z_SET_REFCOUNT_P(pzv, 1); \
+	Z_UNSET_ISREF(pzv); \
 }
 #endif /* PHP_RUNKIT_SANDBOX */
 


--- NEW FILE php-pecl-runkit.spec ---
%global	php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
%{!?__pecl:		%{expand:	%%global __pecl	%{_bindir}/pecl}}
%{!?php_extdir:	%{expand:	%%global php_extdir	%(php-config --extension-dir)}}

%define	CVS	20090215

%define		peclName	runkit

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
%if 0%{?CVS:1}
Release:		10.CVS%{CVS}%{?dist}
%else
Release:		10%{?dist}
%endif
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
%else
Source0:		http://pecl.php.net/get/%{peclName}-%{version}.tgz
%endif
# Source0-md5:	05a690f04b7d2c42193f3e0c1bb99a19
URL:			http://pecl.php.net/package/runkit/
BuildRequires: php-pear >= 1.4.7, php-devel >= 5.0.0
Requires(post):	%{__pecl}
Requires(postun):	%{__pecl}
%if %{?php_zend_api}0
Requires:		php(zend-abi) = %{php_zend_api}
Requires:		php(api) = %{php_core_api}
%else
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

%description
Replace, rename, and remove user defined functions and classes. Define
customized superglobal variables for general purpose use. Execute code
in restricted environment (sandboxing).

%description -l ru
Замещение, переименование и удаление оперделенных пользователем функций
и классов. Определение собственных суперглобальных переменных. Выполнение
кода в ограниченной среде (песочнице)


%description -l pl
Zastępowanie, zmiana nazwy lub usuwanie zdefiniowanych przez
użytkownika funkcji i klas. Definiowanie zmiennych superglobalnych do
ogólnego użytku. Wykonywanie danego kodu w ograniczonym środowisku
(sandbox).

%prep
%setup -q -c
cd %{peclName}

%patch0 -p2 -b .zrefcount
%patch1 -p2 -b .zaddref
%patch3 -p2 -b .new_refcount

%build
cd %{peclName}
phpize
#*Hu0 %configure
%configure --enable-%{peclName} --with-%{peclName}
%{__make}

%install
cd %{peclName}

rm -rf %{buildroot}
install -d %{buildroot}{%{_sysconfdir}/php.d,%{php_extdir}}

install modules/%{peclName}.so %{buildroot}%{php_extdir}
#*Hu cat <<'EOF' > %{buildroot}%{_sysconfdir}/conf.d/%{peclName}.ini
cat <<'EOF' > %{buildroot}%{_sysconfdir}/php.d/%{peclName}.ini
; Enable %{peclName} extension module
extension=%{peclName}.so
EOF

# Install XML package description
install -m 0755 -d %{buildroot}%{pecl_xmldir}
install -m 0664 package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml

%post
%if 0%{?pecl_install:1}
%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
%endif

%postun
%if 0%{?pecl_uninstall:1}
if [ "$1" -eq "0" ]; then
	%{pecl_uninstall} %{peclName} >/dev/null || :
fi
%endif

%clean
rm -rf %{buildroot}

%files
%defattr(-,root,root,-)
%doc %{peclName}/README
%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
* Tue Mar 17 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9-10.CVS20090215
- Remi Collet notes in Fedora review:
- Rename back %%{peclName}.xml to %%{name}.xml :)
- Set %%defattr(-,root,root,-) (was %%defattr(644,root,root,755))
- Make the %%post/%%postun scriptlets silent

* Mon Mar 9 2009 Pavel Alexeev <Pahan at Hubbitus.info> - 0.9-9.CVS20090215
- In rename %%{name}.xml to %%{peclName}.xml
- Add BR php-pear >= 1.4.7

* Wed Feb 25 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-8.CVS20090215
- All changes inspired by Fedora package review by Remi Collet.
- From summary deleted name.
- Readmy path fixed(replaced %%{peclName}-%%{version}/README to %%{peclName}/README)
- Group changed to Development/Libraries (was: Development/Languages/PHP)
- Removed Obsoletes: php-pear-%%{peclName} it was unnecessary.

* Mon Feb 23 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-7.CVS20090215
- Again change version enumeration (https://bugzilla.redhat.com/show_bug.cgi?id=455226#c9).
- %%{pecl_xmldir}/%%{peclName}2.xml changed to %%{pecl_xmldir}/%%{name}.xml
- Recode pl summary and description text from iso8859-2 to UTF-8.

* Sun Feb 15 2009 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-0.6.CVS20090215
- Step to CVS build 20090215.
- Replace $RPM_BUILD_ROOT to %%{buildroot} to consistence usage.
- Strip some old comments.
- Add translated Summary(ru) and description.
- Remove legacy macros %%{?requires_php_extension}.
- All macroses %%peclName replaced to %{peclName} usages.
- Add file: %%{pecl_xmldir}/%%{peclName}2.xml
- All followed changes inspired by Fedora review by Remi Collet ( https://bugzilla.redhat.com/show_bug.cgi?id=455226 ).
- Change version enumeration, delete Hu-part.
- Modify Source0 for CVS build. Add comment about get it source.
- Spec-file renamed to php-pecl-runkit.spec.
- File BUG to upstream - http://pecl.php.net/bugs/bug.php?id=15969 .
- %%Post and %%postun scripts to restart apache removed.
- Register extension.
- Add PHP ABI provides/requires and Pre/post requires pecl.
- Defile some macroses from guidelines: php_apiver, __pecl, php_extdir.
- Replace %%extensionsdir by %%php_extdir.

* Mon May 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-0.CVS20080512.Hu.5
- Add Patch3: php-pecl-runkit-0.9.Z_NEW_REFCOUNT.patch to reflect new zend API

* Mon May 12 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-0.CVS20080512.Hu.3
- New CVS20080512 (cvs -d :pserver:cvsread at cvs.php.net/repository checkout pecl/runkit)
- Rename %%{_modname} to peclName to unify SPECs.
- Correct %%if 0%%{?CVS} to %%if 0%%{?CVS:1} - it is not integer!
- Rename pethces to:
	Patch0:		php-pecl-runkit-0.9-ZVAL_REFCOUNT.patch
	Patch1:		php-pecl-runkit-0.9-ZVAL_ADDREF.patch

* Mon Mar 10 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 0.9-0.CVS20080310.Hu.2
- CVS20080310 build. (cvs -d :pserver:cvsread at cvs.php.net:/repository checkout pecl/runkit)
- 0.9 stable are incompatible with php 5.3.0, build from CVS. Disable self patch0
- Enable patch0. Rewritten and rename to fix ZVAL_REFCOUNT.patch
	Hu.1
- Add patch1. Fix wrong call ZVAL_ADDREF.patch
	Hu.2

* Sun Mar 9 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.9-0.Hu.3
- Add patch (self written) zval_ref.patch. It is allow build.
- Agjust built dir:
	BuildRoot:	%%{tmpdir}/%%{name}-%%{version}-root-%%(id -u -n)
	to
	BuildRoot:	%%{_tmppath}/%%{name}-%%{version}-root-%%(id -u -n)
- Fix Release:		0%%{?dist}.Hu.2 -> Release:		0%%{?dist}.Hu.2
	Hu.2
- Remove %%define _status beta and all apearance of %%{_status}
- Remove %%define _sysconfdir /etc/php (it's already defined in system wide)
- Remove Requires: %%{_sysconfdir}/conf.d
- Change path %%{_sysconfdir}/conf.d to %%{_sysconfdir}/php.d:
	Replace:
		install -d $RPM_BUILD_ROOT{%%{_sysconfdir}/conf.d,%%{extensionsdir}}
		to
		install -d $RPM_BUILD_ROOT{%%{_sysconfdir}/php.d,%%{extensionsdir}}

		%%config(noreplace) %%verify(not md5 mtime size) %%{_sysconfdir}/conf.d/%%{_modname}.ini
		to
		%%config(noreplace) %%verify(not md5 mtime size) %%{_sysconfdir}/php.d/%%{_modname}.ini

		cat <<'EOF' > $RPM_BUILD_ROOT%%{_sysconfdir}/conf.d/%%{_modname}.ini
		to
		cat <<'EOF' > $RPM_BUILD_ROOT%%{_sysconfdir}/php.d/%%{_modname}.ini
- Hu.3

* Wed Feb 27 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] info> - 0.9-0.Hu.0
- Import from ftp://ftp.pld-linux.org/dists/2.0/PLD/SRPMS/SRPMS/php-pecl-runkit-0.4-5.src.rpm
- Step to version 0.9
	Release:		0{?dist}.Hu.0 (Was: Release:	0)
- Remove defining %%date and:
	* %%{date} PLD Team <feedback at pld-linux.org>
	All persons listed below can be reached at <cvs_login>@pld-linux.org
 due to error: ошибка: %%changelog не в нисходящем хронологическом порядке
- Small reformat of header spec
- Change BuildRequires:	php-devel >= 3:5.0.0 to php-devel >= 5.0.0
-Remove BuildRequires:	rpmbuild(macros) >= 1.254

# Old, Legacy changelog in incorrect format simple commented:
#$Log: php-pecl-runkit.spec,v $
#Revision 1.8  2005/12/22 12:12:04  glen
#- rel 5 (rebuild with new php)
#
#Revision 1.7  2005/10/30 13:29:27  glen
#- rel 4
#
#Revision 1.6  2005/10/29 00:05:14  glen
#- rebuild with zts and debug requires
#
#Revision 1.5  2005/09/14 22:33:47  glen
#- rel 2
#
#Revision 1.4  2005/09/14 13:37:00  glen
#- conf.d and php api macros
#
#Revision 1.3  2005/09/13 21:16:43  glen
#- superfluous BR libtool removed
#
#Revision 1.2  2005/07/27 22:08:17  qboosh
#- more standard pl desc
#
#Revision 1.1  2005/07/26 20:23:48  adamg
#- new


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-runkit/F-10/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore	24 Mar 2009 17:15:56 -0000	1.1
+++ .cvsignore	24 Mar 2009 21:19:13 -0000	1.2
@@ -0,0 +1 @@
+runkit-0.9-CVS20090215.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/php-pecl-runkit/F-10/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources	24 Mar 2009 17:15:56 -0000	1.1
+++ sources	24 Mar 2009 21:19:13 -0000	1.2
@@ -0,0 +1 @@
+6d9ea488d3064e0b729d63f266e91df0  runkit-0.9-CVS20090215.tar.bz2




More information about the fedora-extras-commits mailing list