[tycho] Initial commit
by Stanislav Ochotnicky
commit 55dfddf3afbba101c2f51c8eedfcd02edaef5db2
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Fri May 6 12:38:49 2011 +0200
Initial commit
.gitignore | 2 +
0001-Remove-tycho-testing-harness.patch | 192 ++++++++++++++++++++++++++++
EmptyMojo.java | 19 +++
depmap.xml | 64 ++++++++++
sources | 2 +
tycho.spec | 209 +++++++++++++++++++++++++++++++
6 files changed, 488 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..37c1546 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/maven-repo.tar.bz2
+/tycho-0.10.0.tar.xz
diff --git a/0001-Remove-tycho-testing-harness.patch b/0001-Remove-tycho-testing-harness.patch
new file mode 100644
index 0000000..3433932
--- /dev/null
+++ b/0001-Remove-tycho-testing-harness.patch
@@ -0,0 +1,192 @@
+From 1fc5ec4dcccd0951860f9db6f485fd3c00a4a684 Mon Sep 17 00:00:00 2001
+From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
+Date: Tue, 29 Mar 2011 17:58:43 +0200
+Subject: [PATCH] Remove tycho-testing-harness
+
+It needs maven2 parts to build, but we need depmap for other parts of tycho.
+Thus we disable it for now and this is not a big deal because we are not
+running tests anyway (yet).
+---
+ maven-osgi-compiler-plugin/pom.xml | 10 ++++------
+ maven-osgi-packaging-plugin/pom.xml | 10 ++++------
+ maven-tycho-plugin/pom.xml | 6 ------
+ pom.xml | 1 -
+ tycho-osgi-components/pom.xml | 10 ++++------
+ tycho-p2/tycho-p2-director-plugin/pom.xml | 6 ------
+ tycho-p2/tycho-p2-publisher-plugin/pom.xml | 6 ------
+ tycho-release/tycho-versions-plugin/pom.xml | 8 +-------
+ 8 files changed, 13 insertions(+), 44 deletions(-)
+
+diff --git a/maven-osgi-compiler-plugin/pom.xml b/maven-osgi-compiler-plugin/pom.xml
+index 6e55905..9d0979a 100644
+--- a/maven-osgi-compiler-plugin/pom.xml
++++ b/maven-osgi-compiler-plugin/pom.xml
+@@ -64,18 +64,16 @@
+ <artifactId>tycho-compiler-jdt</artifactId>
+ <version>${project.version}</version>
+ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ </dependency>
+
+ <dependency>
+ <groupId>org.apache.maven.plugin-testing</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ </project>
+diff --git a/maven-osgi-packaging-plugin/pom.xml b/maven-osgi-packaging-plugin/pom.xml
+index d7faeac..7fc5e5a 100644
+--- a/maven-osgi-packaging-plugin/pom.xml
++++ b/maven-osgi-packaging-plugin/pom.xml
+@@ -24,12 +24,6 @@
+ <artifactId>tycho-equinox</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+- <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+
+ <dependency>
+ <groupId>commons-lang</groupId>
+@@ -41,6 +35,10 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+diff --git a/maven-tycho-plugin/pom.xml b/maven-tycho-plugin/pom.xml
+index 5f6c55e..af1ea97 100644
+--- a/maven-tycho-plugin/pom.xml
++++ b/maven-tycho-plugin/pom.xml
+@@ -65,12 +65,6 @@
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <scope>test</scope>
+ </dependency>
+- <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+ </dependencies>
+
+ </project>
+diff --git a/pom.xml b/pom.xml
+index 7197d73..14cce0b 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -509,7 +509,6 @@
+ <module>tycho-equinox</module>
+ <module>tycho-bootstrap-maven-plugin</module>
+ <module>tycho-osgi-components</module>
+- <module>tycho-testing-harness</module>
+
+ </modules>
+ </profile>
+diff --git a/tycho-osgi-components/pom.xml b/tycho-osgi-components/pom.xml
+index 8967ed4..1bb9d77 100644
+--- a/tycho-osgi-components/pom.xml
++++ b/tycho-osgi-components/pom.xml
+@@ -50,6 +50,10 @@
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
++ <artifactId>maven-artifact</artifactId>
++ </dependency>
++ <dependency>
++ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ </dependency>
+ <dependency>
+@@ -76,12 +80,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+diff --git a/tycho-p2/tycho-p2-director-plugin/pom.xml b/tycho-p2/tycho-p2-director-plugin/pom.xml
+index 5340831..85357dc 100644
+--- a/tycho-p2/tycho-p2-director-plugin/pom.xml
++++ b/tycho-p2/tycho-p2-director-plugin/pom.xml
+@@ -41,12 +41,6 @@
+ </dependency>
+
+ <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>3.0</version>
+diff --git a/tycho-p2/tycho-p2-publisher-plugin/pom.xml b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+index f736ff1..ee2fb63 100644
+--- a/tycho-p2/tycho-p2-publisher-plugin/pom.xml
++++ b/tycho-p2/tycho-p2-publisher-plugin/pom.xml
+@@ -37,12 +37,6 @@
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+- <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ </dependency>
+diff --git a/tycho-release/tycho-versions-plugin/pom.xml b/tycho-release/tycho-versions-plugin/pom.xml
+index 24a0275..e9274a8 100644
+--- a/tycho-release/tycho-versions-plugin/pom.xml
++++ b/tycho-release/tycho-versions-plugin/pom.xml
+@@ -28,12 +28,6 @@
+ <version>${project.version}</version>
+ </dependency>
+
+- <dependency>
+- <groupId>org.sonatype.tycho</groupId>
+- <artifactId>tycho-testing-harness</artifactId>
+- <version>${project.version}</version>
+- <scope>test</scope>
+- </dependency>
+
+ </dependencies>
+
+@@ -46,4 +40,4 @@
+ </plugins>
+ </build>
+
+-</project>
+\ No newline at end of file
++</project>
+--
+1.7.4
+
diff --git a/EmptyMojo.java b/EmptyMojo.java
new file mode 100644
index 0000000..84d970f
--- /dev/null
+++ b/EmptyMojo.java
@@ -0,0 +1,19 @@
+package org.fedoraproject;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.AbstractMojo;
+
+/**
+ * Empty goal to fix
+ * @goal empty
+ * @phase clean
+ */
+public class EmptyMojo
+ extends AbstractMojo
+{
+ public void execute()
+ throws MojoExecutionException, MojoFailureException
+ {
+ }
+}
diff --git a/depmap.xml b/depmap.xml
new file mode 100644
index 0000000..fa4dfb0
--- /dev/null
+++ b/depmap.xml
@@ -0,0 +1,64 @@
+<dependencies>
+<dependency>
+ <maven>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>3.0.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>3.0.3</version>
+ </jpp>
+</dependency>
+<dependency>
+ <maven>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>3.0.3</version>
+ </jpp>
+</dependency>
+<dependency>
+ <maven>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0.3</version>
+ </maven>
+ <jpp>
+ <groupId>JPP/maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>3.0.3</version>
+ </jpp>
+</dependency>
+<dependency>
+ <maven>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>org.eclipse.jdt.core</artifactId>
+ <version>3.6.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>jdt-core</artifactId>
+ <version>3.6.0</version>
+ </jpp>
+</dependency>
+<dependency>
+ <maven>
+ <groupId>org.sonatype.tycho</groupId>
+ <artifactId>org.eclipse.osgi</artifactId>
+ <version>3.6.0</version>
+ </maven>
+ <jpp>
+ <groupId>JPP</groupId>
+ <artifactId>jdt-osgi</artifactId>
+ <version>3.6.0</version>
+ </jpp>
+</dependency>
+
+
+</dependencies>
diff --git a/sources b/sources
index e69de29..add790c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1,2 @@
+feda402d0f9cc1cfd22dc11a7c85dd4c maven-repo.tar.bz2
+f2ff10d3f25941d2746c030b57a0218b tycho-0.10.0.tar.xz
diff --git a/tycho.spec b/tycho.spec
new file mode 100644
index 0000000..9887213
--- /dev/null
+++ b/tycho.spec
@@ -0,0 +1,209 @@
+%global bootstrap 1
+
+%global e_osgi org.eclipse.osgi
+%global e_osgi_v 3.6.0.v20100517
+%global e_core org.eclipse.jdt.core
+%global e_core_v 3.6.0.v_A58
+
+Name: tycho
+Version: 0.10.0
+Release: 2%{?dist}
+Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
+
+Group: Development/Libraries
+# license file is missing but all files having some licensing information are ASL 2.0
+License: ASL 2.0
+URL: http://tycho.sonatype.org/
+# git clone git://github.com/sonatype/sonatype-tycho
+# git archive --prefix="tycho-0.10.0/" --format=tar tycho-0.10.0 | xz > tycho-0.10.0.tar.xz
+Source0: %{name}-%{version}.tar.xz
+
+# this is a workaround for maven-plugin-plugin changes that happened after
+# version 2.4.3 (impossible to have empty mojo created as aggregate). This
+# should be fixed upstream properly
+Source1: EmptyMojo.java
+
+# we need to make sure we are using maven 3 deps
+Source2: depmap.xml
+%if %{bootstrap}
+Source3: maven-repo.tar.bz2
+%endif
+
+Patch0: 0001-Remove-tycho-testing-harness.patch
+
+BuildArch: noarch
+
+BuildRequires: jpackage-utils
+BuildRequires: java-devel
+BuildRequires: maven
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-release-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-shared-verifier
+BuildRequires: maven-shared-osgi
+BuildRequires: maven-surefire-plugin
+BuildRequires: plexus-containers-component-metadata
+BuildRequires: eclipse-jdt
+BuildRequires: decentxml
+%if ! %{bootstrap}
+BuildRequires: tycho
+%endif
+
+Requires: jpackage-utils
+Requires: decentxml
+Requires: maven
+Requires: eclipse-jdt
+
+Requires(post): jpackage-utils
+Requires(postun): jpackage-utils
+
+
+%description
+Tycho is a set of Maven plugins and extensions for building Eclipse
+plugins and OSGI bundles with Maven. Eclipse plugins and OSGI bundles
+have their own metadata for expressing dependencies, source folder
+locations, etc. that are normally found in a Maven POM. Tycho uses
+native metadata for Eclipse plugins and OSGi bundles and uses the POM
+to configure and drive the build. Tycho supports bundles, fragments,
+features, update site projects and RCP applications. Tycho also knows
+how to run JUnit test plugins using OSGi runtime and there is also
+support for sharing build results using Maven artifact repositories.
+
+Tycho plugins introduce new packaging types and the corresponding
+lifecycle bindings that allow Maven to use OSGi and Eclipse metadata
+during a Maven build. OSGi rules are used to resolve project
+dependencies and package visibility restrictions are honored by the
+OSGi-aware JDT-based compiler plugin. Tycho will use OSGi metadata and
+OSGi rules to calculate project dependencies dynamically and injects
+them into the Maven project model at build time. Tycho supports all
+attributes supported by the Eclipse OSGi resolver (Require-Bundle,
+Import-Package, Eclipse-GenericRequire, etc). Tycho will use proper
+classpath access rules during compilation. Tycho supports all project
+types supported by PDE and will use PDE/JDT project metadata where
+possible. One important design goal in Tycho is to make sure there is
+no duplication of metadata between POM and OSGi metadata.
+
+
+
+%package javadoc
+Summary: Javadocs for %{name}
+Group: Documentation
+Requires: jpackage-utils
+
+%description javadoc
+This package contains the API documentation for %{name}.
+
+%prep
+%setup -q
+%patch0 -p1 -b .harness
+
+
+# place empty mojo in place
+mkdir -p tycho-maven-plugin/src/main/java/org/fedoraproject
+pushd tycho-maven-plugin/src/main/java/org/fedoraproject
+cp %{SOURCE1} .
+popd
+mkdir -p tycho-bootstrap-maven-plugin/src/main/java/org/fedoraproject
+pushd tycho-bootstrap-maven-plugin/src/main/java/org/fedoraproject
+cp %{SOURCE1} .
+popd
+
+# remove dependency on non-existent jars from deltapack
+sed -i '/equinox.security.\(macosx\|win32\)/d' \
+ tycho-p2/tycho-p2-runtime/tycho-p2-runtime.product
+
+
+%if %{bootstrap}
+tar xf %{SOURCE3}
+%endif
+
+# prepare directories for eclipse symlinks
+mkdir -p .m2/org/sonatype/tycho
+mkdir -p .m2/org/sonatype/tycho/%{e_osgi}/%{e_osgi_v}/
+mkdir -p .m2/org/sonatype/tycho/%{e_core}/%{e_core_v}/
+
+# maven resolver doesn't know how to resolve from directories other than _javadir
+pushd .m2/org/sonatype/tycho
+ln -sf %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar \
+ %{e_osgi}/%{e_osgi_v}/%{e_osgi}-%{e_osgi_v}.jar
+ln -sf %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar \
+ %{e_core}/%{e_core_v}/%{e_core}-%{e_core_v}.jar
+popd
+
+%build
+export TYCHO_TARGET_PLATFORM=%{_libdir}/eclipse
+
+# not needed when bootstrap is 0, but we build it anyway
+mvn-rpmbuild -Dmaven.test.skip=true \
+ -Dmaven.local.depmap.file=%{SOURCE2} \
+ -Pbootstrap-1 \
+ -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install
+
+mvn-rpmbuild -Dmaven.test.skip=true \
+ -Dmaven.local.depmap.file=%{SOURCE2} \
+ -Pbootstrap-2 \
+ -Dtycho.targetPlatform=$TYCHO_TARGET_PLATFORM install javadoc:aggregate
+
+%install
+
+mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
+install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+for mod in maven-osgi-{compiler,packaging,source}-plugin maven-tycho-plugin \
+ target-platform-configuration tycho-bootstrap-maven-plugin \
+ tycho-compiler-jdt tycho-equinox tycho-maven-plugin \
+ tycho-osgi-components tycho-release/tycho-{enforcer-rules,versions-plugin} \
+ tycho-p2/org.sonatype.tycho.{noopsecurity,p2{,.impl,.maven.repository,.publisher}}\
+ tycho-p2/tycho-p2-{director-plugin,facade,plugin,publisher-plugin,runtime} \
+ tycho-surefire/{maven-osgi-test-plugin,org.sonatype.tycho.surefire.{junit,junit4,osgibooter}};do
+ echo $mod
+ aid=`basename $mod`
+ suff=".jar"
+ if [ "$aid" == "tycho-p2-runtime" ];then
+ suff=".zip"
+ fi
+ install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
+ install -m 644 $mod/target/$aid-%{version}$suff %{buildroot}%{_javadir}/%{name}/$aid$suff
+ %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+done
+
+for pommod in tycho-p2 tycho-surefire;do
+ install -pm 644 $pommod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$pommod.pom
+ %add_to_maven_depmap org.sonatype.tycho $pommod %{version} JPP/%{name} $pommod
+done
+
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
+%add_to_maven_depmap org.sonatype.tycho %{name} %{version} JPP/%{name} main
+
+# javadoc
+install -dm 755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+
+
+%post
+%update_maven_depmap
+
+%postun
+%update_maven_depmap
+
+%files
+%defattr(-,root,root,-)
+%{_mavenpomdir}/*
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}/
+%doc README.md
+
+%files javadoc
+%defattr(-,root,root,-)
+%{_javadocdir}/%{name}
+
+%changelog
+* Tue May 3 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-2
+- Add README and make build more silent
+
+* Tue Mar 29 2011 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 0.10.0-1
+- First bootstrapped version
+
+
12 years, 12 months
[Bug 702033] New: java.lang.reflect.UndeclaredThrowableException in tests
by Red Hat Bugzilla
Please do not reply directly to this email. All additional
comments should be made in the comments box of this bug.
Summary: java.lang.reflect.UndeclaredThrowableException in tests
https://bugzilla.redhat.com/show_bug.cgi?id=702033
Summary: java.lang.reflect.UndeclaredThrowableException in
tests
Product: Fedora
Version: 15
Platform: All
OS/Version: Linux
Status: NEW
Severity: medium
Priority: unspecified
Component: maven-surefire
AssignedTo: sochotni(a)redhat.com
ReportedBy: orion(a)cora.nwra.com
QAContact: extras-qa(a)fedoraproject.org
CC: akurtako(a)redhat.com, sochotni(a)redhat.com,
java-sig-commits(a)lists.fedoraproject.org
Classification: Fedora
Story Points: ---
Description of problem:
With apacha-commons-vfs:
ava.lang.reflect.UndeclaredThrowableException
at $Proxy0.invoke(Unknown Source)
at
org.apache.maven.surefire.booter.SurefireStarter.invokeProvider(SurefireStarter.java:150)
at
org.apache.maven.surefire.booter.SurefireStarter.runSuitesInProcess(SurefireStarter.java:91)
at
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:69)
Caused by: java.lang.reflect.InvocationTargetException
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:616)
at
org.apache.maven.surefire.booter.ProviderFactory$ClassLoaderProxy.invoke(ProviderFactory.java:103)
... 4 more
Caused by: org.apache.maven.surefire.util.NestedRuntimeException: When finding
method run; nested exception is java.lang.NoSuchMethodException:
org.apache.commons.vfs.provider.zip.test.ZipProviderTestCase.run(junit.framework.TestResult)
at
org.apache.maven.surefire.common.junit3.JUnit3Reflector.getMethod(JUnit3Reflector.java:114)
at
org.apache.maven.surefire.common.junit3.JUnit3Reflector.getRunMethod(JUnit3Reflector.java:210)
at
org.apache.maven.surefire.junit.JUnitTestSet.<init>(JUnitTestSet.java:70)
at
org.apache.maven.surefire.junit.JUnit3Provider.createTestSet(JUnit3Provider.java:94)
at
org.apache.maven.surefire.junit.JUnit3Provider.invoke(JUnit3Provider.java:84)
... 9 more
Caused by: java.lang.NoSuchMethodException:
org.apache.commons.vfs.provider.zip.test.ZipProviderTestCase.run(junit.framework.TestResult)
at java.lang.Class.getMethod(Class.java:1622)
at
org.apache.maven.surefire.common.junit3.JUnit3Reflector.getMethod(JUnit3Reflector.java:110)
... 13 more
Version-Release number of selected component (if applicable):
maven-surefire-2.7.2-1.fc15 and 2.8.1-1.fc16. 2.7.1-3.fc15 appears to work.
http://www.cora.nwra.com/~orion/fedora/apache-commons-vfs-1.0-1.fc15.src.rpm
--
Configure bugmail: https://bugzilla.redhat.com/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.
13 years
[apache-commons-daemon] updated the s390x patch
by Dan Horák
commit 20534f9ecc8d756f990eb7054471409401fa25bf
Author: Dan Horák <dan(a)danny.cz>
Date: Wed May 4 16:27:14 2011 +0200
updated the s390x patch
0003-s390x-configure.patch | 22 ++++------------------
apache-commons-daemon.spec | 5 ++++-
2 files changed, 8 insertions(+), 19 deletions(-)
---
diff --git a/0003-s390x-configure.patch b/0003-s390x-configure.patch
index f5806d1..fd3e480 100644
--- a/0003-s390x-configure.patch
+++ b/0003-s390x-configure.patch
@@ -1,17 +1,7 @@
-From 2c58c04e648f9c956c3c691ff456f9d1c7470ebe Mon Sep 17 00:00:00 2001
-From: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
-Date: Tue, 18 Jan 2011 14:56:18 +0100
-Subject: [PATCH 3/3] s390x configure
-
----
- src/native/unix/configure | 8 ++++----
- 1 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/native/unix/configure b/src/native/unix/configure
-index 62f35d9..deac6e3 100755
---- a/src/native/unix/configure
-+++ b/src/native/unix/configure
-@@ -3030,10 +3030,10 @@ $as_echo "failed" >&6; }
+diff -up commons-daemon-1.0.5-src/src/native/unix/configure.s390 commons-daemon-1.0.5-src/src/native/unix/configure
+--- commons-daemon-1.0.5-src/src/native/unix/configure.s390 2011-05-04 16:04:10.000000000 +0200
++++ commons-daemon-1.0.5-src/src/native/unix/configure 2011-05-04 16:12:04.000000000 +0200
+@@ -3030,10 +3030,9 @@ $as_echo "failed" >&6; }
CFLAGS="$CFLAGS -DCPU=\\\"ia64\\\""
supported_os="ia64"
HOST_CPU=ia64;;
@@ -21,11 +11,7 @@ index 62f35d9..deac6e3 100755
- HOST_CPU=s390;;
+ s390*)
+ CFLAGS="$CFLAGS -DCPU=\\\"$host_cpu\\\""
-+ supported_os="$host_cpu"
+ HOST_CPU=$host_cpu;;
*)
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
$as_echo "failed" >&6; }
---
-1.7.3.4
-
diff --git a/apache-commons-daemon.spec b/apache-commons-daemon.spec
index 7164c46..00d29f2 100644
--- a/apache-commons-daemon.spec
+++ b/apache-commons-daemon.spec
@@ -4,7 +4,7 @@
Name: apache-%{short_name}
Version: 1.0.5
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Defines API to support an alternative invocation mechanism
License: ASL 2.0
Group: Applications/System
@@ -148,6 +148,9 @@ rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
%changelog
+* Wed May 4 2011 Dan Horák <dan[at]danny.cz> - 1.0.5-4
+- updated the s390x patch
+
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 1.0.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
13 years