SPECS: java-gnu-classpath.spec - unified apidocs - updated TODO - added NOT...

[pawelz]

Author: pawelz                       Date: Tue Feb 17 08:48:57 2009 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified apidocs
- updated TODO
- added NOT about gjdoc
- fixed %%files
- rel 1

---- Files affected:
SPECS:
   java-gnu-classpath.spec (1.40 -> 1.41) 

---- Diffs:

================================================================
Index: SPECS/java-gnu-classpath.spec
diff -u SPECS/java-gnu-classpath.spec:1.40 SPECS/java-gnu-classpath.spec:1.41
--- SPECS/java-gnu-classpath.spec:1.40	Tue Feb 17 09:14:56 2009
+++ SPECS/java-gnu-classpath.spec	Tue Feb 17 09:48:52 2009
@@ -1,6 +1,11 @@
 # $Revision$, $Date$
 #
-# TODO: split (awt-gtk, midi-alsa, midi-dssi, ???-qt, ???-gconf, ???-gstreamer, browser???, tools, devel-tools)
+# TODO:
+# - split (awt-gtk, midi-alsa, midi-dssi, ???-qt, ???-gconf, ???-gstreamer, browser???)
+#
+# NOTE:
+# - do not package gjdoc. This version of gjdoc is devel. See gjdoc.spec for
+#   stable version.
 #
 # Conditional build:
 %bcond_with	gcj	# use gcj instead of jdk  [broken]
@@ -12,7 +17,7 @@
 Summary(pl.UTF-8):	GNU Classpath (Najważniejsze biblioteki dla Javy)
 Name:		java-gnu-classpath
 Version:	0.98
-Release:	0.1
+Release:	1
 License:	GPL v2+ with linking exception
 Group:		Libraries
 Source0:	http://ftp.gnu.org/gnu/classpath/%{srcname}-%{version}.tar.gz
@@ -145,13 +150,17 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}-apidocs}
+install -d $RPM_BUILD_ROOT{%{_javadir},%{_javadocdir}/%{srcname}-%{version}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+ln -s %{_datadir}/classpath/glibj.zip $RPM_BUILD_ROOT%{_javadir}/glibj.jar
+ln -s %{_datadir}/classpath/tools.zip $RPM_BUILD_ROOT%{_javadir}/tools.jar
+
 %if %{with apidocs}
-cp -afr doc/api/html/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}-apidocs
+cp -afr doc/api/html/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version}
+ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/classpath/*.la
@@ -165,6 +174,9 @@
 %postun	devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
+%post apidocs
+ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname}
+
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog NEWS README THANKYOU TODO
@@ -172,7 +184,6 @@
 %attr(755,root,root) %{_libdir}/classpath/libgcjwebplugin.so
 %attr(755,root,root) %{_libdir}/classpath/libgconfpeer.so
 %attr(755,root,root) %{_libdir}/classpath/libgjsmalsa.so
-%attr(755,root,root) %{_libdir}/classpath/libgjsmdssi.so
 %attr(755,root,root) %{_libdir}/classpath/libgstreamerpeer.so
 %attr(755,root,root) %{_libdir}/classpath/libgtkpeer.so
 %attr(755,root,root) %{_libdir}/classpath/libjavaio.so*
@@ -191,6 +202,8 @@
 %dir %{_datadir}/classpath
 %{_datadir}/classpath/glibj.zip
 %{_datadir}/classpath/tools.zip
+%{_javadir}/glibj.jar
+%{_javadir}/tools.jar
 
 %files tools
 %attr(755,root,root) %{_bindir}/gappletviewer
@@ -224,7 +237,8 @@
 %if %{with apidocs}
 %files apidocs
 %defattr(644,root,root,755)
-%{_javadocdir}/%{srcname}-%{version}-apidocs
+%{_javadocdir}/%{srcname}-%{version}
+%ghost %{_javadocdir}/%{srcname}
 %endif
 
 %files devel
@@ -243,6 +257,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.41  2009/02/17 08:48:52  pawelz
+- unified apidocs
+- updated TODO
+- added NOT about gjdoc
+- fixed %%files
+- rel 1
+
 Revision 1.40  2009/02/17 08:14:56  pawelz
 - n arg for %%setup
 - up to 0.98
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-gnu-classpath.spec?r1=1.40&r2=1.41&f=u