From: Jan Palus Date: Tue, 30 Oct 2018 12:02:05 +0000 (+0100) Subject: do not package gmp-api, the one from firefox should be enough X-Git-Tag: auto/th/firefox60-esr-60.3.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=133ba9c348008b97c717c2c4137a2a9905f281bd;p=packages%2Ffirefox60-esr.git do not package gmp-api, the one from firefox should be enough --- diff --git a/firefox60-esr.spec b/firefox60-esr.spec index 53a8e90..6b2c383 100644 --- a/firefox60-esr.spec +++ b/firefox60-esr.spec @@ -388,20 +388,6 @@ Firefox jest przeglądarką WWW rozpowszechnianą zgodnie z ideami ruchu otwartego oprogramowania oraz tworzoną z myślą o zgodności ze standardami, wydajnością i przenośnością. -%package -n gmp-api -Summary: GeckoMediaPlugins API header files -Summary(pl.UTF-8): Pliki nagłówkowe API GeckoMediaPlugins -Group: Development/Libraries -URL: https://wiki.mozilla.org/GeckoMediaPlugins -# actually C++ compiler; STL is not even used -Requires: libstdc++-devel - -%description -n gmp-api -GeckoMediaPlugins API header files. - -%description -n gmp-api -l pl.UTF-8 -Pliki nagłówkowe API GeckoMediaPlugins. - %package lang-ach Summary: Acoli resources for Firefox Summary(pl.UTF-8): Pliki językowe aczoli dla Firefoksa @@ -2142,9 +2128,7 @@ install -d \ $RPM_BUILD_ROOT{%{_bindir},%{_sbindir},%{_libdir}} \ $RPM_BUILD_ROOT%{_desktopdir} \ $RPM_BUILD_ROOT%{_datadir}/%{name}/browser \ - $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins \ - $RPM_BUILD_ROOT%{_includedir}/%{name} \ - $RPM_BUILD_ROOT%{_pkgconfigdir} + $RPM_BUILD_ROOT%{_libdir}/%{name}/browser/plugins %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/browser/plugins @@ -2206,10 +2190,6 @@ rm -rf $HOME EOF chmod 755 $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate -# GeckoMediaPlugin API headers -install -d $RPM_BUILD_ROOT%{_includedir} -cp -pr dom/media/gmp/gmp-api $RPM_BUILD_ROOT%{_includedir} - for a in *.xpi; do basename=$(basename $a .xpi) cp -p $a $RPM_BUILD_ROOT%{_datadir}/%{name}/browser/extensions/langpack-$basename@firefox.mozilla.org.xpi @@ -2302,10 +2282,6 @@ fi %attr(755,root,root) %{_libdir}/%{name}/gtk2/libmozgtk.so %attr(755,root,root) %{_libdir}/%{name}/libmozgtk.so -%files -n gmp-api -%defattr(644,root,root,755) -%{_includedir}/gmp-api - %files lang-ach %defattr(644,root,root,755) %{_datadir}/%{name}/browser/extensions/langpack-ach@firefox.mozilla.org.xpi