[packages/icedtea7: 65/103] - rel 3; rpath for IcedTeaPlugin.so, so xulrunner libs are found now

[jajcus]

commit 3fb28071a92999679ec5062866255fd1d2b43951
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Sun Apr 18 19:08:10 2010 +0000

    - rel 3; rpath for IcedTeaPlugin.so, so xulrunner libs are found now
    
    Changed files:
        icedtea6-rpath.patch -> 1.1
        icedtea6.spec -> 1.57

 icedtea6-rpath.patch | 10 ++++++++++
 icedtea6.spec        |  9 +++++----
 2 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/icedtea6.spec b/icedtea6.spec
index b6f3bd6..8e836eb 100644
--- a/icedtea6.spec
+++ b/icedtea6.spec
@@ -1,6 +1,3 @@
-# TODO:
-# - fix IcedTeaPlugin.so web browser plugin, so it have proper
-#   rpath to libdir/xulrunner (to be able to use get libxul.so and  libxpcom.so libraries)
 
 %bcond_without bootstrap	# don't use gcj, use an installed icedtea6 instead
 %bcond_without plugin		# don't build browser plugin
@@ -21,7 +18,7 @@ Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
 Version:	1.8
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Development/Languages/Java
 Source0:	http://icedtea.classpath.org/download/source/%{name}-%{version}.tar.gz
@@ -38,6 +35,7 @@ Source4:	https://jaxp.dev.java.net/files/documents/913/147329/jdk6-jaxp-2009_10_
 Patch0:		%{name}-i486.patch
 Patch1:		%{name}-ecj_single_thread.patch
 Patch2:		%{name}-no_dtdtype_patch.patch
+Patch3:		%{name}-rpath.patch
 URL:		http://icedtea.classpath.org/wiki/Main_Page
 BuildRequires:	alsa-lib-devel
 %{!?with_bootstrap:BuildRequires:	ant-nodeps}
@@ -389,6 +387,9 @@ Wtyczka z obsługą Javy dla przeglądarek WWW.
 
 %patch2 -p1
 
+# rpath so IcedTeaPlugin.so can find libxul.so and libxpcom.so
+%patch3 -p1
+
 # let the build system extract the sources where it wants them
 mkdir drops
 ln -s %{SOURCE1} .
diff --git a/icedtea6-rpath.patch b/icedtea6-rpath.patch
new file mode 100644
index 0000000..df30de3
--- /dev/null
+++ b/icedtea6-rpath.patch
@@ -0,0 +1,10 @@
+--- icedtea6-1.8/Makefile.am~	2010-04-12 23:55:51.754838172 +0200
++++ icedtea6-1.8/Makefile.am	2010-04-18 20:37:41.955980316 +0200
+@@ -1546,6 +1546,7 @@
+ 	  $(GLIB_LIBS) \
+ 	  $(GTK_LIBS) \
+ 	  $(MOZILLA_LIBS)\
++	  -Wl,-rpath,$(libdir)/xulrunner \
+ 	  -shared -o $@
+ 
+ clean-IcedTeaPlugin:
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/icedtea7.git/commitdiff/f360048b2271851d733c2fc755b8e7cae2f337cf