- updated xulrunner-pc patch, pass more vars to make stage-package in order to genera...

diff --git a/firefox52-esr.spec b/firefox52-esr.spec
index 030338e5ae5a60ace215cba237fea4eda627c0c5..cfd6d4cac7916f92cf9a6eb8b19541604b9b751e 100644 (file)
--- 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 55bffefe4d7441d7a2535c9d6dc2c6fc88124870..ab603e0ca59c7ee9f4fc688d47e82807f5a23ce6 100644 (file)
--- 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