rpms/cobertura/devel cobertura.spec,1.1,1.2 import.log,1.1,1.2

[Victor G. Vasilyev]

Author: victorv

Update of /cvs/pkgs/rpms/cobertura/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2393/devel

Modified Files:
	cobertura.spec import.log 
Log Message:
Fix B(R) according to guidelines



Index: cobertura.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/cobertura.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- cobertura.spec	13 Aug 2009 00:23:09 -0000	1.1
+++ cobertura.spec	19 Aug 2009 16:48:00 -0000	1.2
@@ -1,7 +1,15 @@
+# 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}/%{*} ;
+
 Name:           cobertura
 Version:        1.9
-Release:        2%{?dist}
-Summary:        Free Java tool that calculates the percentage of code accessed by tests
+Release:        3%{?dist}
+Summary:        Java tool that calculates the percentage of code accessed by tests
 
 Group:          Development/Libraries
 License:        ASL 1.1 and GPLv2+
@@ -15,12 +23,12 @@ Patch1:         cobertura-scripts.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  ant >= 0:1.6.5
+BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  ant-trax
 BuildRequires:  asm2
 BuildRequires:  dos2unix
-BuildRequires:  jpackage-utils >= 0:1.7.3
+BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  jakarta-oro
 BuildRequires:  jaxen
@@ -31,16 +39,16 @@ BuildRequires:  xalan-j2
 BuildRequires:  xerces-j2
 BuildRequires:  xml-commons-jaxp-1.3-apis
 
-Requires:       ant >= 0:1.6.5
+Requires:       ant
 Requires:       asm2
-Requires:       jpackage-utils >= 0:1.7.3
+Requires:       jpackage-utils
 Requires:       java
 Requires:       jakarta-oro
 Requires:       junit
 Requires:       log4j
 
-Requires(post): jpackage-utils >= 0:1.7.3
-Requires(postun): jpackage-utils >= 0:1.7.3
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
 
 BuildArch:      noarch
 
@@ -49,31 +57,11 @@ Cobertura is a free Java tool that calcu
 accessed by tests. It can be used to identify which parts of your 
 Java program are lacking test coverage. It is based on jcoverage.
 
-Features
-
-    * Can be executed from ant or from the command line.
-    * Instruments Java bytecode after it has been compiled.
-    * Can generate reports in HTML or XML.
-    * Shows percent of lines coveraged and branches coveraged for each
-      class, package, and for the overall project.
-    * Shows the McCabe cyclomatic code complexity of each class, and
-      the average cyclomatic code complexity for each package, and for
-      the overall product.
-    * Can sort HTML results by class name, percent of lines covered,
-      percent of branches covered, etc. And can sort in ascending or
-      decending order.
-
-NOTE: Due to asm version conflicts, if you use Cobertura as an ant
-      task you MUST add manually a classpath element 
-
-        <classpath location="/usr/share/java/asm2/asm2.jar"/>
-
-      to all Cobertura tasks requiring bytecode manipulation.
-
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       %{name}-%{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+Requires:       jpackage-utils
 
 %description    javadoc
 This package contains the API documentation for %{name}.
@@ -88,17 +76,17 @@ dos2unix -k ChangeLog COPYING COPYRIGHT 
 
 %build
 pushd lib
-%__ln_s -f %{_javadir}/asm2/asm2.jar
-%__ln_s -f %{_javadir}/asm2/asm2-tree.jar
-%__ln_s -f %{_javadir}/jaxen.jar
-%__ln_s -f %{_javadir}/jdom.jar
-%__ln_s -f %{_javadir}/junit.jar
-%__ln_s -f %{_javadir}/oro.jar
-%__ln_s -f %{_javadir}/log4j.jar
-%__ln_s -f %{_javadir}/xalan-j2.jar
+%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
-%__ln_s -f %{_javadir}/xerces-j2.jar
-%__ln_s -f %{_javadir}/xml-commons-jaxp-1.3-apis.jar
+%lnSysJAR xerces-j2.jar
+%lnSysJAR xml-commons-jaxp-1.3-apis.jar
 popd
 popd
 
@@ -163,6 +151,10 @@ EOF
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 19 2009  Victor 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
 - 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


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/cobertura/devel/import.log,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- import.log	13 Aug 2009 00:23:09 -0000	1.1
+++ import.log	19 Aug 2009 16:48:00 -0000	1.2
@@ -1 +1,2 @@
 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