[Jpackage-commits] dist/junit-addons/devel junit-addons-build.xml, 1.1, 1.2 junit-addons-pom.patch, NONE, 1.1 junit-addons.spec, 1.1, 1.2

David Walluck david at ryu.zarb.org
Sat Oct 15 02:37:25 CEST 2011


Update of /home/projects/jpackage/cvs/dist/junit-addons/devel
In directory ryu.zarb.org:/tmp/cvs-serv6073

Modified Files:
	junit-addons-build.xml junit-addons.spec 
Added Files:
	junit-addons-pom.patch 
Log Message:
- add pom

Index: junit-addons-build.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/junit-addons/devel/junit-addons-build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** junit-addons-build.xml	12 Dec 2008 16:29:43 -0000	1.1
--- junit-addons-build.xml	15 Oct 2011 00:37:23 -0000	1.2
***************
*** 109,115 ****
              depends="build"
              description="tests the junit-addons classes">
!         <java classname="junitx.runner.TestRunner" fork="yes">
!             <jvmarg value="-DPropertyManager.file=${test.src}/conf/tests.properties" />
!             <jvmarg value="-DXMLPropertyManager.file=${test.src}/conf/tests.xml" />
              <arg line="-verbose" />
              <arg line="-runner.properties ${test.src}/conf/runner.properties" />
--- 109,115 ----
              depends="build"
              description="tests the junit-addons classes">
!         <java classname="junit.textui.TestRunner" fork="yes">
!             <jvmarg value="-DPropertyManager.file=${test.src}/tests.properties" />
!             <jvmarg value="-DXMLPropertyManager.file=${test.src}/tests.xml" />
              <arg line="-verbose" />
              <arg line="-runner.properties ${test.src}/conf/runner.properties" />

--- NEW FILE: junit-addons-pom.patch ---
--- junit-addons-1.4.pom.orig	2006-03-11 07:14:03.000000000 -0500
+++ junit-addons-1.4.pom	2011-10-14 20:30:49.220683926 -0400
@@ -7,17 +7,17 @@
     <dependency> 
       <groupId>junit</groupId> 
       <artifactId>junit</artifactId> 
-      <version>3.8.1</version> 
+      <version>3.8.2</version> 
     </dependency> 
-    <dependency> 
+    <!--<dependency> 
       <groupId>xerces</groupId> 
       <artifactId>xercesImpl</artifactId> 
-      <version>2.6.2</version> 
-    </dependency> 
+      <version>2.9.1</version> 
+    </dependency>-->
     <dependency> 
-      <groupId>xerces</groupId> 
-      <artifactId>xmlParserAPIs</artifactId> 
-      <version>2.6.2</version> 
+      <groupId>xml-apis</groupId> 
+      <artifactId>xml-apis</artifactId> 
+      <version>1.3.04</version> 
     </dependency> 
   </dependencies> 
 </project>

Index: junit-addons.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/junit-addons/devel/junit-addons.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** junit-addons.spec	12 Dec 2008 16:29:43 -0000	1.1
--- junit-addons.spec	15 Oct 2011 00:37:23 -0000	1.2
***************
*** 1,3 ****
! # Copyright (c) 2000-2005, JPackage Project
  # All rights reserved.
  #
--- 1,3 ----
! # Copyright (c) 2000-2011, JPackage Project
  # All rights reserved.
  #
***************
*** 27,64 ****
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #
  
! %define name		junit-addons
! %define version		1.4
! %define release		2jpp
! %define	section		free
  
  
! Name:		%{name}
! Summary:	JUnitX helper classes for JUnit
! Url:		http://sourceforge.net/projects/junit-addons/
! Version:	%{version}
! Release:	%{release}
  Epoch:		0
! License:	Apache Software License
  Group:		Development/Testing
! Vendor:		JPackage Project
! Distribution:	JPackage
! BuildArch:	noarch
! Source0:	%{name}-%{version}.zip
  Source1:	%{name}-build.xml
  BuildRequires:	ant
  BuildRequires:	jakarta-commons-logging
  BuildRequires:	jaxen
  BuildRequires:	jdom
  BuildRequires:	junit
  BuildRequires:	xerces-j2
! BuildRequires:	xml-commons-apis
! Requires:	ant
! Requires:	jakarta-commons-logging
! Requires:	jaxen
! Requires:	jdom
! Requires:	junit
! BuildRoot:	%{_tmppath}/%{name}-%{version}-buildroot
  
  %description
--- 27,65 ----
  # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  
! %global namedversion %{version}
  
+ %define	section free
  
! Name:		junit-addons
! Version:	1.4
! Release:	5%{?dist}
  Epoch:		0
! Summary:	JUnitX helper classes for JUnit
! License:	ASL 1.1
  Group:		Development/Testing
! URL:		http://sourceforge.net/projects/junit-addons/
! Source0:	%{name}-%{namedversion}.zip
  Source1:	%{name}-build.xml
+ Source2:        http://repo1.maven.org/maven2/junit-addons/junit-addons/1.4/junit-addons-1.4.pom
+ Patch0:         junit-addons-pom.patch
+ Requires(post): jpackage-utils
+ Requires(postun): jpackage-utils
+ Requires:	ant
+ Requires:	jakarta-commons-logging
+ Requires:	jaxen
+ Requires:	jdom
+ Requires:       jpackage-utils
+ Requires:	junit
  BuildRequires:	ant
  BuildRequires:	jakarta-commons-logging
  BuildRequires:	jaxen
  BuildRequires:	jdom
