rpms/junit4/devel junit-4.5.pom, NONE, 1.1 .cvsignore, 1.2, 1.3 junit4.spec, 1.2, 1.3 sources, 1.2, 1.3 junit4.3.1-build.xml, 1.1, NONE
David Walluck
dwalluck at fedoraproject.org
Mon Oct 27 20:11:00 UTC 2008
Author: dwalluck
Update of /cvs/pkgs/rpms/junit4/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8827
Modified Files:
.cvsignore junit4.spec sources
Added Files:
junit-4.5.pom
Removed Files:
junit4.3.1-build.xml
Log Message:
- 4.5
--- NEW FILE junit-4.5.pom ---
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
<modelVersion>4.0.0</modelVersion>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.5</version>
<name>JUnit</name>
<url>http://junit.org</url>
<description>
JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.
</description>
<organization>
<name>JUnit</name>
<url>http://www.junit.org</url>
</organization>
<licenses>
<license>
<name>Common Public License Version 1.0</name>
<url>http://www.opensource.org/licenses/cpl1.0.txt</url>
</license>
</licenses>
<scm>
<url>http://junit.cvs.sourceforge.net/junit/</url>
</scm>
<dependencies>
<!-- this dependency is included in the jar, see MAVENUPLOAD-1651
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-core</artifactId>
<version>1.1</version>
</dependency>
-->
</dependencies>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 13 Aug 2007 14:45:06 -0000 1.2
+++ .cvsignore 27 Oct 2008 20:10:30 -0000 1.3
@@ -1 +1 @@
-junit4.3.1.zip
+junit-4.5.tar.bz2
Index: junit4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/junit4.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- junit4.spec 9 Jul 2008 20:16:27 -0000 1.2
+++ junit4.spec 27 Oct 2008 20:10:30 -0000 1.3
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2005, JPackage Project
+# Copyright (c) 2000-2008, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -28,38 +28,43 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-%define gcj_support 0
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
Name: junit4
-Version: 4.3.1
-Release: 1.2%{?dist}
+Version: 4.5
+Release: 2.1%{?dist}
+Epoch: 0
Summary: Java regression test package
License: CPL
-Url: http://www.junit.org/
+URL: http://www.junit.org/
Group: Development/Tools
-Source0: http://internap.dl.sourceforge.net/sourceforge/junit/junit4.3.1.zip
-Source1: junit4.3.1-build.xml
+# cvs -d:pserver:anonymous at junit.cvs.sourceforge.net:/cvsroot/junit login
+# cvs -z3 -d:pserver:anonymous at junit.cvs.sourceforge.net:/cvsroot/junit export -r r45 -d junit-4.5 junit
+# tar cjf junit-4.5.tar.bz2 junit-4.5/
+Source0: junit-4.5.tar.bz2
+Source2: junit-4.5.pom
+Requires(post): jpackage-utils >= 0:1.7.4
+Requires(postun): jpackage-utils >= 0:1.7.4
+Requires: hamcrest
+Requires: java >= 0:1.5.0
BuildRequires: ant
-BuildRequires: dos2unix
-BuildRequires: jpackage-utils >= 0:1.6
-%if ! %{gcj_support}
-Buildarch: noarch
-%endif
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+BuildRequires: jpackage-utils >= 0:1.7.4
+BuildRequires: java-devel >= 0:1.5.0
+BuildRequires: hamcrest
%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
+BuildRequires: java-gcj-compat-devel
+%else
+Buildarch: noarch
%endif
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
JUnit is a regression testing framework written by Erich Gamma and Kent Beck.
It is used by the developer who implements unit tests in Java. JUnit is Open
Source Software, released under the Common Public License Version 1.0 and
+JUnit is Open Source Software, released under the IBM Public License and
hosted on SourceForge.
-
%package manual
Group: Documentation
Summary: Manual for %{name}
@@ -77,68 +82,66 @@
%package demo
Group: Development/Libraries
Summary: Demos for %{name}
-Requires: %{name} = %{version}-%{release}
-
-%if %{gcj_support}
-BuildRequires: java-gcj-compat-devel
-Requires(post): java-gcj-compat
-Requires(postun): java-gcj-compat
-%endif
+Requires: %{name} = %{epoch}:%{version}-%{release}
%description demo
Demonstrations and samples for %{name}.
%prep
-%setup -q -n junit%{version}
-# extract sources
-jar xf junit-4.3.1-src.jar
-rm -f junit-4.3.1-src.jar
-cp %{SOURCE1} build.xml
-find -name \*.class -o -name \*.jar | xargs rm
+%setup -q -n junit-%{version}
+find . -type f -name "*.jar" | xargs -t rm
+ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.1.jar
+perl -pi -e 's/\r$//g' stylesheet.css
%build
+export CLASSPATH=
+export OPT_JAR_LIST=:
ant dist
-find -name \*.htm -o -name \*.html | xargs dos2unix
-
%install
rm -rf $RPM_BUILD_ROOT
+
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 junit%{version}/junit.jar $RPM_BUILD_ROOT%{_javadir}/junit-%{version}.jar
+install -m 644 junit%{version}/junit-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf junit-%{version}.jar junit4.jar
+ln -sf %{name}-%{version}.jar %{name}.jar
popd
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE2} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+%add_to_maven_depmap junit junit %{version} JPP %{name}
+
# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/junit-%{version}
-cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/junit-%{version}
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr junit%{version}/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
# demo
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit # Not using %name for last part because it is
# part of package name
cp -pr junit%{version}/junit/* $RPM_BUILD_ROOT%{_datadir}/%{name}/demo/junit
%if %{gcj_support}
-# these --exclude options work around an aot-compile-rpm problem with test.jar
-%{_bindir}/aot-compile-rpm \
- --exclude usr/share/%{name}/demo \
- --exclude usr/share/%{name}/demo/junit/tests/runner/test.jar
+%{_bindir}/aot-compile-rpm
%endif
-ln -s junit-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
%clean
rm -rf $RPM_BUILD_ROOT
-%if %{gcj_support}
%post
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
fi
%endif
-%if %{gcj_support}
%postun
+%update_maven_depmap
+%if %{gcj_support}
if [ -x %{_bindir}/rebuild-gcj-db ]
then
%{_bindir}/rebuild-gcj-db
@@ -147,43 +150,67 @@
%files
%defattr(0644,root,root,0755)
-%doc README.html
-%{_javadir}/*
-
+%doc cpl-v10.html README.html
+%{_javadir}/%{name}.jar
+%{_javadir}/%{name}-%{version}.jar
+%{_datadir}/maven2/*
+%{_mavendepmapfragdir}/*
%if %{gcj_support}
%dir %{_libdir}/gcj/%{name}
-%attr(-,root,root) %{_libdir}/gcj/%{name}/junit-%{version}.jar.*
+%attr(-,root,root) %{_libdir}/gcj/%{name}/junit4-%{version}.jar.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/junit4-%{version}.jar.so
%endif
-%files manual
+%files demo
%defattr(0644,root,root,0755)
-%doc junit%{version}/doc/*
+%{_datadir}/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/demo.so
%files javadoc
%defattr(0644,root,root,0755)
-%doc %{_javadocdir}/junit-%{version}
-%doc %{_javadocdir}/%{name}
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
-%files demo
+%files manual
%defattr(0644,root,root,0755)
-%{_datadir}/%{name}
+%doc junit%{version}/doc/*
%changelog
-* Wed Jul 9 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 4.3.1-1.2
-- drop repotag
+* Mon Oct 27 2008 David Walluck <dwalluck at redhat.com> 0:4.5-2.1
+- build for Fedora
-* Tue Aug 07 2007 Ben Konrath <bkonrath at redhat.com> - 4.3.1-1jpp.1.fc8
+* Mon Oct 27 2008 David Walluck <dwalluck at redhat.com> 0:4.5-2
+- fix GCJ support
+- fix javadoc symlink
+
+* Mon Oct 20 2008 David Walluck <dwalluck at redhat.com> 0:4.5-1
+- 4.5
+
+* Thu Mar 06 2008 Ralph Apel <r.apel at r-apel.de> - 0:4.4-1jpp
+- 4.4
+- Switch to CVS for sources
+
+* Mon Feb 11 2008 Ralph Apel <r.apel at r-apel.de> - 0:4.3.1-4jpp
+- Fix versioned jar name, was junit-4.3.1
+- Restore Epoch
+
+* Fri Jan 25 2008 Ralph Apel <r.apel at r-apel.de> - 0:4.3.1-3jpp
+- build and upload noarch packages
+- Add pom and depmap frag
+- BR java-devel = 1.5.0
+- Restore Vendor, Distribution from macros
+
+* Tue Aug 07 2007 Ben Konrath <bkonrath at redhat.com> - 4.3.1-2jpp
- Set gcj_support to 0 to work around problems with GCJ.
- Fix buglet with the gcj post/postun if statement.
-
-* Wed Aug 01 2007 Ben Konrath <bkonrath at redhat.com> - 4.3.1-1jpp.1.fc8
- Fix tab / space problems.
- Fix buildroot.
- Update Summary.
- Convert html files to Unix file endings.
- Disable aot-compile-rpm because it's not working ATM.
-* Mon Jul 09 2007 Ben Konrath <bkonrath at redhat.com> - 4.3.1-1jpp.1.fc8
+* Mon Jul 09 2007 Ben Konrath <bkonrath at redhat.com> - 4.3.1-1jpp
- 4.3.1.
* Mon Feb 12 2007 Thomas Fitzsimmons <fitzsim at redhat.com> - 3.8.2-3jpp.1.fc7
@@ -262,4 +289,3 @@
* Sat Feb 17 2001 Guillaume Rousse <g.rousse at linux-mandrake.com> 3.5-1mdk
- first Mandrake release
-
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/junit4/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 13 Aug 2007 14:45:06 -0000 1.2
+++ sources 27 Oct 2008 20:10:30 -0000 1.3
@@ -1 +1 @@
-6c22e6733f4ba9d755a437375e3d476e junit4.3.1.zip
+538364da2ece036191194661dc77c27a junit-4.5.tar.bz2
--- junit4.3.1-build.xml DELETED ---
More information about the scm-commits
mailing list