rpms/cobertura/devel cobertura-1.9.3.pom, NONE, 1.1 cobertura-runtime-1.9.3.pom, NONE, 1.1 .cvsignore, 1.2, 1.3 cobertura.spec, 1.2, 1.3 import.log, 1.2, 1.3 sources, 1.2, 1.3 cobertura-1.9.pom, 1.1, NONE cobertura-build_xml.patch, 1.1, NONE cobertura-runtime-1.9.pom, 1.1, NONE cobertura-scripts.patch, 1.1, NONE
Victor G. Vasilyev
victorv at fedoraproject.org
Mon Jun 21 20:27:12 UTC 2010
Author: victorv
Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3616/devel
Modified Files:
.cvsignore cobertura.spec import.log sources
Added Files:
cobertura-1.9.3.pom cobertura-runtime-1.9.3.pom
Removed Files:
cobertura-1.9.pom cobertura-build_xml.patch
cobertura-runtime-1.9.pom cobertura-scripts.patch
Log Message:
cobertura updated to 1.9.3
--- NEW FILE cobertura-1.9.3.pom ---
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>JPP</groupId>
<artifactId>cobertura</artifactId>
<version>1.9.3</version>
<dependencies>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<version>2.0.8</version>
</dependency>
<dependency>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm-tree</artifactId>
<version>3.1</version>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.9</version>
</dependency>
</dependencies>
</project>
--- NEW FILE cobertura-runtime-1.9.3.pom ---
<?xml version="1.0" ?>
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura-runtime</artifactId>
<name>Cobertura :: Limited Runtime</name>
<version>1.9.3</version>
<packaging>pom</packaging>
<description>
Cobertura Runtime artifact to prevent unneeded dependencies at runtime.
</description>
<licenses>
<license>
<name>The GNU General Public License, Version 2</name>
<url>http://www.gnu.org/licenses/gpl.txt</url>
<distribution>repo</distribution>
</license>
</licenses>
<dependencies>
<dependency>
<groupId>net.sourceforge.cobertura</groupId>
<artifactId>cobertura</artifactId>
<version>1.9.3</version>
<exclusions>
<exclusion>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
</exclusion>
<exclusion>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
<exclusion>
<groupId>org.objectweb.asm</groupId>
<artifactId>asm-tree</artifactId>
</exclusion>
<exclusion>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 13 Aug 2009 00:23:09 -0000 1.2
+++ .cvsignore 21 Jun 2010 20:27:12 -0000 1.3
@@ -1 +1 @@
-cobertura-1.9-src.tar.gz
+cobertura-1.9.3-src.tar.gz
Index: cobertura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/cobertura.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- cobertura.spec 19 Aug 2009 16:48:00 -0000 1.2
+++ cobertura.spec 21 Jun 2010 20:27:12 -0000 1.3
@@ -1,51 +1,58 @@
# Prevent brp-java-repack-jars from being run
%global __jar_repack %{nil}
-# Links the system JAR
-# %1 - the sys jar
-# %2 - the symlink (optional)
-%global lnSysJAR() %__ln_s -f %{_javadir}/%{*} ;
+# Links the system JAR.
+# %%{1} - the sys jar
+# %%{2} - the symlink name/path (optional)
+%global lnSysJAR() \
+ if [ -f %{_javadir}/%{1} ] ; then \
+ %__ln_s -f %{_javadir}/%{*} ; \
+ else \
+ echo "%{1} doesn't exist." ; exit 1 ; \
+ fi ;
Name: cobertura
-Version: 1.9
-Release: 3%{?dist}
+Version: 1.9.3
+Release: 1%{?dist}
Summary: Java tool that calculates the percentage of code accessed by tests
Group: Development/Libraries
License: ASL 1.1 and GPLv2+
URL: http://cobertura.sourceforge.net/
-Source0: http://prdownloads.sourceforge.net/cobertura/cobertura-1.9-src.tar.gz
+Source0: http://prdownloads.sourceforge.net/cobertura/cobertura-1.9.3-src.tar.gz
Source1: %{name}-%{version}.pom
Source2: %{name}-runtime-%{version}.pom
-Patch0: cobertura-build_xml.patch
-Patch1: cobertura-scripts.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant
BuildRequires: ant-junit
BuildRequires: ant-trax
-BuildRequires: asm2
+BuildRequires: antlr
BuildRequires: dos2unix
+BuildRequires: groovy
BuildRequires: jpackage-utils
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
BuildRequires: jakarta-oro
BuildRequires: jaxen
BuildRequires: jdom
-BuildRequires: junit
+BuildRequires: junit4
BuildRequires: log4j
+BuildRequires: objectweb-asm
+BuildRequires: tomcat6-servlet-2.5-api
BuildRequires: xalan-j2
BuildRequires: xerces-j2
BuildRequires: xml-commons-jaxp-1.3-apis
+BuildRequires: jakarta-commons-cli
Requires: ant
-Requires: asm2
Requires: jpackage-utils
-Requires: java
+Requires: java >= 1:1.6.0
Requires: jakarta-oro
-Requires: junit
+Requires: junit4
Requires: log4j
+Requires: objectweb-asm >= 0:3.0
Requires(post): jpackage-utils
Requires(postun): jpackage-utils
@@ -55,7 +62,7 @@ BuildArch: noarch
%description
Cobertura is a free Java tool that calculates the percentage of code
accessed by tests. It can be used to identify which parts of your
-Java program are lacking test coverage. It is based on jcoverage.
+Java program are lacking test coverage.
%package javadoc
Summary: Javadoc for %{name}
@@ -68,31 +75,34 @@ This package contains the API documentat
%prep
%setup -q
-%patch0 -b .sav
-%patch1 -b .sav
find . -type f -name '*.jar' | xargs -t rm
-dos2unix -k ChangeLog COPYING COPYRIGHT README
+dos2unix -k -f ChangeLog COPYING COPYRIGHT README
+
%build
pushd lib
-%lnSysJAR asm2/asm2.jar
-%lnSysJAR asm2/asm2-tree.jar
-%lnSysJAR jaxen.jar
-%lnSysJAR jdom.jar
-%lnSysJAR junit.jar
-%lnSysJAR oro.jar
-%lnSysJAR log4j.jar
-%lnSysJAR xalan-j2.jar
-pushd xerces
-%lnSysJAR xerces-j2.jar
-%lnSysJAR xml-commons-jaxp-1.3-apis.jar
+ %lnSysJAR jaxen.jar
+ %lnSysJAR jdom.jar
+ %lnSysJAR junit4.jar
+ %lnSysJAR log4j.jar
+ %lnSysJAR objectweb-asm/asm-all.jar
+ %lnSysJAR oro.jar
+ %lnSysJAR xalan-j2.jar
+ %lnSysJAR tomcat6-servlet-2.5-api.jar servlet-api.jar
+ %lnSysJAR commons-cli.jar
+ pushd xerces
+ %lnSysJAR xerces-j2.jar
+ %lnSysJAR xml-commons-jaxp-1.3-apis.jar
+ popd
popd
+
+pushd antLibrary/common
+ %lnSysJAR groovy.jar
popd
-export CLASSPATH=
-export OPT_JAR_LIST="junit ant/ant-junit jaxp_transform_impl ant/ant-trax xalan-j2-serializer"
-%ant compile test jar javadoc
+export CLASSPATH=$(build-classpath objectweb-asm/asm-all commons-cli antlr junit4)
+%ant -Djetty.dir=. -Dlib.dir=. compile test jar javadoc
%install
%__rm -rf %{buildroot}
@@ -114,16 +124,9 @@ export OPT_JAR_LIST="junit ant/ant-junit
%__mkdir_p %{buildroot}%{_sysconfdir}/ant.d
%__cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-ant cobertura junit log4j oro xerces-j2
+ant cobertura junit4 log4j oro xerces-j2
EOF
-# bin
-%__mkdir_p %{buildroot}%{_bindir}
-%__install -m 755 cobertura-check.sh %{buildroot}%{_bindir}/cobertura-check
-%__install -m 755 cobertura-instrument.sh %{buildroot}%{_bindir}/cobertura-instrument
-%__install -m 755 cobertura-merge.sh %{buildroot}%{_bindir}/cobertura-merge
-%__install -m 755 cobertura-report.sh %{buildroot}%{_bindir}/cobertura-report
-
# javadoc
%__mkdir_p %{buildroot}%{_javadocdir}/%{name}
%__cp -a build/api/* %{buildroot}%{_javadocdir}/%{name}
@@ -140,7 +143,6 @@ EOF
%files
%defattr(-,root,root,-)
%doc ChangeLog COPYING COPYRIGHT README
-%attr(0755,root,root) %{_bindir}/*
%{_javadir}/*.jar
%config(noreplace) %{_sysconfdir}/ant.d/%{name}
%{_datadir}/maven2/poms/JPP-%{name}*.pom
@@ -151,11 +153,13 @@ EOF
%doc %{_javadocdir}/%{name}
%changelog
-* Wed Aug 19 2009 Victor Vasilyev <victor.vasilyev at sun.com> 1.9-3
+* Mon Jun 21 2010 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.9.3-1
+- Release 1.9.3
+* Wed Aug 19 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.9-3
- Fix B(R) according to guidelines
- Use the lnSysJAR macro
- Prevent brp-java-repack-jars from being run
-* Sun Aug 09 2009 Victor Vasilyev <victor.vasilyev at sun.com> 1.9-2
+* Sun Aug 09 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.9-2
- The license tag is changed according to http://cobertura.sourceforge.net/license.html
-* Fri Jun 19 2009 Victor Vasilyev <victor.vasilyev at sun.com> 1.9-1
+* Fri Jun 19 2009 Victor G. Vasilyev <victor.vasilyev at sun.com> 1.9-1
- release 1.9
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- import.log 19 Aug 2009 16:48:00 -0000 1.2
+++ import.log 21 Jun 2010 20:27:12 -0000 1.3
@@ -1,2 +1,3 @@
cobertura-1_9-2_fc12:HEAD:cobertura-1.9-2.fc12.src.rpm:1250123324
cobertura-1_9-3_fc12:HEAD:cobertura-1.9-3.fc12.src.rpm:1250700796
+cobertura-1_9_3-1_fc14:HEAD:cobertura-1.9.3-1.fc14.src.rpm:1277166347
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 13 Aug 2009 00:23:09 -0000 1.2
+++ sources 21 Jun 2010 20:27:12 -0000 1.3
@@ -1 +1 @@
-0b23286374edc1e0a9ed7dd592b0fed3 cobertura-1.9-src.tar.gz
+55436f8856e929bb69ce122b8ecf66d1 cobertura-1.9.3-src.tar.gz
--- cobertura-1.9.pom DELETED ---
--- cobertura-build_xml.patch DELETED ---
--- cobertura-runtime-1.9.pom DELETED ---
--- cobertura-scripts.patch DELETED ---
More information about the scm-commits
mailing list