Author: glen Date: Sun Mar 19 15:47:14 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - drop trigger on mozilla-plugin-gpac (package never existed) - BR for browser-plugins macros - adapterized
---- Files affected: SPECS: gpac.spec (1.17 -> 1.18) ---- Diffs: ================================================================ Index: SPECS/gpac.spec diff -u SPECS/gpac.spec:1.17 SPECS/gpac.spec:1.18 --- SPECS/gpac.spec:1.17 Sun Mar 19 14:21:51 2006 +++ SPECS/gpac.spec Sun Mar 19 16:47:09 2006 @@ -29,8 +29,7 @@ Patch0: %{name}-install.patch Patch1: %{name}-wxWidgets.patch URL: http://gpac.sourceforge.net/ -BuildRequires: SDL-devel -%{?with_wx:BuildRequires: wxGTK2-devel >= 2.5.4} +BuildRequires: SDL-devel %{?with_faad:BuildRequires: faad2-devel} %{?with_ffmpeg:BuildRequires: ffmpeg-devel} %{?with_freetype:BuildRequires: freetype-devel} @@ -39,6 +38,8 @@ %{?with_mad:BuildRequires: libmad-devel} %{?with_png:BuildRequires: libpng-devel} BuildRequires: libxml2-devel +BuildRequires: rpmbuild(macros) >= 1.236 +%{?with_wx:BuildRequires: wxGTK2-devel >= 2.5.4} %{?with_xvid:BuildRequires: xvid-devel} Requires: SDL %{?with_faad:Requires: faad2} @@ -46,8 +47,8 @@ %{?with_freetype:Requires: freetype} %{?with_js:Requires: js} %{?with_jpeg:Requires: libjpeg} -%{?with_png:Requires: libpng} %{?with_mad:Requires: libmad} +%{?with_png:Requires: libpng} %{?with_xvid:Requires: xvid} BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -104,8 +105,8 @@ Obsługiwane przeglądarki: %{browsers}. %prep -%setup -q -n gpac -%patch0 -p1 +%setup -q -n %{name} +%patch0 -p1 %{?with_wx:%patch1 -p1} %if %{with amr} mkdir -p Plugins/amr_dec/AMR_NB @@ -121,18 +122,18 @@ %build %configure \ - --enable-oss-audio \ - %{?with_amr: --enable-amr-nb} \ - %{!?with_faad: --disable-faad} \ - %{!?with_ffmpeg: --disable-ffmpeg} \ - %{!?with_freetype: --disable-ft} \ - %{!?with_jpeg: --disable-jpeg} \ - %{!?with_js: --disable-js} \ - %{!?with_mad: --disable-mad} \ - %{!?with_png: --disable-png} \ --extra-cflags="-fPIC" \ --extra-ldflags="-fPIC" \ - %{!?with_xvid: --disable-xvid} + --enable-oss-audio \ + %{?with_amr:--enable-amr-nb} \ + %{!?with_faad:--disable-faad} \ + %{!?with_ffmpeg:--disable-ffmpeg} \ + %{!?with_freetype:--disable-ft} \ + %{!?with_jpeg:--disable-jpeg} \ + %{!?with_js:--disable-js} \ + %{!?with_mad:--disable-mad} \ + %{!?with_png:--disable-png} \ + %{!?with_xvid:--disable-xvid} %{__make} \ DESTDIR=$RPM_BUILD_ROOT @@ -146,7 +147,7 @@ mandir=$RPM_BUILD_ROOT%{_mandir} \ plugdir=$RPM_BUILD_ROOT%{_libdir}/gpac \ real_plugdir=%{_libdir}/gpac \ - prefix=$RPM_BUILD_ROOT/usr \ + prefix=$RPM_BUILD_ROOT%{_prefix} \ MOZILLA_DIR=$RPM_BUILD_ROOT%{_plugindir} %clean @@ -181,9 +182,6 @@ fi fi -%triggerpostun -n browser-plugin-%{name} -- mozilla-plugin-%{name} -%nsplugin_install -f -d %{_libdir}/mozilla/plugins nposmozilla.so nposmozilla.xpt - %files %defattr(644,root,root,755) %doc AUTHORS BUGS Changelog README TODO @@ -204,6 +202,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.18 2006/03/19 15:47:09 glen +- drop trigger on mozilla-plugin-gpac (package never existed) +- BR for browser-plugins macros +- adapterized + Revision 1.17 2006/03/19 13:21:51 qboosh - it includes outdated gecko-sdk, need to switch to system one ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/gpac.spec?r1=1.17&r2=1.18&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit