From 6ab32e1e740d453de337a3c2481b9e5301064339 Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Mon, 17 Jul 2017 21:12:20 +0200 Subject: [PATCH] - updated xulrunner-pc patch, pass more vars to make stage-package in order to generate correct .pc files --- firefox52-esr.spec | 7 +++++-- xulrunner-pc.patch | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) 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 -- 2.43.0