packages: icedtea6/icedtea6.spec, icedtea6/icedtea6-rpath.patch (NEW) - rel...

[arekm]

Author: arekm                        Date: Sun Apr 18 19:08:19 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 3; rpath for IcedTeaPlugin.so, so xulrunner libs are found now

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.56 -> 1.57) , icedtea6-rpath.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.56 packages/icedtea6/icedtea6.spec:1.57
--- packages/icedtea6/icedtea6.spec:1.56	Sun Apr 18 20:34:02 2010
+++ packages/icedtea6/icedtea6.spec	Sun Apr 18 21:08:10 2010
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# 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
@@ -22,7 +19,7 @@
 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
@@ -39,6 +36,7 @@
 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}
@@ -390,6 +388,9 @@
 
 %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} .
@@ -854,6 +855,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.57  2010/04/18 19:08:10  arekm
+- rel 3; rpath for IcedTeaPlugin.so, so xulrunner libs are found now
+
 Revision 1.56  2010/04/18 18:34:02  jajcus
 - use the new rpm-build-macros and %use_jdk to select build JDK, build requirements and not to hardcode 'gcj_home'
 

================================================================
Index: packages/icedtea6/icedtea6-rpath.patch
diff -u /dev/null packages/icedtea6/icedtea6-rpath.patch:1.1
--- /dev/null	Sun Apr 18 21:08:19 2010
+++ packages/icedtea6/icedtea6-rpath.patch	Sun Apr 18 21:08:10 2010
@@ -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:
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/icedtea6/icedtea6.spec?r1=1.56&r2=1.57&f=u