Author: glen Date: Tue Dec 19 22:47:03 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - new php extension macros - make mencoder executable
---- Files affected: SPECS: flixengine.spec (1.11 -> 1.12) ---- Diffs: ================================================================ Index: SPECS/flixengine.spec diff -u SPECS/flixengine.spec:1.11 SPECS/flixengine.spec:1.12 --- SPECS/flixengine.spec:1.11 Tue Dec 19 21:21:44 2006 +++ SPECS/flixengine.spec Tue Dec 19 23:46:58 2006 @@ -9,7 +9,7 @@ Summary(pl): Silnik On2 Flix Name: flixengine Version: 8.0.7.0 -Release: 0.12 +Release: 0.13 License: not distributable Group: Applications # download demo from http://flix.on2.com/demos/ @@ -24,7 +24,7 @@ BuildRequires: php-devel BuildRequires: python BuildRequires: rpm-perlprov >= 4.1-13 -BuildRequires: rpmbuild(macros) >= 1.268 +BuildRequires: rpmbuild(macros) >= 1.344 %if %{with autodeps} BuildRequires: ffmpeg-libs BuildRequires: lame-libs @@ -38,7 +38,6 @@ # FIXME: FHS 2.x violation %define _libexecdir %{_prefix}/libexec -%define extensionsdir %(php-config --extension-dir 2>/dev/null) %description The On2 Flix Engine provides many of the Flash 8 video encoding @@ -125,7 +124,7 @@ %{?requires_php_extension} Group: Libraries Requires: %{name}-libs = %{version}-%{release} -Requires: /etc/php/conf.d +Requires: php-common >= 4:5.0.4 %description -n php-flixengine PHP bindings for On2 Flix Engine. @@ -249,10 +248,10 @@ # PHP %{__make} -C flixphp \ install \ - PHPINST=$RPM_BUILD_ROOT%{extensionsdir} \ + PHPINST=$RPM_BUILD_ROOT%{php_extensiondir} \ -f target.mk -install -d $RPM_BUILD_ROOT/etc/php/conf.d -cat <<'EOF' > $RPM_BUILD_ROOT/etc/php/conf.d/flixengine.ini +install -d $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d +cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/flixengine.ini ; Enable flixengine extension module extension=flixengine2.so EOF @@ -308,13 +307,11 @@ fi %post -n php-flixengine -[ ! -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 -n php-flixengine 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 @@ -327,7 +324,11 @@ %{_mandir}/man8/flixd.8* %dir /var/lib/on2 %config(noreplace) %verify(not md5 mtime size) /var/lib/on2/hostinfo -%{_libexecdir}/on2/flixengine/mencoder +# TODO: FHS fix +%dir %{_libexecdir} +%dir %{_libexecdir}/on2 +%dir %{_libexecdir}/on2/flixengine +%attr(755,root,root) %{_libexecdir}/on2/flixengine/mencoder %files libs %defattr(644,root,root,755) @@ -360,8 +361,8 @@ %files -n php-flixengine %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/php/conf.d/flixengine.ini -%attr(755,root,root) %{extensionsdir}/flixengine2.so +%config(noreplace) %verify(not md5 mtime size) %{php_sysconfdir}/conf.d/flixengine.ini +%attr(755,root,root) %{php_extensiondir}/flixengine2.so %{_libdir}/flixengine2.php %{_examplesdir}/%{name}-%{version}/php @@ -378,6 +379,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.12 2006/12/19 22:46:58 glen +- new php extension macros +- make mencoder executable + Revision 1.11 2006/12/19 20:21:44 qboosh - /usr/libexec doesn't exist ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/flixengine.spec?r1=1.11&r2=1.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
