From 2611aedc84ca3919f0b22f3ebc3c4165544e9c8c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:25:15 +0000 Subject: [PATCH 1/4] Initialize branch EL-6 for testng --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From a831db560f4ffe9a6ba4ec8425cc68bcd1935119 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Mon, 19 Jul 2010 09:35:08 +0000 Subject: [PATCH 2/4] - Drop backport util concurrent dependency, we don't build jdk14 jar --- testng.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testng.spec b/testng.spec index ec62328..bfd430b 100644 --- a/testng.spec +++ b/testng.spec @@ -1,6 +1,6 @@ Name: testng Version: 5.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java-based testing framework Group: Development/Tools @@ -20,7 +20,6 @@ BuildRequires: jpackage-utils BuildRequires: java-devel-openjdk BuildRequires: bsh BuildRequires: qdox -BuildRequires: backport-util-concurrent BuildRequires: junit Requires: jpackage-utils @@ -51,7 +50,7 @@ JavaDoc documentation for %{name} %build find -name '*.jar' -delete -CLASSPATH=$(build-classpath bsh qdox backport-util-concurrent junit) \ +CLASSPATH=$(build-classpath bsh qdox junit) \ ant dist-15 javadocs # Convert CP/M line encoding to UNIX one @@ -107,6 +106,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 19 2010 Lubomir Rintel - 5.11-3 +- Drop backport util concurrent dependency, we don't build jdk14 jar + * Mon Dec 21 2009 Lubomir Rintel - 5.11-2 - Add POM From cc2364786a865f41d45c746b4768a37dad1af45a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:04:06 +0000 Subject: [PATCH 3/4] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 117b713..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: testng -# $Id$ -NAME := testng -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 46381b9..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-6 From 60b6c1dc727ca91d36e13b30ec6e3b9a1ca1e46b Mon Sep 17 00:00:00 2001 From: Till Maas Date: Mon, 13 Apr 2015 17:59:44 +0200 Subject: [PATCH 4/4] 2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks. Reference: https://fedorahosted.org/epel/ticket/7 --- .gitignore | 1 - 0001-Disable-DTDDoc-target.patch | 39 -------- 0001-Do-not-bundle-prebuilt-jar-s.patch | 44 --------- 0001-Port-to-QDoc-1.9.patch | 43 -------- dead.package | 3 + sources | 1 - testng-5.11.pom | 58 ----------- testng.spec | 125 ------------------------ 8 files changed, 3 insertions(+), 311 deletions(-) delete mode 100644 .gitignore delete mode 100644 0001-Disable-DTDDoc-target.patch delete mode 100644 0001-Do-not-bundle-prebuilt-jar-s.patch delete mode 100644 0001-Port-to-QDoc-1.9.patch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 testng-5.11.pom delete mode 100644 testng.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index a24dc32..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -testng-5.11.zip 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/dead.package b/dead.package new file mode 100644 index 0000000..b634127 --- /dev/null +++ b/dead.package @@ -0,0 +1,3 @@ +2015-04-13: Retired orphaned package, because it was orphaned for more than six weeks. +Reference: https://fedorahosted.org/epel/ticket/7 + diff --git a/sources b/sources deleted file mode 100644 index 9d4f0c4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -2c3539788100b56ddec1e78c6d5b73d8 testng-5.11.zip 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.spec b/testng.spec deleted file mode 100644 index bfd430b..0000000 --- a/testng.spec +++ /dev/null @@ -1,125 +0,0 @@ -Name: testng -Version: 5.11 -Release: 3%{?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 - -%description -TestNG is a testing framework inspired from JUnit and NUnit but introducing -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 - -%description javadoc -JavaDoc 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 - - -%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 - -# API documentation -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} - -# 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} - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{_javadir}/* -%{_sysconfdir}/maven/fragments -%{_datadir}/maven2 -%doc CHANGES.txt README LICENSE.txt - - -%files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/* - - -%post -%update_maven_depmap - - -%postun -%update_maven_depmap - - -%changelog -* Mon Jul 19 2010 Lubomir Rintel - 5.11-3 -- Drop backport util concurrent dependency, we don't build jdk14 jar - -* Mon Dec 21 2009 Lubomir Rintel - 5.11-2 -- Add POM - -* Sun Dec 20 2009 Lubomir Rintel - 5.11-1 -- Bump to 5.11 -- Add maven depmap fragments -- Fix line encoding of README - -* Wed Dec 09 2009 Lubomir Rintel - 5.10-2 -- Add javadoc -- Don't ship jdk14 jar - -* Fri Nov 27 2009 Lubomir Rintel - 5.10-1 -- Initial packaging