+ BuildRequires:  jpackage-utils
  BuildRequires:	junit
  BuildRequires:	xerces-j2
! BuildRequires:	xml-commons-jaxp-1.3-apis
! BuildArch:	noarch
! BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
  
  %description
***************
*** 74,85 ****
  
  %prep
! %setup -q -n %{name}-%{version}
! chmod -R go=u-w *
! jar xf src.jar
! find . -name "*.jar" -exec rm -f {} \;
! cp %{SOURCE1} build.xml
  
  %build
! ant \
  	-Djdom.jar=$(build-classpath jdom) \
  	-Djaxen.jar=$(build-classpath jaxen) \
--- 75,92 ----
  
  %prep
! %setup -q
! %{__chmod} -Rf a+rX,u+w,g-w,o-w *
! %{jar} xf src.jar
! # FIXME: (dwalluck): removing this jar (which contains bianry class files) will break the tests
! find . -type f -name "*.jar" -a -type f -not -name tests.jar | xargs -t rm
! cp -p %{SOURCE1} build.xml
! %{__cp} -p %{SOURCE2} junit-addons-%{namedversion}.pom
! %patch0 -p0 -b .sav0
  
  %build
! export CLASSPATH=
! export OPT_JAR_LIST=:
! %{ant} \
!         -Dant.build.javac.source=1.4 \
  	-Djdom.jar=$(build-classpath jdom) \
  	-Djaxen.jar=$(build-classpath jaxen) \
***************
*** 88,132 ****
  	-Djunit.jar=$(build-classpath junit) \
  	-Dxerces.jar=$(build-classpath xerces-j2) \
! 	-Dxml-apis.jar=$(build-classpath xml-commons-apis) \
  	-Dcommons-logging.jar=$(build-classpath commons-logging) \
  	-Dproject.name=junit-addons \
! 	-Dproject.version=1.4 \
  	release
  
  %install
  # jars
! install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
! install -m 644 dist/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
! (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
  
  # examples
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
! install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
! cp -pr src/example/* $RPM_BUILD_ROOT%{_datadir}/%{name}/examples
  
  # javadoc
! install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! cp -pr api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
! ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink
  
  %clean
! rm -rf $RPM_BUILD_ROOT
! 
! %post javadoc
! rm -f %{_javadocdir}/%{name}
! ln -s %{name}-%{version} %{_javadocdir}/%{name}
  
  %files
! %defattr(-,root,root)
! %doc {LICENSE,README,WHATSNEW}
! %{_javadir}/*
  %{_datadir}/%{name}
  
  %files javadoc
! %defattr(-,root,root)
! %{_javadocdir}/%{name}-%{version}
! %ghost %doc %{_javadocdir}/%{name}
  
  %changelog
  * Fri Mar 10 2006 Fernando Nasser <fnasser at redhat.com> 0:1.4-2jpp
  - First JPP 1.7 build
--- 95,154 ----
  	-Djunit.jar=$(build-classpath junit) \
  	-Dxerces.jar=$(build-classpath xerces-j2) \
! 	-Dxml-apis.jar=$(build-classpath xml-commons-jaxp-1.3-apis) \
  	-Dcommons-logging.jar=$(build-classpath commons-logging) \
  	-Dproject.name=junit-addons \
! 	-Dproject.version=%{namedversion} \
  	release
  
  %install
+ rm -rf %{buildroot}
+ 
  # jars
! mkdir -p %{buildroot}%{_javadir}
! cp -p dist/junit-addons-%{namedversion}.jar %{buildroot}%{_javadir}/%{name}-%{namedversion}.jar
! (cd %{buildroot}%{_javadir} && for jar in *-%{namedversion}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{namedversion}||g"`; done)
! 
! # pom
! %{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms
! %{__cp} -p junit-addons-%{namedversion}.pom %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
! %add_to_maven_depmap junit-addons junit-addons JPP %{namedversion} %{name}
  
  # examples
! mkdir -p %{buildroot}%{_datadir}/%{name}
! mkdir -p %{buildroot}%{_datadir}/%{name}/examples
! cp -pr src/example/* %{buildroot}%{_datadir}/%{name}/examples
  
  # javadoc
! mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! cp -pr api/* %{buildroot}%{_javadocdir}/%{name}-%{namedversion}
! ln -s %{name}-%{namedversion} %{buildroot}%{_javadocdir}/%{name}
  
  %clean
! rm -rf %{buildroot}
  
  %files
! %defattr(0644,root,root,0755)
! %doc LICENSE README WHATSNEW
! %{_javadir}*/%{name}-%{namedversion}.jar
! %{_javadir}*/%{name}.jar
  %{_datadir}/%{name}
+ %{_datadir}/maven2/poms/JPP-%{name}.pom
+ %{_mavendepmapfragdir}/%{name}
  
  %files javadoc
! %defattr(0644,root,root,0755)
! %{_javadocdir}/%{name}-%{namedversion}
! %{_javadocdir}/%{name}
  
  %changelog
+ * Fri Oct 14 2011 David Walluck <dwalluck at redhat.com> 0:1.4-5
+ - add pom
+ 
+ * Fri Dec 12 2008 David Walluck <dwalluck at redhat.com> 0:1.4-4
+ - fix License
+ 
+ * Fri Dec 12 2008 David Walluck <dwalluck at redhat.com> 0:1.4-3
+ - build for JPackage 5
+ 
  * Fri Mar 10 2006 Fernando Nasser <fnasser at redhat.com> 0:1.4-2jpp
  - First JPP 1.7 build




More information about the JPackage-commits mailing list