packages: icedtea6/icedtea6.spec - _browserpluginsdir is a macro - cosmetic...

[glen]

Author: glen                         Date: Fri Apr 16 07:28:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- _browserpluginsdir is a macro
- cosmetics, fixes, do not trust always adapter

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.25 packages/icedtea6/icedtea6.spec:1.26
--- packages/icedtea6/icedtea6.spec:1.25	Fri Apr 16 09:23:26 2010
+++ packages/icedtea6/icedtea6.spec	Fri Apr 16 09:28:14 2010
@@ -1,14 +1,13 @@
 # $Revision$, $Date$
 #
-%bcond_without bootstrap	# don't use gcj, use an installed icedtea6
-				# instead
+%bcond_without bootstrap	# don't use gcj, use an installed icedtea6 instead
 %bcond_without plugin		# don't build browser plugin
-#
+
 # class data version seen with file(1) that this jvm is able to load
 %define		_classdataversion 50.0
-%define		_jdkversion 1.6.0.18
 # JDK/JRE version, as returned with `java -version`, '_' replaced with '.'
-#
+%define		_jdkversion 1.6.0.18
+
 Summary:	OpenJDK and GNU Classpath code
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath
 Name:		icedtea6
@@ -52,6 +51,7 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	motif-devel
 BuildRequires:	nss-devel
+BuildRequires:	rpmbuild(macros) >= 1.364
 BuildRequires:	unzip
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXinerama-devel
@@ -80,7 +80,7 @@
 Obsoletes:	java-sun-jre
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define _gcj_home /usr/%{_lib}/java/java-1.5.0-gcj-1.5.0.0
+%define		_gcj_home	/usr/%{_lib}/java/java-1.5.0-gcj-1.5.0.0
 
 %define		dstreldir	%{name}-%{version}
 %define		dstdir		%{_jvmdir}/%{dstreldir}
@@ -88,8 +88,6 @@
 %define		jredir		%{_jvmdir}/%{jrereldir}
 %define		jvmjardir	%{_jvmjardir}/%{name}-%{version}
 
-%define		_plugindir	%{_libdir}/browser-plugins
-
 %ifarch x86_64 amd64
 %define		jre_arch	amd64
 %else
@@ -374,11 +372,11 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja,%{_plugindir}} \
+install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja,%{_browserpluginsdir}} \
 	$RPM_BUILD_ROOT{%{jvmjardir},%{_prefix}/src/%{name}-{jdk-sources,examples}}
 
 # install the 'JDK image', it contains the JRE too
-cp -R openjdk/build/linux-*/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
+cp -a openjdk/build/linux-*/j2sdk-image/* $RPM_BUILD_ROOT%{dstdir}
 
 # convenience symlinks without version number
 ln -s %{dstreldir} $RPM_BUILD_ROOT%{_jvmdir}/%{name}
@@ -397,9 +395,9 @@
 rmdir $RPM_BUILD_ROOT%{dstdir}/man
 
 # replace duplicates with symlinks, link to %{_bindir}
-for path in $RPM_BUILD_ROOT%{dstdir}/bin/* ; do
-	filename=`basename $path`
-	if diff -q "$path" "$RPM_BUILD_ROOT%{jredir}/bin/$filename" > /dev/null ; then
+for path in $RPM_BUILD_ROOT%{dstdir}/bin/*; do
+	filename=$(basename $path)
+	if diff -q "$path" "$RPM_BUILD_ROOT%{jredir}/bin/$filename" > /dev/null; then
 		ln -sf "../jre/bin/$filename" "$path"
 		ln -sf "%{jredir}/bin/$filename" $RPM_BUILD_ROOT%{_bindir}
 	else
@@ -408,8 +406,8 @@
 done
 ln -sf ../jre/lib/jexec $RPM_BUILD_ROOT%{dstdir}/lib/jexec
 
-%if %{with_plugin}
-ln -s %{jredir}/lib/%{jre_arch}/IcedTeaPlugin.so $RPM_BUILD_ROOT%{_plugindir}/
+%if %{with plugin}
+ln -s %{jredir}/lib/%{jre_arch}/IcedTeaPlugin.so $RPM_BUILD_ROOT%{_browserpluginsdir}
 %endif
 
 ln -sf %{jredir}/lib/jsse.jar $RPM_BUILD_ROOT%{jvmjardir}/jsse.jar
@@ -772,7 +770,7 @@
 %files -n browser-plugin-java-%{name}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pluginappletviewer
-%attr(755,root,root) %{_plugindir}/IcedTeaPlugin.so
+%attr(755,root,root) %{_browserpluginsdir}/IcedTeaPlugin.so
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -781,6 +779,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2010/04/16 07:28:14  glen
+- _browserpluginsdir is a macro
+- cosmetics, fixes, do not trust always adapter
+
 Revision 1.25  2010/04/16 07:23:26  glen
 - suggests does not work versioned
 
================================================================

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