packages: icedtea6/icedtea6.spec - install examples in %{_examplesdir} - in...

[pawelz]

Author: pawelz                       Date: Sun Apr 18 21:35:58 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- install examples in %{_examplesdir}
- install java sources in %{_javasrcdir}
- let examples and sources subpackages belong to Documentation group

---- Files affected:
packages/icedtea6:
   icedtea6.spec (1.58 -> 1.59) 

---- Diffs:

================================================================
Index: packages/icedtea6/icedtea6.spec
diff -u packages/icedtea6/icedtea6.spec:1.58 packages/icedtea6/icedtea6.spec:1.59
--- packages/icedtea6/icedtea6.spec:1.58	Sun Apr 18 22:36:54 2010
+++ packages/icedtea6/icedtea6.spec	Sun Apr 18 23:35:53 2010
@@ -346,7 +346,7 @@
 %package jdk-sources
 Summary:	OpenJDK and GNU Classpath code - sources
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath - kod źródłowy
-Group:		Development/Languages/Java
+Group:		Documentation
 
 %description jdk-sources
 Source code for the OpenJDK development kit and Java standard library.
@@ -358,7 +358,7 @@
 %package examples
 Summary:	OpenJDK and GNU Classpath code - examples
 Summary(pl.UTF-8):	Kod OpenJDK i GNU Classpath - przykłady
-Group:		Development/Languages/Java
+Group:		Documentation
 
 %description examples
 Code examples for OpenJDK.
@@ -441,7 +441,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{dstdir},%{_mandir}/ja,%{_browserpluginsdir}} \
-	$RPM_BUILD_ROOT{%{jvmjardir},%{_prefix}/src/%{name}-{jdk-sources,examples}} \
+	$RPM_BUILD_ROOT{%{jvmjardir},%{_examplesdir}/%{name}-%{version},%{_javasrcdir}} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/%{name}
 
 # install the 'JDK image', it contains the JRE too
@@ -451,10 +451,10 @@
 ln -s %{dstreldir} $RPM_BUILD_ROOT%{_jvmdir}/%{name}
 ln -s %{jrereldir} $RPM_BUILD_ROOT%{_jvmdir}/%{name}-jre
 
-# move JDK sources and demo to %{_prefix}/src
-mv $RPM_BUILD_ROOT%{dstdir}/demo $RPM_BUILD_ROOT%{_prefix}/src/%{name}-examples/
-mv $RPM_BUILD_ROOT%{dstdir}/sample $RPM_BUILD_ROOT%{_prefix}/src/%{name}-examples/
-mv $RPM_BUILD_ROOT%{dstdir}/src.zip $RPM_BUILD_ROOT%{_prefix}/src/%{name}-jdk-sources/
+# move JDK sources and demo to /usr/src
+mv $RPM_BUILD_ROOT%{dstdir}/demo $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+mv $RPM_BUILD_ROOT%{dstdir}/sample $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+mv $RPM_BUILD_ROOT%{dstdir}/src.zip $RPM_BUILD_ROOT%{_javasrcdir}/%{name}-jdk.zip
 
 # move manual pages to its place
 mv $RPM_BUILD_ROOT%{dstdir}/man/ja_JP.eucJP/man1 $RPM_BUILD_ROOT%{_mandir}/ja/man1
@@ -830,12 +830,11 @@
 
 %files jdk-sources
 %defattr(644,root,root,755)
-%dir %{_prefix}/src/%{name}-jdk-sources
-%{_prefix}/src/%{name}-jdk-sources/src.zip
+%{_javasrcdir}/%{name}-jdk.zip
 
 %files examples
 %defattr(644,root,root,755)
-%{_prefix}/src/%{name}-examples
+%{_examplesdir}/%{name}-%{version}
 
 %if %{with plugin}
 %files jre-base-mozilla-plugin
@@ -856,6 +855,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.59  2010/04/18 21:35:53  pawelz
+- install examples in %{_examplesdir}
+- install java sources in %{_javasrcdir}
+- let examples and sources subpackages belong to Documentation group
+
 Revision 1.58  2010/04/18 20:36:54  pawelz
 - make use of our new cool %bootstrap_release macro
 
================================================================

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