Author: glen Date: Mon Mar 19 14:57:58 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - AC-branch merge
---- Files affected: SPECS: redland-bindings.spec (1.36 -> 1.37) ---- Diffs: ================================================================ Index: SPECS/redland-bindings.spec diff -u SPECS/redland-bindings.spec:1.36 SPECS/redland-bindings.spec:1.37 --- SPECS/redland-bindings.spec:1.36 Tue Feb 13 09:06:44 2007 +++ SPECS/redland-bindings.spec Mon Mar 19 15:57:52 2007 @@ -28,13 +28,13 @@ URL: http://librdf.org/bindings/ BuildRequires: autoconf >= 2.53 BuildRequires: automake >= 1:1.7 +%{?with_java:BuildRequires: jdk} BuildRequires: libtool BuildRequires: perl-devel >= 1:5.8.0 BuildRequires: python-devel BuildRequires: redland-devel >= 1.0.5 BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: rpmbuild(macros) >= 1.322 -%{?with_java:BuildRequires: jdk} +BuildRequires: rpmbuild(macros) >= 1.344 %if %{with mono} BuildRequires: mono-csharp BuildRequires: rpmbuild(monoautodeps) @@ -68,7 +68,6 @@ %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 @@ -131,24 +130,26 @@ Summary(pl.UTF-8): Interfejs PHP do biblioteki Redland RDF Group: Libraries %{?requires_php_extension} +Requires: php4-common >= 3:4.4.0-3 %description -n php4-redland -PHP bindings for Redland RDF library. +PHP 4.x bindings for Redland RDF library. %description -n php4-redland -l pl.UTF-8 -Interfejs PHP do biblioteki Redland RDF. +Interfejs PHP 4.x do biblioteki Redland RDF. %package -n php-redland -Summary: PHP bindings for Redland RDF library -Summary(pl.UTF-8): Interfejs PHP do biblioteki Redland RDF +Summary: PHP 5.x bindings for Redland RDF library +Summary(pl.UTF-8): Interfejs PHP 5.x do biblioteki Redland RDF Group: Libraries %{?requires_php_extension} +Requires: php-common >= 4:5.0.4 %description -n php-redland -PHP bindings for Redland RDF library. +PHP 5.x bindings for Redland RDF library. %description -n php-redland -l pl.UTF-8 -Interfejs PHP do biblioteki Redland RDF. +Interfejs PHP 5.x do biblioteki Redland RDF. %package -n python-redland Summary: Python bindings for Redland RDF library @@ -207,7 +208,7 @@ %{__automake} %configure \ --disable-static \ - %{?with_mono:--with-ecma-cli=mono} \ + --with-ecma-cli=%{?with_mono:mono}%{!?with_mono:no} \ %{?with_java:--with-java --with-jdk=%{_libdir}/java jdkdir=%{_libdir}/java} \ --with-perl \ %if %{with php} @@ -245,26 +246,35 @@ %{?with_java:rm -f $RPM_BUILD_ROOT%{_libdir}/java/librdf-java.la} %if %{with php} -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 +install -d $RPM_BUILD_ROOT{%{php_sysconfdir}/conf.d,%{php_extensiondir}} +cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/redland.ini ; Enable redland bindings module extension=redland.so EOF # make .so executable so that rpm would add autodeps on .so files -chmod +x $RPM_BUILD_ROOT%{phpdir}/*.so +chmod +x $RPM_BUILD_ROOT%{php_extensiondir}/*.so %endif +rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod +rm -f $RPM_BUILD_ROOT%{perl_vendorarch}/auto/RDF/Redland/CORE/.packlist + %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 +%post -n php-redland +%php_webserver_restart -%postun -n php%{?with_php4:4}-redland +%postun -n php-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 + %php_webserver_restart +fi + +%post -n php4-redland +%php4_webserver_restart + +%postun -n php4-redland +if [ "$1" = 0 ]; then + %php4_webserver_restart fi %files @@ -281,7 +291,7 @@ %files -n java-redland %defattr(644,root,root,755) %doc docs/java.html -%{_libdir}/java/librdf-java.so* +%attr(755,root,root) %{_libdir}/java/librdf-java.so* %{_javadir}/librdf-java.jar %endif @@ -302,8 +312,8 @@ %files -n php%{?with_php4:4}-redland %defattr(644,root,root,755) %doc docs/php.html -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php%{?with_php4:4}/conf.d/redland.ini -%attr(755,root,root) %{phpdir}/redland.so +%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/redland.ini +%attr(755,root,root) %{php_extensiondir}/redland.so %endif %files -n python-redland @@ -335,6 +345,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.37 2007/03/19 14:57:52 glen +- AC-branch merge + Revision 1.36 2007/02/13 08:06:44 glen - tabs in preamble ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/redland-bindings.spec?r1=1.36&r2=1.37&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
