Author: glen Date: Thu Dec 14 23:46:20 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- add missing provides
---- Files affected:
SPECS:
php-pecl-SQLite.spec (1.17 -> 1.18) , php-pecl-apd.spec (1.14 -> 1.15)
---- Diffs:
================================================================
Index: SPECS/php-pecl-SQLite.spec
diff -u SPECS/php-pecl-SQLite.spec:1.17 SPECS/php-pecl-SQLite.spec:1.18
--- SPECS/php-pecl-SQLite.spec:1.17 Fri Nov 3 00:09:09 2006
+++ SPECS/php-pecl-SQLite.spec Fri Dec 15 00:46:14 2006
@@ -4,8 +4,6 @@
%define _modname SQLite
%define _status stable
%define _smodname sqlite
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - database bindings
Summary(pl): %{_modname} - powiązania z bazą danych
Name: php-pecl-%{_modname}
@@ -18,9 +16,9 @@
URL: http://pecl.php.net/package/SQLite/
BuildRequires: php-devel >= 3:5.0.0
BuildRequires: sqlite-devel >= 2.8.14
-BuildRequires: rpmbuild(macros) >= 1.322
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_php_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -52,13 +50,13 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
#chmod 755 build/shtool
%{__make} -C %{_modname}-%{version} install \
INSTALL_ROOT=$RPM_BUILD_ROOT
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_smodname}.ini
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_smodname}.ini
; Enable %{_modname} extension module
extension=%{_smodname}.so
EOF
@@ -67,21 +65,19 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
%postun
if [ "$1" = 0 ]; then
- [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache
restart
- [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd
restart
+ %php_webserver_restart
fi
%files
%defattr(644,root,root,755)
%doc %{_modname}-%{version}/README %{_modname}-%{version}/TODO
%{_modname}-%{version}/CREDITS
%doc %{_modname}-%{version}/sqlite.php %{_modname}-%{version}/tests
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/%{_smodname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_smodname}.so
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_smodname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_smodname}.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -89,6 +85,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.18 2006/12/14 23:46:14 glen
+- add missing provides
+
Revision 1.17 2006/11/02 23:09:09 glen
- BR rpmmacros for fixed %requires_php_extension
================================================================
Index: SPECS/php-pecl-apd.spec
diff -u SPECS/php-pecl-apd.spec:1.14 SPECS/php-pecl-apd.spec:1.15
--- SPECS/php-pecl-apd.spec:1.14 Wed Jan 4 00:01:01 2006
+++ SPECS/php-pecl-apd.spec Fri Dec 15 00:46:14 2006
@@ -1,8 +1,6 @@
# $Revision$, $Date$
%define _modname apd
%define _status stable
-%define _sysconfdir /etc/php
-%define extensionsdir %(php-config --extension-dir
2>/dev/null)
Summary: %{_modname} - full-featured engine-level profiler/debugger
Summary(pl): %{_modname} - w pełni funkcjonalny profiler/debugger dla PHP
Name: php-pecl-%{_modname}
@@ -15,9 +13,9 @@
Patch0: %{name}-build_fix.patch
URL: http://pecl.php.net/package/apd/
BuildRequires: php-devel >= 3:5.0.0
-BuildRequires: rpmbuild(macros) >= 1.254
+BuildRequires: rpmbuild(macros) >= 1.344
%{?requires_zend_extension}
-Requires: %{_sysconfdir}/conf.d
+Requires: php-common >= 4:5.0.4
Obsoletes: php-pear-%{_modname}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -47,10 +45,10 @@
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/conf.d,%{extensionsdir}}
+install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}}
-install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{extensionsdir}
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/%{_modname}.ini
+install %{_modname}-%{version}/modules/%{_modname}.so
$RPM_BUILD_ROOT%{php_extensiondir}
+cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini
; Enable %{_modname} extension module
zend_extension%{?zend_zts:_ts}=%{_modname}.so
EOF
@@ -59,20 +57,18 @@
rm -rf $RPM_BUILD_ROOT
%post
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
%postun
if [ "$1" = 0 ]; then
- [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache
restart
- [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd
restart
+ %php_webserver_restart
fi
%files
%defattr(644,root,root,755)
%doc %{_modname}-%{version}/README
-%config(noreplace) %verify(not md5 mtime size)
%{_sysconfdir}/conf.d/%{_modname}.ini
-%attr(755,root,root) %{extensionsdir}/%{_modname}.so
+%config(noreplace) %verify(not md5 mtime size)
%{php_sysconfdir}/conf.d/%{_modname}.ini
+%attr(755,root,root) %{php_extensiondir}/%{_modname}.so
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -80,6 +76,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.15 2006/12/14 23:46:14 glen
+- add missing provides
+
Revision 1.14 2006/01/03 23:01:01 glen
- php is with zts (fix config); rel 6
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/php-pecl-SQLite.spec?r1=1.17&r2=1.18&f=u
http://cvs.pld-linux.org/SPECS/php-pecl-apd.spec?r1=1.14&r2=1.15&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
