From: Jakub Bogusz Date: Mon, 17 Jul 2017 19:12:20 +0000 (+0200) Subject: - updated xulrunner-pc patch, pass more vars to make stage-package in order to genera... X-Git-Tag: auto/th/firefox52-esr-52.5.3-1~11 X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirefox52-esr.git;a=commitdiff_plain;h=6ab32e1;hp=ed1a48e8c0812b1b24634fee228cba8c7a0b538f - updated xulrunner-pc patch, pass more vars to make stage-package in order to generate correct .pc files --- diff --git a/firefox52-esr.spec b/firefox52-esr.spec index 030338e..cfd6d4c 100644 --- a/firefox52-esr.spec +++ b/firefox52-esr.spec @@ -329,9 +329,12 @@ install -d \ cd obj-%{_target_cpu} %{__make} -C browser/installer stage-package libxul.pc libxul-embedding.pc mozilla-js.pc mozilla-plugin.pc \ DESTDIR=$RPM_BUILD_ROOT \ - installdir=%{_libdir}/%{name} \ INSTALL_SDK=1 \ - PKG_SKIP_STRIP=1 + PKG_SKIP_STRIP=1 \ + idldir=%{_datadir}/idl/%{name} \ + includedir=%{_includedir}/%{name} \ + installdir=%{_libdir}/%{name} \ + sdkdir=%{_libdir}/%{name}-devel cp -aL browser/installer/*.pc $RPM_BUILD_ROOT%{_pkgconfigdir} cp -aL dist/firefox/* $RPM_BUILD_ROOT%{_libdir}/%{name}/ diff --git a/xulrunner-pc.patch b/xulrunner-pc.patch index 55bffef..ab603e0 100644 --- a/xulrunner-pc.patch +++ b/xulrunner-pc.patch @@ -12,7 +12,7 @@ + mozilla-plugin.pc \ + $(NULL) + -+ifdef MOZ_NATIVE_NSPR ++ifdef MOZ_SYSTEM_NSPR +NSPR_NAME=nspr +NSPR_VERSION=$(shell $(NSPR_CONFIG) --version) +else