SPECS: jaf.spec - update to 1.1.1 (same version is in java-sun 1.6...

[glen]

Author: glen                         Date: Tue Dec 11 13:40:42 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- update to 1.1.1 (same version is in java-sun 1.6)
- add -javadoc and -demo packages
- java package unify

---- Files affected:
SPECS:
   jaf.spec (1.21 -> 1.22) 

---- Diffs:

================================================================
Index: SPECS/jaf.spec
diff -u SPECS/jaf.spec:1.21 SPECS/jaf.spec:1.22
--- SPECS/jaf.spec:1.21	Tue Feb 13 09:06:35 2007
+++ SPECS/jaf.spec	Tue Dec 11 14:40:37 2007
@@ -1,22 +1,31 @@
 # $Revision$, $Date$
+# NOTE:
+#   The JavaBeans Activation Framework 1.1.1 final release is included with the
+#   Java SE 6 release and is also available separately.
+#
+# TODO
+# - recheck the license, perhaps it's more relaxed now.
+%include	/usr/lib/rpm/macros.java
 Summary:	JavaBeans (tm) Activation Framework
 Summary(pl.UTF-8):	Środowisko aktywacyjne JavaBeans(tm)
 Name:		jaf
-Version:	1.1
+Version:	1.1.1
 Release:	1
 License:	restricted (see LICENSE.txt)
 Group:		Development/Languages/Java
 # download through froms from URL
-Source0:	%{name}-%(echo %{version} | tr . _)-fr.zip
-# NoSource0-md5:	7423eb6831ba82e7d1f10956eb2bd0d3
+Source0:	%{name}-%(echo %{version} | tr . _).zip
+# NoSource0-md5:	e55a9e5a44eb55fa588d1020544226f1
 NoSource:	0
-URL:		http://java.sun.com/products/javabeans/glasgow/jaf.html
+URL:		http://java.sun.com/products/javabeans/jaf/index.jsp
+BuildRequires:	jpackage-utils
+BuildRequires:	rpm-javaprov
+BuildRequires:	rpmbuild(macros) >= 1.300
+Requires:	jpackage-utils
 Requires:	jre >= 1.1.6
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_javalibdir	%{_datadir}/java
-
 %description
 JavaBeans (tm) Activation Framework.
 
@@ -34,14 +43,49 @@
 %description doc -l pl.UTF-8
 Dokumentacja do środowiska JavaBeans(tm) Activation Framework.
 
+%package javadoc
+Summary:	Online manual for %{name}
+Summary(pl.UTF-8):	Dokumentacja online do %{name}
+Group:		Documentation
+Requires:	jpackage-utils
+
+%description javadoc
+Documentation for %{name}.
+
+%description javadoc -l pl.UTF-8
+Dokumentacja do %{name}.
+
+%description javadoc -l fr.UTF-8
+Javadoc pour %{name}.
+
+%package demo
+Summary:	Demo for %{name}
+Summary(pl.UTF-8):	Pliki demonstracyjne dla pakietu %{name}
+Group:		Development
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description demo
+Demonstrations and samples for %{name}.
+
+%description demo -l pl.UTF-8
+Pliki demonstracyjne i przykłady dla pakietu %{name}.
+
 %prep
 %setup -q
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-install *.jar $RPM_BUILD_ROOT%{_javalibdir}
+install -d $RPM_BUILD_ROOT%{_javadir}
+install activation.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/activation.jar
+ln -s %{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/jaf.jar
+
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a demo/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -a docs/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -49,11 +93,20 @@
 %files
 %defattr(644,root,root,755)
 %doc LICENSE.txt RELNOTES.txt README.txt
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
-%doc demo docs
+%doc docs/JAF-*
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}
+%ghost %{_javadocdir}/%{name}
+
+%files demo
+%defattr(644,root,root,755)
+%{_examplesdir}/%{name}-%{version}
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -61,6 +114,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.22  2007-12-11 13:40:37  glen
+- update to 1.1.1 (same version is in java-sun 1.6)
+- add -javadoc and -demo packages
+- java package unify
+
 Revision 1.21  2007-02-13 08:06:35  glen
 - tabs in preamble
 
@@ -68,7 +126,7 @@
 - converted to UTF-8
 
 Revision 1.19  2006/07/05 06:18:56  czarny
- - up to 1.1
+- up to 1.1
 
 Revision 1.18  2005/08/14 13:15:05  glen
 - 1.0.2 update2
@@ -101,10 +159,10 @@
 - massive attack s/pld.org.pl/pld-linux.org/
 
 Revision 1.8  2002/08/24 20:10:05  qboosh
-- new %%doc, License fix, R: jre >= 1.1.6
+- new %doc, License fix, R: jre >= 1.1.6
 
 Revision 1.7  2002/04/25 16:38:24  arturs
-fixed a small typo
+- fixed a small typo
 
 Revision 1.6  2002/02/23 02:59:08  kloczek
 - adapterized.
@@ -114,10 +172,10 @@
   Group field using gettext).
 
 Revision 1.4  2002/01/18 02:13:23  kloczek
-perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
+- perl -pi -e "s/pld-list\@pld.org.pl/feedback\@pld.org.pl/"
 
 Revision 1.3  2001/11/30 10:17:05  qboosh
-- removed %%_javalibdir from package
+- removed %_javalibdir from package
 
 Revision 1.2  2001/11/30 10:04:44  qboosh
 - pl translations, cosmetics
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/jaf.spec?r1=1.21&r2=1.22&f=u