RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/hamcrest#aa80273a1c14a3a6455da8b1f49a8c7b80957297
This commit is contained in:
parent
08955c16c5
commit
acb1d8cd6b
14
.gitignore
vendored
14
.gitignore
vendored
@ -0,0 +1,14 @@
|
||||
/hamcrest-all-1.3.pom
|
||||
/hamcrest-core-1.3.pom
|
||||
/hamcrest-generator-1.3.pom
|
||||
/hamcrest-integration-1.3.pom
|
||||
/hamcrest-library-1.3.pom
|
||||
/hamcrest-parent-1.3.pom
|
||||
/hamcrest-text-1.3.pom
|
||||
/hamcrest-*.tgz
|
||||
/hamcrest-*/
|
||||
/.project
|
||||
/*.src.rpm
|
||||
/noarch
|
||||
/.build-*.log
|
||||
/hamcrest-java-1.3.tar.gz
|
39
hamcrest-1.3-build.patch
Normal file
39
hamcrest-1.3-build.patch
Normal file
@ -0,0 +1,39 @@
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 1cfd4fb..5a7c740 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -14,13 +14,13 @@
|
||||
<target name="generator" description="Build code generator tool">
|
||||
<java-to-jar srcdir="hamcrest-generator/src/main/java"
|
||||
modulename="hamcrest-generator-nodeps"
|
||||
- classpath="lib/generator/qdox-1.12.jar"/>
|
||||
+ classpath="lib/generator/qdox.jar"/>
|
||||
|
||||
<!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
|
||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
|
||||
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
|
||||
<jarjar jarfile="build/hamcrest-generator-${version}.jar">
|
||||
<zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
|
||||
- <zipfileset src="lib/generator/qdox-1.12.jar"/>
|
||||
+ <zipfileset src="lib/generator/qdox.jar"/>
|
||||
<rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
|
||||
</jarjar>
|
||||
<copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
|
||||
@@ -152,7 +152,8 @@
|
||||
|
||||
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
|
||||
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
|
||||
- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
|
||||
+ windowtitle="Hamcrest" source="1.6" failonerror="yes">
|
||||
+ <arg value="-Xdoclint:none"/>
|
||||
<classpath>
|
||||
<fileset dir="lib/integration">
|
||||
<include name="*.jar"/>
|
||||
@@ -313,6 +314,7 @@
|
||||
<javadoc packagenames="org.hamcrest.*" sourcepath="build/temp/@{modulename}-${version}-sources.jar.contents" defaultexcludes="yes"
|
||||
destdir="build/temp/@{modulename}-${version}-javadoc.jar.contents" author="true" version="true" use="true"
|
||||
windowtitle="Hamcrest" source="1.6" failonerror="yes">
|
||||
+ <arg value="-Xdoclint:none"/>
|
||||
<classpath>
|
||||
<fileset dir="lib/integration">
|
||||
<include name="*.jar"/>
|
25
hamcrest-1.3-fork-javac.patch
Normal file
25
hamcrest-1.3-fork-javac.patch
Normal file
@ -0,0 +1,25 @@
|
||||
From 54b7ccdd1e16f1d6dd07359eae0fcac8f1883373 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Mon, 2 Jan 2017 10:31:56 +0100
|
||||
Subject: [PATCH] Fork javac
|
||||
|
||||
---
|
||||
build.xml | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 1cfd4fb..69acfe8 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -284,7 +284,7 @@
|
||||
<attribute name="Built-Date" value="${build.timestamp}"/>
|
||||
</manifest>
|
||||
<mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
|
||||
- <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
|
||||
+ <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true">
|
||||
<classpath>
|
||||
<fileset dir="lib/integration">
|
||||
<include name="*.jar"/>
|
||||
--
|
||||
2.9.3
|
||||
|
17
hamcrest-1.3-javadoc.patch
Normal file
17
hamcrest-1.3-javadoc.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/build.xml b/build.xml
|
||||
index ed57763..a4550cb 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -135,11 +135,10 @@
|
||||
</target>
|
||||
|
||||
<target name="javadoc" description="build javadoc jars">
|
||||
- <java-to-javadoc-jar modulename="hamcrest-generator-nodeps"/>
|
||||
+ <java-to-javadoc-jar modulename="hamcrest-generator"/>
|
||||
<java-to-javadoc-jar modulename="hamcrest-core"/>
|
||||
<java-to-javadoc-jar modulename="hamcrest-library"/>
|
||||
<java-to-javadoc-jar modulename="hamcrest-integration"/>
|
||||
- <copy file="build/hamcrest-generator-nodeps-${version}-javadoc.jar" tofile="build/hamcrest-generator-${version}-javadoc.jar"/>
|
||||
|
||||
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
|
||||
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
|
23
hamcrest-1.3-no-jarjar.patch
Normal file
23
hamcrest-1.3-no-jarjar.patch
Normal file
@ -0,0 +1,23 @@
|
||||
diff --git a/build.xml b/build.xml
|
||||
index 54d43fe..ed57763 100644
|
||||
--- a/build.xml
|
||||
+++ b/build.xml
|
||||
@@ -13,17 +13,8 @@
|
||||
|
||||
<target name="generator" description="Build code generator tool">
|
||||
<java-to-jar srcdir="hamcrest-generator/src/main/java"
|
||||
- modulename="hamcrest-generator-nodeps"
|
||||
+ modulename="hamcrest-generator"
|
||||
classpath="lib/generator/qdox.jar"/>
|
||||
-
|
||||
- <!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
|
||||
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
|
||||
- <jarjar jarfile="build/hamcrest-generator-${version}.jar">
|
||||
- <zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
|
||||
- <zipfileset src="lib/generator/qdox.jar"/>
|
||||
- <rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
|
||||
- </jarjar>
|
||||
- <copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
|
||||
</target>
|
||||
|
||||
<target name="core" depends="generator" description="Build core Hamcrest library">
|
105
hamcrest-1.3-qdox-2.0.patch
Normal file
105
hamcrest-1.3-qdox-2.0.patch
Normal file
@ -0,0 +1,105 @@
|
||||
From 6d7da5456a7458a249bed9c4c1e768cc7cc2fe40 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Simacek <msimacek@redhat.com>
|
||||
Date: Wed, 1 Feb 2017 12:57:14 +0100
|
||||
Subject: [PATCH] Port to qdox 2.0
|
||||
|
||||
---
|
||||
.../src/main/java/org/hamcrest/generator/QDox.java | 4 ++--
|
||||
.../org/hamcrest/generator/QDoxFactoryReader.java | 26 ++++++++++++----------
|
||||
2 files changed, 16 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
|
||||
index efaf615..338178d 100644
|
||||
--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
|
||||
+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDox.java
|
||||
@@ -1,6 +1,6 @@
|
||||
package org.hamcrest.generator;
|
||||
|
||||
-import com.thoughtworks.qdox.JavaDocBuilder;
|
||||
+import com.thoughtworks.qdox.JavaProjectBuilder;
|
||||
import com.thoughtworks.qdox.model.JavaClass;
|
||||
|
||||
import java.io.File;
|
||||
@@ -16,7 +16,7 @@ import java.io.Reader;
|
||||
*/
|
||||
public class QDox {
|
||||
|
||||
- private final JavaDocBuilder javaDocBuilder = new JavaDocBuilder();
|
||||
+ private final JavaProjectBuilder javaDocBuilder = new JavaProjectBuilder();
|
||||
|
||||
public void addSourceTree(File sourceDir) {
|
||||
javaDocBuilder.addSourceTree(sourceDir);
|
||||
diff --git a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
|
||||
index 5108140..97fce01 100644
|
||||
--- a/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
|
||||
+++ b/hamcrest-generator/src/main/java/org/hamcrest/generator/QDoxFactoryReader.java
|
||||
@@ -4,8 +4,10 @@ import com.thoughtworks.qdox.model.DocletTag;
|
||||
import com.thoughtworks.qdox.model.JavaClass;
|
||||
import com.thoughtworks.qdox.model.JavaMethod;
|
||||
import com.thoughtworks.qdox.model.JavaParameter;
|
||||
-import com.thoughtworks.qdox.model.Type;
|
||||
+import com.thoughtworks.qdox.model.JavaType;
|
||||
+import com.thoughtworks.qdox.model.impl.DefaultJavaClass;
|
||||
|
||||
+import java.util.ArrayList;
|
||||
import java.util.Iterator;
|
||||
import java.util.List;
|
||||
import java.util.regex.Pattern;
|
||||
@@ -56,15 +58,15 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
|
||||
JavaMethod methodSource = findMethodInSource(factoryMethod);
|
||||
if (methodSource != null) {
|
||||
factoryMethod.setJavaDoc(createJavaDocComment(methodSource));
|
||||
- JavaParameter[] parametersFromSource
|
||||
+ List<JavaParameter> parametersFromSource
|
||||
= methodSource.getParameters();
|
||||
List<FactoryMethod.Parameter> parametersFromReflection
|
||||
= factoryMethod.getParameters();
|
||||
|
||||
- if (parametersFromReflection.size() == parametersFromSource.length) {
|
||||
- for (int i = 0; i < parametersFromSource.length; i++) {
|
||||
+ if (parametersFromReflection.size() == parametersFromSource.size()) {
|
||||
+ for (int i = 0; i < parametersFromSource.size(); i++) {
|
||||
parametersFromReflection.get(i).setName(
|
||||
- parametersFromSource[i].getName());
|
||||
+ parametersFromSource.get(i).getName());
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -79,18 +81,18 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
|
||||
// Note, this doesn't always work - it struggles with some kinds of generics.
|
||||
// This seems to cover most cases though.
|
||||
List<FactoryMethod.Parameter> params = factoryMethod.getParameters();
|
||||
- Type[] types = new Type[params.size()];
|
||||
+ List<JavaType> types = new ArrayList<JavaType>(params.size());
|
||||
boolean varArgs = false;
|
||||
- for (int i = 0; i < types.length; i++) {
|
||||
+ for (int i = 0; i < params.size(); i++) {
|
||||
String type = params.get(i).getType();
|
||||
varArgs = VARARGS_REGEX.matcher(type).find();
|
||||
// QDox ignores varargs and generics, so we strip them out to help QDox.
|
||||
type = GENERIC_REGEX.matcher(type).replaceAll("");
|
||||
type = VARARGS_REGEX.matcher(type).replaceAll("");
|
||||
- types[i] = new Type(type);
|
||||
+ types.add(new DefaultJavaClass(type));
|
||||
}
|
||||
- JavaMethod[] methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
|
||||
- return methods.length == 1 ? methods[0] : null;
|
||||
+ List<JavaMethod> methods = classSource.getMethodsBySignature(factoryMethod.getName(), types, false, varArgs);
|
||||
+ return methods.size() == 1 ? methods.get(0) : null;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -98,8 +100,8 @@ public class QDoxFactoryReader implements Iterable<FactoryMethod> {
|
||||
*/
|
||||
private static String createJavaDocComment(JavaMethod methodSource) {
|
||||
String comment = methodSource.getComment();
|
||||
- DocletTag[] tags = methodSource.getTags();
|
||||
- if ((comment == null || comment.trim().length() == 0) && tags.length == 0) {
|
||||
+ List<DocletTag> tags = methodSource.getTags();
|
||||
+ if ((comment == null || comment.trim().length() == 0) && tags.size() == 0) {
|
||||
return null;
|
||||
}
|
||||
StringBuilder result = new StringBuilder();
|
||||
--
|
||||
2.9.3
|
||||
|
14
hamcrest-core-MANIFEST.MF
Normal file
14
hamcrest-core-MANIFEST.MF
Normal file
@ -0,0 +1,14 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-Vendor: Fedoraproject.org
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: Hamcrest Core
|
||||
Bundle-SymbolicName: org.hamcrest.core
|
||||
Eclipse-SourceReferences: scm:cvs:pserver:dev.eclipse.org:/cvsroot/too
|
||||
ls:org.eclipse.orbit/org.hamcrest.core;tag=v201303031735
|
||||
Export-Package: org.hamcrest;version="1.3.0";core=split;mandatory:=cor
|
||||
e,org.hamcrest.core;version="1.3.0",org.hamcrest.internal;version="1.
|
||||
3.0";x-internal:=true
|
||||
Bundle-Version: 1.3.0.v201303031735
|
||||
Bundle-ManifestVersion: 2
|
18
hamcrest-generator-MANIFEST.MF
Normal file
18
hamcrest-generator-MANIFEST.MF
Normal file
@ -0,0 +1,18 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.hamcrest.generator
|
||||
Bundle-Version: 1.3.0.v20090501071000
|
||||
Export-Package: org.hamcrest.generator;version="1.3.0",org.hamcrest.ge
|
||||
nerator.config;version="1.3.0"
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Package: com.thoughtworks.qdox;version="1.6.3",com.thoughtworks
|
||||
.qdox.ant;version="1.6.3",com.thoughtworks.qdox.directorywalker;versi
|
||||
on="1.6.3",com.thoughtworks.qdox.junit;version="1.6.3",com.thoughtwor
|
||||
ks.qdox.model;version="1.6.3",com.thoughtworks.qdox.model.util;versio
|
||||
n="1.6.3",com.thoughtworks.qdox.parser;version="1.6.3",com.thoughtwor
|
||||
ks.qdox.parser.impl;version="1.6.3",com.thoughtworks.qdox.parser.stru
|
||||
cts;version="1.6.3",com.thoughtworks.qdox.tools;version="1.6.3"
|
14
hamcrest-integration-MANIFEST.MF
Normal file
14
hamcrest-integration-MANIFEST.MF
Normal file
@ -0,0 +1,14 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.hamcrest.integration
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
|
||||
Bundle-Version: 1.3.0.v20090501071000
|
||||
Export-Package: org.hamcrest;integration=split;mandatory:=integration;
|
||||
version="1.3.0",org.hamcrest.integration;version="1.3.0"
|
||||
Bundle-ManifestVersion: 2
|
||||
Import-Package: org.easymock;version="2.4.0";resolution:=optional,org.
|
||||
jmock.core;version="1.10";resolution:=optional
|
15
hamcrest-library-MANIFEST.MF
Normal file
15
hamcrest-library-MANIFEST.MF
Normal file
@ -0,0 +1,15 @@
|
||||
Manifest-Version: 1.0
|
||||
Bundle-Vendor: %providerName
|
||||
Bundle-ActivationPolicy: lazy
|
||||
Bundle-Localization: plugin
|
||||
Bundle-RequiredExecutionEnvironment: J2SE-1.5
|
||||
Bundle-Name: %pluginName
|
||||
Bundle-SymbolicName: org.hamcrest.library
|
||||
Require-Bundle: org.hamcrest.core;bundle-version="1.3.0"
|
||||
Bundle-Version: 1.3.0.v20090501071000
|
||||
Export-Package: org.hamcrest;version="1.3.0";library=split;mandatory:=
|
||||
library,org.hamcrest.beans;version="1.3.0",org.hamcrest.collection;ve
|
||||
rsion="1.3.0",org.hamcrest.number;version="1.3.0",org.hamcrest.object
|
||||
;version="1.3.0",org.hamcrest.text;version="1.3.0",org.hamcrest.xml;v
|
||||
ersion="1.3.0"
|
||||
Bundle-ManifestVersion: 2
|
456
hamcrest.spec
Normal file
456
hamcrest.spec
Normal file
@ -0,0 +1,456 @@
|
||||
# Copyright (c) 2000-2008, JPackage Project
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
# modification, are permitted provided that the following conditions
|
||||
# are met:
|
||||
#
|
||||
# 1. Redistributions of source code must retain the above copyright
|
||||
# notice, this list of conditions and the following disclaimer.
|
||||
# 2. Redistributions in binary form must reproduce the above copyright
|
||||
# notice, this list of conditions and the following disclaimer in the
|
||||
# documentation and/or other materials provided with the
|
||||
# distribution.
|
||||
# 3. Neither the name of the JPackage Project nor the names of its
|
||||
# contributors may be used to endorse or promote products derived
|
||||
# from this software without specific prior written permission.
|
||||
#
|
||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
#
|
||||
|
||||
Name: hamcrest
|
||||
Version: 1.3
|
||||
Release: 30%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Library of matchers for building test expressions
|
||||
License: BSD
|
||||
URL: https://github.com/hamcrest/JavaHamcrest
|
||||
Source0: https://github.com/hamcrest/JavaHamcrest/archive/hamcrest-java-%{version}.tar.gz
|
||||
|
||||
Source8: hamcrest-core-MANIFEST.MF
|
||||
Source9: hamcrest-library-MANIFEST.MF
|
||||
Source11: hamcrest-integration-MANIFEST.MF
|
||||
Source12: hamcrest-generator-MANIFEST.MF
|
||||
|
||||
Patch0: %{name}-%{version}-build.patch
|
||||
Patch1: %{name}-%{version}-no-jarjar.patch
|
||||
Patch3: %{name}-%{version}-javadoc.patch
|
||||
Patch4: %{name}-%{version}-qdox-2.0.patch
|
||||
Patch5: %{name}-%{version}-fork-javac.patch
|
||||
|
||||
Requires: qdox
|
||||
Requires: easymock >= 3.0
|
||||
Requires: %{name}-core = %{epoch}:%{version}-%{release}
|
||||
|
||||
BuildRequires: javapackages-local
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant-junit
|
||||
BuildRequires: easymock
|
||||
BuildRequires: junit
|
||||
BuildRequires: qdox
|
||||
BuildRequires: testng
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
%description
|
||||
Provides a library of matcher objects (also known as constraints or predicates)
|
||||
allowing 'match' rules to be defined declaratively, to be used in other
|
||||
frameworks. Typical scenarios include testing frameworks, mocking libraries and
|
||||
UI validation rules.
|
||||
|
||||
%package core
|
||||
Summary: Core API of hamcrest matcher framework.
|
||||
Obsoletes: %{name} < 0:1.3-10
|
||||
|
||||
%description core
|
||||
The core API of hamcrest matcher framework to be used by third-party framework providers.
|
||||
This includes the a foundation set of matcher implementations for common operations.
|
||||
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
|
||||
%description javadoc
|
||||
Javadoc for %{name}.
|
||||
|
||||
%package demo
|
||||
Summary: Demos for %{name}
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: junit
|
||||
Requires: testng
|
||||
|
||||
%description demo
|
||||
Demonstrations and samples for %{name}.
|
||||
|
||||
%prep
|
||||
%setup -q -n JavaHamcrest-%{name}-java-%{version}
|
||||
|
||||
find . -type f -name "*.jar" | xargs -t rm
|
||||
rm -fr hamcrest-integration/src/main/java/org/hamcrest/integration/JMock1Adapter.java
|
||||
rm -fr hamcrest-integration/src/main/java/org/hamcrest/JMock1Matchers.java
|
||||
rm -fr hamcrest-unit-test/src/main/java/org/hamcrest/integration/JMock1AdapterTest.java
|
||||
# BUILD/hamcrest-1.1/lib/generator/qdox-1.6.1.jar.no
|
||||
ln -sf $(build-classpath qdox) lib/generator/
|
||||
# BUILD/hamcrest-1.1/lib/integration/easymock-2.2.jar.no
|
||||
ln -sf $(build-classpath easymock3) lib/integration/
|
||||
# BUILD/hamcrest-1.1/lib/integration/jmock-1.10RC1.jar.no
|
||||
ln -sf $(build-classpath jmock) lib/integration/
|
||||
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
|
||||
ln -sf $(build-classpath testng-jdk15) lib/integration/
|
||||
|
||||
%patch0 -p1
|
||||
%patch1 -p1
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
|
||||
sed -i 's/\r//' LICENSE.txt
|
||||
|
||||
# Set target to 1.6 to build with Java 11
|
||||
sed -i 's/target="1.5"/target="1.6"/' build.xml
|
||||
# Disable checking of remote javadoc links
|
||||
sed -i '/link offline/ d' build.xml
|
||||
|
||||
%build
|
||||
export CLASSPATH=$(build-classpath qdox)
|
||||
export OPT_JAR_LIST="junit ant/ant-junit"
|
||||
# The unit-test goal is switched off as some tests fail with JDK 7
|
||||
# see https://github.com/hamcrest/JavaHamcrest/issues/30
|
||||
ant -Dant.build.javac.source=1.6 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
|
||||
|
||||
# inject OSGi manifests
|
||||
jar ufm build/%{name}-core-%{version}.jar %{SOURCE8}
|
||||
jar ufm build/%{name}-library-%{version}.jar %{SOURCE9}
|
||||
jar ufm build/%{name}-integration-%{version}.jar %{SOURCE11}
|
||||
jar ufm build/%{name}-generator-%{version}.jar %{SOURCE12}
|
||||
|
||||
%install
|
||||
sed -i 's/@VERSION@/%{version}/g' pom/*.pom
|
||||
|
||||
%mvn_artifact pom/hamcrest-parent.pom
|
||||
|
||||
for mod in all core generator library integration; do
|
||||
%mvn_artifact pom/hamcrest-$mod.pom build/%{name}-$mod-%{version}.jar
|
||||
done
|
||||
|
||||
%mvn_package :hamcrest-parent core
|
||||
%mvn_package :hamcrest-core core
|
||||
|
||||
%mvn_file ':hamcrest-{*}' %{name}/@1
|
||||
|
||||
# demo
|
||||
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/%{name}
|
||||
cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
|
||||
|
||||
%mvn_install -J build/temp/hamcrest-all-1.3-javadoc.jar.contents/
|
||||
|
||||
%files -f .mfiles
|
||||
|
||||
%files core -f .mfiles-core
|
||||
%license LICENSE.txt
|
||||
|
||||
%files javadoc -f .mfiles-javadoc
|
||||
%license LICENSE.txt
|
||||
|
||||
%files demo
|
||||
%{_datadir}/%{name}
|
||||
|
||||
%changelog
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-30
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 0:1.3-29
|
||||
- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
|
||||
|
||||
* Wed Jun 24 2020 Roland Grunberg <rgrunber@redhat.com> - 0:1.3-28
|
||||
- Use source/target 1.6 to build against Java 11.
|
||||
- Disable checking of remote javadoc links.
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-26
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-25
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-24
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-23
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Mon Sep 25 2017 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-22
|
||||
- Elimitate race condition when injecting JAR manifest
|
||||
- Resolves: rhbz#1495234
|
||||
- Remove bogus hamcrest-text JAR
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-21
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Mar 22 2017 Michael Simacek <msimacek@redhat.com> - 0:1.3-20
|
||||
- Fix mistake in mvn_artifact invocation
|
||||
|
||||
* Tue Mar 21 2017 Michael Simacek <msimacek@redhat.com> - 0:1.3-19
|
||||
- Install with XMvn
|
||||
- Update upstream URL
|
||||
- Build from github source
|
||||
- Specfile cleanup
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-18
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 0:1.3-17
|
||||
- Port to current QDox
|
||||
|
||||
* Mon Jan 02 2017 Michael Simacek <msimacek@redhat.com> - 0:1.3-16
|
||||
- Try to fix nondeterministic failures by forking javac
|
||||
|
||||
* Mon Oct 3 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-15
|
||||
- Remove build-requires on perl
|
||||
|
||||
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0:1.3-14
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-12
|
||||
- Disable javadoc doclint
|
||||
|
||||
* Tue Feb 24 2015 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-11
|
||||
- Add obsoletes in core to the main package to ease updates.
|
||||
|
||||
* Mon Feb 23 2015 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-10
|
||||
- Split hamcrest-core subpackage to allow other frameworks to reduce deps.
|
||||
|
||||
* Wed Feb 4 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.3-9
|
||||
- Port to QDox 2.0
|
||||
- Resolves: rhbz#1166700
|
||||
|
||||
* Wed Jul 30 2014 Mat Booth <mat.booth@redhat.com> - 0:1.3-8
|
||||
- Fix FTBFS
|
||||
- Always build integration jar (removes some complexity from the spec)
|
||||
- Drop unused patch
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.3-6
|
||||
- Use Requires: java-headless rebuild (#1067528)
|
||||
|
||||
* Mon Aug 12 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-5
|
||||
- Update osgi manifests.
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Wed Jul 24 2013 Alexander Kurtakov <akurtako@redhat.com> 0:1.3-3
|
||||
- Build against easymock3.
|
||||
|
||||
* Wed Jul 03 2013 Michal Srb <msrb@redhat.com> - 0:1.3-2
|
||||
- Add easymock2 to classpath (Resolves: #979501)
|
||||
|
||||
* Thu Mar 21 2013 Tomas Radej <tradej@redhat.com> - 0:1.3-1
|
||||
- Updated to latest upstream version
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-22
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Mon Nov 26 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.1-21
|
||||
- Fix core manifest typo ";" -> ","
|
||||
|
||||
* Tue Aug 14 2012 Severin Gehwolf <sgehwolf@redhat.com> 0:1.1-20
|
||||
- Remove attributes in Export-Package header of hamcrest-core
|
||||
manifest.
|
||||
|
||||
* Wed Aug 1 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-19
|
||||
- Add OSGi metadata to hamcrest-generator.
|
||||
|
||||
* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-18
|
||||
- Actually build integration.
|
||||
|
||||
* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-17
|
||||
- Add OSGi metadata to hamcrest-integration.
|
||||
|
||||
* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-16
|
||||
- Remove checksums from manifest.
|
||||
|
||||
* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-15
|
||||
- Add OSGi metadata to hamcrest-text.
|
||||
|
||||
* Tue Jul 31 2012 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-14
|
||||
- Add OSGi metadata for hamcrest-library.
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-13
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Aug 25 2011 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-11
|
||||
- Do not BR/R openjdk6 but java >= 1:1.6.0
|
||||
- Adapt to current guidelines.
|
||||
|
||||
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-10.4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
* Sun Dec 12 2010 Mat Booth <fedora@matbooth.co.uk> 0:1.1-9.4
|
||||
- Fix FTBFS due to zip BR - RHBZ #661011.
|
||||
|
||||
* Thu Oct 7 2010 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-9.3
|
||||
- Drop gcj support.
|
||||
|
||||
* Tue Aug 18 2009 Alexander Kurtakov <akurtako@redhat.com> 0:1.1-9.2
|
||||
- Add OSGi manifest for hamcrest-core.
|
||||
- Make javadoc package noarch.
|
||||
|
||||
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-9.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.1-8.1
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Mon Nov 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-7.1
|
||||
- Fedora-specific: enable GCJ support
|
||||
- Fedora-specific: build with java 1.6.0
|
||||
- Fedora-specific: disable integration and tests
|
||||
|
||||
* Mon Nov 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-7
|
||||
- update summary and description
|
||||
|
||||
* Tue Oct 28 2008 David Walluck <dwalluck@redhat.com> 0:1.1-6
|
||||
- make demo dependency on testng conditional
|
||||
|
||||
* Fri Oct 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-5
|
||||
- fix GCJ file list
|
||||
- simplify build by always setting OPT_JAR_LIST
|
||||
|
||||
* Fri Oct 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-4
|
||||
- add epoch to demo Requires
|
||||
|
||||
* Fri Oct 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-3
|
||||
- set -Dant.build.javac.source=1.5
|
||||
|
||||
* Fri Oct 24 2008 David Walluck <dwalluck@redhat.com> 0:1.1-2
|
||||
- add options to build without integration, jarjar, and tests
|
||||
- allow build with java-devel >= 1.5.0
|
||||
- remove javadoc scriptlets
|
||||
- use more strict file list
|
||||
- fix maven directory ownership
|
||||
- add non-versioned symlink for demo
|
||||
- fix GCJ requires
|
||||
- fix eol in LICENSE.txt
|
||||
- remove Vendor and Distribution
|
||||
|
||||
* Tue Feb 19 2008 Ralph Apel <r.apel@r-apel.de> - 0:1.1-1jpp
|
||||
- 1.1
|
||||
|
||||
* Mon Feb 11 2008 Ralph Apel <r.apel@r-apel.de> - 0:4.3.1-4jpp
|
||||
- Fix versioned jar name, was junit-4.3.1
|
||||
- Restore Epoch
|
||||
|
||||
* Fri Jan 25 2008 Ralph Apel <r.apel@r-apel.de> - 0:4.3.1-3jpp
|
||||
- build and upload noarch packages
|
||||
- Add pom and depmap frag
|
||||
- BR java-devel = 1.5.0
|
||||
- Restore Vendor, Distribution from macros
|
||||
|
||||
* Tue Aug 07 2007 Ben Konrath <bkonrath@redhat.com> - 4.3.1-2jpp
|
||||
- Set gcj_support to 0 to work around problems with GCJ.
|
||||
- Fix buglet with the gcj post/postun if statement.
|
||||
- Fix tab / space problems.
|
||||
- Fix buildroot.
|
||||
- Update Summary.
|
||||
- Convert html files to Unix file endings.
|
||||
- Disable aot-compile-rpm because it's not working ATM.
|
||||
|
||||
* Mon Jul 09 2007 Ben Konrath <bkonrath@redhat.com> - 4.3.1-1jpp
|
||||
- 4.3.1.
|
||||
|
||||
* Mon Feb 12 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 3.8.2-3jpp.1.fc7
|
||||
- Add dist tag
|
||||
|
||||
* Mon Feb 12 2007 Thomas Fitzsimmons <fitzsim@redhat.com> - 3.8.2-3jpp.1
|
||||
- Committed on behalf of Tania Bento <tbento@redhat.com>
|
||||
- Update per Fedora review process
|
||||
- Resolves rhbz#225954
|
||||
|
||||
* Thu Aug 10 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-3jpp.1
|
||||
- Added missing requirements.
|
||||
|
||||
* Thu Aug 10 2006 Karsten Hopp <karsten@redhat.de> 0:3.8.2-2jpp_3fc
|
||||
- Require(post/postun): coreutils
|
||||
|
||||
* Fri Jun 23 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_2fc
|
||||
- Rebuilt.
|
||||
|
||||
* Thu Jun 22 2006 Deepak Bhole <dbhole@redhat.com> - 0:3.8.2-2jpp_1fc
|
||||
- Upgrade to 3.8.2
|
||||
- Added conditional native compilation.
|
||||
- Fix path where demo is located.
|
||||
|
||||
* Fri Mar 03 2006 Ralph Apel <r.apel at r-apel.de> - 0:3.8.2-1jpp
|
||||
- First JPP-1.7 release
|
||||
|
||||
* Mon Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:3.8.1-4jpp
|
||||
- Rebuild with ant-1.6.2
|
||||
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:3.8.1-3jpp
|
||||
- update for JPackage 1.5
|
||||
|
||||
* Fri Mar 21 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> 3.8.1-2jpp
|
||||
- For jpackage-utils 1.5
|
||||
|
||||
* Fri Sep 06 2002 Henri Gomez <hgomez@users.sourceforge.net> 3.8.1-1jpp
|
||||
- 3.8.1
|
||||
|
||||
* Sun Sep 01 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-2jpp
|
||||
- used original zip file
|
||||
|
||||
* Thu Aug 29 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.8-1jpp
|
||||
- 3.8
|
||||
- group, vendor and distribution tags
|
||||
|
||||
* Sat Jan 19 2002 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.7-6jpp
|
||||
- versioned dir for javadoc
|
||||
- no dependencies for manual and javadoc packages
|
||||
- stricter dependency for demo package
|
||||
- additional sources in individual archives
|
||||
- section macro
|
||||
|
||||
* Sat Dec 1 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.7-5jpp
|
||||
- javadoc in javadoc package
|
||||
|
||||
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 3.7-4jpp
|
||||
- fixed previous releases ...grrr
|
||||
|
||||
* Wed Nov 21 2001 Christian Zoffoli <czoffoli@littlepenguin.org> 3.7-3jpp
|
||||
- added jpp extension
|
||||
- removed packager tag
|
||||
|
||||
* Sun Sep 30 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.7-2jpp
|
||||
- first unified release
|
||||
- s/jPackage/JPackage
|
||||
|
||||
* Mon Sep 17 2001 Guillaume Rousse <guillomovitch@users.sourceforge.net> 3.7-1mdk
|
||||
- 3.7
|
||||
- vendor tag
|
||||
- packager tag
|
||||
- s/Copyright/License/
|
||||
- truncated description to 72 columns in spec
|
||||
- spec cleanup
|
||||
- used versioned jar
|
||||
- moved demo files to %%{_datadir}/%%{name}
|
||||
|
||||
* Sat Feb 17 2001 Guillaume Rousse <g.rousse@linux-mandrake.com> 3.5-1mdk
|
||||
- first Mandrake release
|
Loading…
Reference in New Issue
Block a user