- Version: 4.1

- use the standard %{_javadir} macro
- separate javadoc documentation and put it in the %{_javadocdir}

Changed files:
    java-junit.spec -> 1.17

diff --git a/java-junit.spec b/java-junit.spec
index a37d7dd7d2f122d2e0797f92481cd1f96064fc65..426ee9c10c16c7976272d84ea0cdbe4823dda8db 100644 (file)
--- a/java-junit.spec
+++ b/java-junit.spec
@@ -1,20 +1,18 @@
 Summary:       JUnit - regression testing framework
 Summary(pl):   JUnit - ¶rodowisko do testów regresji
 Name:          junit
-Version:       3.8.2
+Version:       4.1
 Release:       1
 License:       IBM Common Public License v1.0
 Group:         Development/Languages/Java
 Source0:       http://dl.sourceforge.net/junit/%{name}%{version}.zip
-# Source0-md5: 9b8963ba2147a64bd5f1574b6fd289cb
+# Source0-md5: e66d3e77c70b3297f2c6a12990fc3120
 URL:           http://www.junit.org/
 BuildRequires: unzip
 Requires:      jdk >= 1.1
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                _javalibdir     %{_datadir}/java
-
 %description
 JUnit - regression testing framework.
 
@@ -32,14 +30,26 @@ JUnit documentation.
 %description doc -l pl
 Dokumentacja do JUnit.
 
+%package javadoc
+Summary:       Javadoc documentation for JUnit
+Summary(pl):   Dokumentacja javadoc dla JUnit
+Group:         Development/Languages/Java
+
+%description javadoc
+JUnit API documentation.
+
 %prep
 %setup -q -n %{name}%{version}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_javalibdir}
-install junit.jar $RPM_BUILD_ROOT%{_javalibdir}/junit-%{version}.jar
-ln -sf junit-%{version}.jar $RPM_BUILD_ROOT%{_javalibdir}/junit.jar
+install -d $RPM_BUILD_ROOT%{_javadir}
+install junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/junit-%{version}.jar
+ln -sf junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/junit.jar
+
+# javadoc
+install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -47,8 +57,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.html cpl-v10.html
-%{_javalibdir}/*.jar
+%{_javadir}/*.jar
 
 %files doc
 %defattr(644,root,root,755)
-%doc doc javadoc junit
+%doc doc/* junit/*
+
+%files javadoc
+%defattr(644,root,root,755)
+%{_javadocdir}/%{name}-%{version}