Author: jajcus Date: Sun May 21 11:09:00 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- Version: 4.1
- use the standard %{_javadir} macro
- separate javadoc documentation and put it in the %{_javadocdir}
---- Files affected:
SPECS:
junit.spec (1.16 -> 1.17)
---- Diffs:
================================================================
Index: SPECS/junit.spec
diff -u SPECS/junit.spec:1.16 SPECS/junit.spec:1.17
--- SPECS/junit.spec:1.16 Sat Mar 11 18:13:02 2006
+++ SPECS/junit.spec Sun May 21 13:08:55 2006
@@ -2,20 +2,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.
@@ -33,14 +31,26 @@
%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
@@ -48,11 +58,15 @@
%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}
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
@@ -60,6 +74,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.17 2006/05/21 11:08:55 jajcus
+- Version: 4.1
+- use the standard %{_javadir} macro
+- separate javadoc documentation and put it in the %{_javadocdir}
+
Revision 1.16 2006/03/11 17:13:02 pluto
= updated to 3.8.2.
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/junit.spec?r1=1.16&r2=1.17&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
