Author: glen Date: Thu Sep 15 19:38:24 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - php conf.d support and php api version require; rel 2
---- Files affected: SPECS: redland-bindings.spec (1.19 -> 1.20) ---- Diffs: ================================================================ Index: SPECS/redland-bindings.spec diff -u SPECS/redland-bindings.spec:1.19 SPECS/redland-bindings.spec:1.20 --- SPECS/redland-bindings.spec:1.19 Wed Sep 7 16:17:31 2005 +++ SPECS/redland-bindings.spec Thu Sep 15 21:38:18 2005 @@ -1,5 +1,6 @@ # $Revision$, $Date$ -# TODO: C#/mono +# TODO: +# - C#/mono # # Conditional build: %bcond_with java # build Java bindings @@ -12,7 +13,7 @@ Summary(pl): Wiązania szkieletu aplikacji Redland RDF Name: redland-bindings Version: 1.0.2.1 -Release: 1 +Release: 2 License: LGPL v2.1+ or GPL v2+ or Apache v2 Group: Libraries Source0: http://librdf.org/dist/source/%{name}-%{version}.tar.gz @@ -27,11 +28,14 @@ BuildRequires: perl-devel >= 1:5.8.0 %if %{with php4} BuildRequires: php4-devel +BuildRequires: php4-cli %else BuildRequires: php-devel >= 3:5.0.0 +BuildRequires: php-cli >= 3:5.0.0 %endif BuildRequires: python-devel BuildRequires: redland-devel >= 1.0.0 +BuildRequires: rpmbuild(macros) >= 1.238 BuildRequires: rpm-perlprov >= 4.1-13 %if %{with ruby} BuildRequires: ruby @@ -54,6 +58,7 @@ %else %define tcldir %{_libdir}/tcl8.4 %endif +%define phpdir %(php-config --extension-dir 2>/dev/null) %description Redland is a library that provides a high-level interface for the @@ -116,7 +121,7 @@ Summary: PHP bindings for Redland RDF library Summary(pl): Interfejs PHP do biblioteki Redland RDF Group: Libraries -Requires: php-common >= 3:5.0.0 +%{?requires_php_extension} %description -n php-redland PHP bindings for Redland RDF library. @@ -180,8 +185,7 @@ --disable-static \ %{?with_java:--with-java --with-jdk=%{_libdir}/java jdkdir=%{_libdir}/java} \ --with-perl \ - %{?with_php4:--with-php=%{_bindir}/php4.cli} \ - %{!?with_php4:--with-php=%{_bindir}/php.cli} \ + --with-php=%{_bindir}/php%{?with_php4:4}.cli \ --with-python \ %{?with_ruby:--with-ruby} \ --with-tcl @@ -215,9 +219,25 @@ %{?with_java:rm -f $RPM_BUILD_ROOT%{_libdir}/java/librdf-java.la} +install -d $RPM_BUILD_ROOT{%{_sysconfdir}/php%{?with_php4:4}/conf.d,%{phpdir}} +cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/php%{?with_php4:4}/conf.d/redland.ini +; Enable redland bindings module +extension=redland.so +EOF + %clean rm -rf $RPM_BUILD_ROOT +%post -n php%{?with_php4:4}-redland +[ ! -f /etc/apache/conf.d/??_mod_php.%{?with_php4:4}conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php%{?with_php4:4}.conf ] || %service -q httpd restart + +%postun -n php%{?with_php4:4}-redland +if [ "$1" = 0 ]; then + [ ! -f /etc/apache/conf.d/??_mod_php%{?with_php4:4}.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php%{?with_php4:4}.conf ] || %service -q httpd restart +fi + %files %defattr(644,root,root,755) %doc AUTHORS ChangeLog LICENSE.html NEWS.html README.html RELEASE.html TODO.html @@ -243,19 +263,11 @@ %attr(755,root,root) %{perl_vendorarch}/auto/RDF/Redland/CORE/CORE.so %{_mandir}/man3/RDF::Redland*.3pm* -%if %{with php4} -%files -n php4-redland +%files -n php%{?with_php4:4}-redland %defattr(644,root,root,755) %doc docs/php.html -%attr(755,root,root) %{_libdir}/php4/redland.so -%endif - -%if ! %{with php4} -%files -n php-redland -%defattr(644,root,root,755) -%doc docs/php.html -%attr(755,root,root) %{_libdir}/php/redland.so -%endif +%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php%{?with_php4:4}/conf.d/redland.ini +%attr(755,root,root) %{phpdir}/redland.so %files -n python-redland %defattr(644,root,root,755) @@ -284,6 +296,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.20 2005/09/15 19:38:18 glen +- php conf.d support and php api version require; rel 2 + Revision 1.19 2005/09/07 14:17:31 glen - autotools called directly, revert last change @@ -338,7 +353,7 @@ Revision 1.4 2004/12/25 14:22:48 radzio - compile .py to .py[co] -- mv .py[co] from %%py_sitedir to %%py_sitescriptdir (Patch1) +- mv .py[co] from %py_sitedir to %py_sitescriptdir (Patch1) Revision 1.3 2004/12/25 11:43:26 radzio - fix bcond_ruby (BR) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/redland-bindings.spec?r1=1.19&r2=1.20&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
