[packages/xulrunner] - up to 22.0 - libxpcom.so is gone - C on xulrunner-libs to make sure internal programs are executed

[baggins]

commit 3f304cdcecedbf34193c065d347d71ab4f38c246
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Wed Jun 26 22:01:05 2013 +0200

    - up to 22.0
    - libxpcom.so is gone
    - C on xulrunner-libs to make sure internal programs are executed with
      appriopriate libs

 xulrunner-rpath.patch | 20 ++++++++++----------
 xulrunner.spec        |  9 ++++-----
 2 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/xulrunner.spec b/xulrunner.spec
index 176a6e3..12ce2c7 100644
--- a/xulrunner.spec
+++ b/xulrunner.spec
@@ -23,7 +23,7 @@
 Summary:	XULRunner - Mozilla Runtime Environment for XUL+XPCOM applications
 Summary(pl.UTF-8):	XULRunner - środowisko uruchomieniowe Mozilli dla aplikacji XUL+XPCOM
 Name:		xulrunner
-Version:	21.0
+Version:	22.0
 Release:	1
 Epoch:		2
 License:	MPL v1.1 or GPL v2+ or LGPL v2.1+
@@ -31,7 +31,7 @@ Group:		X11/Applications
 # Source tarball for xulrunner is in fact firefox tarball (checked on 1.9), so lets use it
 # instead of waiting for mozilla to copy file on ftp.
 Source0:	http://releases.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
-# Source0-md5:	6e2510e9466b280c367de0e4c05a8840
+# Source0-md5:	4ffb6d1c1a04ca8e3dbca23df09626dd
 Patch1:		%{name}-rpath.patch
 Patch2:		%{name}-paths.patch
 Patch3:		%{name}-pc.patch
@@ -93,6 +93,7 @@ BuildRequires:	xorg-lib-libXt-devel
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
 BuildConflicts:	xulrunner-devel < %{epoch}:%{name}-%{version}
+BuildConflicts:	xulrunner-libs < %{epoch}:%{name}-%{version}
 Requires(post):	mktemp >= 1.5-18
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	browser-plugins >= 2.0
@@ -106,7 +107,7 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 # no Provides from private modules (don't use %{name} here, it expands to each subpackage name...)
 %define		_noautoprovfiles	%{_libdir}/xulrunner/components %{_libdir}/xulrunner/plugins
 # no need to require them (we have strict deps for these)
-%define		_noautoreq		libmozjs.so libxpcom.so libxul.so libmozalloc.so
+%define		_noautoreq		libmozjs.so libxul.so libmozalloc.so
 
 %description
 XULRunner is a Mozilla runtime package that can be used to bootstrap
@@ -329,7 +330,6 @@ ln -s %{_libdir}/%{name}-devel/sdk/lib $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/l
 
 # replace copies with symlinks
 ln -sf %{_libdir}/%{name}/libmozjs.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozjs.so
-ln -sf %{_libdir}/%{name}/libxpcom.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxpcom.so
 ln -sf %{_libdir}/%{name}/libxul.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libxul.so
 ln -sf %{_libdir}/%{name}/libmozalloc.so $RPM_BUILD_ROOT%{_libdir}/%{name}-devel/sdk/lib/libmozalloc.so
 # temp fix for https://bugzilla.mozilla.org/show_bug.cgi?id=63955
@@ -410,7 +410,6 @@ fi
 %{_libdir}/%{name}/platform.ini
 %attr(755,root,root) %{_libdir}/%{name}/libmozalloc.so
 %attr(755,root,root) %{_libdir}/%{name}/libmozjs.so
-%attr(755,root,root) %{_libdir}/%{name}/libxpcom.so
 %attr(755,root,root) %{_libdir}/%{name}/libxul.so
 
 %files devel
diff --git a/xulrunner-rpath.patch b/xulrunner-rpath.patch
index 565bfaa..593886a 100644
--- a/xulrunner-rpath.patch
+++ b/xulrunner-rpath.patch
@@ -1,22 +1,22 @@
 --- mozilla-2.0/configure.in	2011-03-19 00:33:33.000000000 +0100
 +++ mozilla-2.0.new/configure.in	2011-03-23 16:18:45.746667659 +0100
 @@ -1229,7 +1229,7 @@
- MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
- MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
+ MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
+ MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxul -lmozalloc'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
  XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
 --- mozilla-2.0/configure	2011-03-19 00:48:56.000000000 +0100
 +++ mozilla-2.0.new/configure	2011-03-23 16:19:10.449995855 +0100
 @@ -5856,7 +5856,7 @@
- MOZ_JS_STATIC_LIBS='-L$(LIBXUL_DIST)/bin -ljs_static'
- MOZ_JS_SHARED_LIBS='-L$(LIBXUL_DIST)/bin -lmozjs'
- DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxpcom -lxpcom_core -lmozalloc'
+ MOZ_JS_STATIC_LIBS='$(call EXPAND_LIBNAME_PATH,js_static,$(LIBXUL_DIST)/lib)'
+ MOZ_JS_SHARED_LIBS='$(call EXPAND_LIBNAME_PATH,mozjs,$(LIBXUL_DIST)/lib)'
+ DYNAMIC_XPCOM_LIBS='-L$(LIBXUL_DIST)/bin -lxul -lxpcom_core -lmozalloc'
 -MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib'
 +MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(prefix)/lib -Wl,-rpath,$(installdir)'
- XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxpcom -lmozalloc'
- LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) -lxul'
+ XPCOM_FROZEN_LDOPTS='-L$(LIBXUL_DIST)/bin -lxul -lmozalloc'
+ LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS)'
  XPCOM_GLUE_LDOPTS='$(LIBXUL_DIST)/lib/$(LIB_PREFIX)xpcomglue_s.$(LIB_SUFFIX) $(XPCOM_FROZEN_LDOPTS)'
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xulrunner.git/commitdiff/3f304cdcecedbf34193c065d347d71ab4f38c246