From a1ad30592edcc92dbb88f3aab6b94675dec0b69f Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Jun 22 2011 20:11:42 +0000 Subject: Update to 6.0.1 --- diff --git a/.gitignore b/.gitignore index a24dc32..1baa115 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ testng-5.11.zip +/testng-6.0.1.tar.xz diff --git a/0001-Disable-DTDDoc-target.patch b/0001-Disable-DTDDoc-target.patch deleted file mode 100644 index ddd0518..0000000 --- a/0001-Disable-DTDDoc-target.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 770133c22ac56be30115f33a904e8d590e0c0cda Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:16 +0100 -Subject: [PATCH 2/4] Disable DTDDoc target - -We do not ship DTDDoc yet. ---- - build.xml | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/build.xml b/build.xml -index 832b36b..71af78b 100644 ---- a/build.xml -+++ b/build.xml -@@ -371,17 +371,17 @@ - - - -- -+ - - -- - -- -+ - - - --- -1.6.5.2 - diff --git a/0001-Do-not-bundle-prebuilt-jar-s.patch b/0001-Do-not-bundle-prebuilt-jar-s.patch deleted file mode 100644 index b3648d5..0000000 --- a/0001-Do-not-bundle-prebuilt-jar-s.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 4bc2dd4f10a7cca628af7c9c8aac6fe3b3d5ad27 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:15 +0100 -Subject: [PATCH 1/4] Do not bundle prebuilt jar-s - ---- - build.xml | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/build.xml b/build.xml -index 683100d..832b36b 100644 ---- a/build.xml -+++ b/build.xml -@@ -243,21 +243,21 @@ - - - -- -+ overwrite="true" /--> - - - -- -+ overwrite="true" /--> - - - -- -+ overwrite="true" /--> - - - --- -1.6.5.2 - diff --git a/0001-Port-to-QDoc-1.9.patch b/0001-Port-to-QDoc-1.9.patch deleted file mode 100644 index e1ed7ba..0000000 --- a/0001-Port-to-QDoc-1.9.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 02af5468f942e91ddbbbafab7256124b1e72b013 Mon Sep 17 00:00:00 2001 -From: Lubomir Rintel -Date: Fri, 27 Nov 2009 14:46:16 +0100 -Subject: [PATCH 3/4] Port to QDoc 1.9 - ---- - .../testng/internal/AnnotationTestConverter.java | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/main/org/testng/internal/AnnotationTestConverter.java b/src/main/org/testng/internal/AnnotationTestConverter.java -index 539592b..d024e9f 100644 ---- a/src/main/org/testng/internal/AnnotationTestConverter.java -+++ b/src/main/org/testng/internal/AnnotationTestConverter.java -@@ -115,7 +115,7 @@ public class AnnotationTestConverter { - Class annotationClass= m_annotationMap.get(tag.getName()); - if(annotationClass == null) { - ppp("Found unknown testng annotation " + tag.getName() + " in file " -- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line " -+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line " - + tag.getLineNumber()); - - // preserve the information - but it looks like an invalid tag -@@ -128,7 +128,7 @@ public class AnnotationTestConverter { - } - catch(Exception e) { - ppp("Found unknown testng parameter " + key + " in annotation " + tag.getName() + " in file " -- + tag.getContext().getSource().getFile().getAbsolutePath() + " at line " -+ + tag.getContext().getParent().getParentSource().getFile().getAbsolutePath() + " at line " - + tag.getLineNumber()); - - // preserve the information - but it looks like an invalid parameter -@@ -279,7 +279,7 @@ public class AnnotationTestConverter { - - if(finalLines.size() > lineCount) { - ppp("Writing file " + file.getAbsolutePath()); -- writeFile(file, source.getPackage(), finalLines); -+ writeFile(file, source.getPackage().getName(), finalLines); - converted++; - } - } --- -1.6.5.2 - diff --git a/sources b/sources index 9d4f0c4..b6e86e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c3539788100b56ddec1e78c6d5b73d8 testng-5.11.zip +a861651088aa47a7a350bdfaf0a824ae testng-6.0.1.tar.xz diff --git a/testng-5.11.pom b/testng-5.11.pom deleted file mode 100644 index 47196fd..0000000 --- a/testng-5.11.pom +++ /dev/null @@ -1,58 +0,0 @@ - - - 4.0.0 - org.testng - testng - TestNG - 5.11 - TestNG is a testing framework inspired from JUnit and NUnit but introducing some new functionalities that make it more powerful and easier to use. - http://testng.org - - - - Apache License, Version 2.0 - http://apache.org/licenses/LICENSE-2.0 - - - - - scm:svn:http://testng.googlecode.com/svn/trunk/ - scm:svn:http://testng.googlecode.com/svn/trunk/ - http://testng.googlecode.com/svn/trunk - - - - - ant - ant - 1.6.5 - true - - - junit - junit - 3.8.1 - - - qdox - qdox - 1.6.1 - provided - - - org.beanshell - bsh - 2.0b4 - provided - - - - diff --git a/testng-test-fails-workaround.patch b/testng-test-fails-workaround.patch new file mode 100644 index 0000000..7a9dac8 --- /dev/null +++ b/testng-test-fails-workaround.patch @@ -0,0 +1,12 @@ +diff -Naur testng-6.0.1.orig/src/test/java/test/junit/Suite2.java testng-6.0.1/src/test/java/test/junit/Suite2.java +--- testng-6.0.1.orig/src/test/java/test/junit/Suite2.java 2011-03-24 21:09:34.000000000 +0100 ++++ testng-6.0.1/src/test/java/test/junit/Suite2.java 2011-06-01 18:50:24.260159540 +0200 +@@ -8,7 +8,7 @@ + TestSuite suite = new TestSuite("Suite2"); + suite.addTestSuite(TestAc.class); + suite.addTestSuite(TestAd.class); +- suite.addTestSuite(Suite3.class); ++// suite.addTestSuite(Suite3.class); + return suite; + } + } diff --git a/testng.depmap b/testng.depmap new file mode 100644 index 0000000..2571680 --- /dev/null +++ b/testng.depmap @@ -0,0 +1,12 @@ + + + + com.google.gdata + gdata-core + + + JPP + gdata/gdata-core + + + diff --git a/testng.spec b/testng.spec index d66b7b0..36203d4 100644 --- a/testng.spec +++ b/testng.spec @@ -1,29 +1,35 @@ -Name: testng -Version: 5.11 -Release: 4%{?dist} -Summary: Java-based testing framework - -Group: Development/Tools -License: ASL 2.0 -URL: http://testng.org/ -Source0: http://testng.org/%{name}-%{version}.zip -Source1: http://repo2.maven.org/maven2/org/testng/testng/%{version}/testng-%{version}.pom -Patch0: 0001-Do-not-bundle-prebuilt-jar-s.patch -Patch1: 0001-Disable-DTDDoc-target.patch -Patch2: 0001-Port-to-QDoc-1.9.patch - -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) - -BuildRequires: ant -BuildRequires: unzip -BuildRequires: jpackage-utils -BuildRequires: java-devel-openjdk -BuildRequires: bsh -BuildRequires: qdox -BuildRequires: junit -Requires: jpackage-utils - -BuildArch: noarch + +%global group_id org.testng + +Name: testng +Version: 6.0.1 +Release: 1%{?dist} +Summary: Java-based testing framework +License: ASL 2.0 +Group: Development/Libraries +URL: http://testng.org/ +# git clone git://github.com/cbeust/testng.git +# cd testng +# git archive --prefix="testng-6.0.1/" --format=tar testng-6.0.1 | xz > testng-6.0.1.tar.xz +Source0: %{name}-%{version}.tar.xz +Source1: %{name}.depmap + +Patch0: %{name}-test-fails-workaround.patch + +BuildArch: noarch + +BuildRequires: java-devel +BuildRequires: jpackage-utils +BuildRequires: maven +BuildRequires: beust-jcommander +BuildRequires: snakeyaml + +Requires: beust-jcommander +Requires: snakeyaml +Requires: java +Requires: jpackage-utils +Requires(post): jpackage-utils +Requires(postun): jpackage-utils %description TestNG is a testing framework inspired from JUnit and NUnit but introducing @@ -31,81 +37,92 @@ some new functionality, including flexible test configuration, and distributed test running. It is designed to cover unit tests as well as functional, end-to-end, integration, etc. - %package javadoc -Summary: API Documentation for %{name} -Group: Development/Tools -Requires: jpackage-utils +Summary: API documentation for %{name} +Group: Documentation +Requires: jpackage-utils %description javadoc -JavaDoc documentation for %{name} - +This package contains the API documentation for %{name}. %prep %setup -q -%patch0 -p1 -b .nobundle -%patch1 -p1 -b .dtddoc -%patch2 -p1 -b .qdoc19 - -%build -find -name '*.jar' -delete -CLASSPATH=$(build-classpath bsh qdox junit) \ - ant dist-15 javadocs - -# Convert CP/M line encoding to UNIX one -sed 's/\r//' README.unix -touch -r README README.unix -mv README.unix README +%patch0 -p1 +# remove bundled stuff +rm -rf spring +rm -rf 3rdparty +rm -rf doc +rm -rf lib-supplied +rm -rf gigaspaces +rm -rf sandbox +rm -rf examples +rm -f *.jar -%install -rm -rf $RPM_BUILD_ROOT -# Code -install -d $RPM_BUILD_ROOT%{_javadir} -install -pm644 %{name}-%{version}-jdk15.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -ln -s %{name}-%{version}.jar \ - $RPM_BUILD_ROOT%{_javadir}/%{name}.jar +# fix the ant group_id ... ant -> org.apache.ant +sed -i 's/ant/org.apache.ant/g' pom.xml -# API documentation -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +# replace CR+LF with LF +sed -i 's/\r//g' README -# Maven stuff -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE1} \ - $RPM_BUILD_ROOT/%{_datadir}/maven2/poms/JPP-%{name}.pom -%add_to_maven_depmap org.%{name} %{name} %{version} JPP %{name} +# convert to UTF8 +#$ enca CHANGES.txt +#Unrecognized encoding +#$ enca ANNOUNCEMENT.txt +#Unrecognized encoding -%clean -rm -rf $RPM_BUILD_ROOT +#$ chardet-file ANNOUNCEMENT.txt +#{'confidence': 0.8484260688832136, 'encoding': 'ISO-8859-2'} +#$ chardet-file CHANGES.txt +#{'confidence': 0.7833420201466339, 'encoding': 'ISO-8859-2'} +iconv --from-code=ISO-8859-2 --to-code=UTF-8 ANNOUNCEMENT.txt > ANNOUNCEMENT.txt.utf8 +mv -f ANNOUNCEMENT.txt.utf8 ANNOUNCEMENT.txt +iconv --from-code=ISO-8859-2 --to-code=UTF-8 CHANGES.txt > CHANGES.txt.utf8 +mv -f CHANGES.txt.utf8 CHANGES.txt -%files -%defattr(-,root,root,-) -%{_javadir}/* -%{_sysconfdir}/maven/fragments -%{_datadir}/maven2 -%doc CHANGES.txt README LICENSE.txt +%build +# gdata-java has no maven support -> depmap file needed +# http://code.google.com/p/gdata-java-client/issues/detail?id=328 +mvn-rpmbuild -Dmaven.local.depmap.file="%{SOURCE1}" -Dgpg.skip=true install javadoc:aggregate +%install +# jars +install -d -m 755 %{buildroot}%{_javadir} +install -p -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/* +# pom +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom +%add_to_maven_depmap %{group_id} %{name} %{version} JPP %{name} +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} %post %update_maven_depmap - %postun %update_maven_depmap +%files +%doc LICENSE.txt ANNOUNCEMENT.txt CHANGES.txt README +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE.txt +%doc %{_javadocdir}/%{name} %changelog +* Thu May 12 2011 Jaromir Capik - 6.0.1-1 +- Update to 6.0.1 + * Wed Feb 09 2011 Fedora Release Engineering - 5.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild