[apache-commons-vfs] Rebuild against javamail
by Mikolaj Izdebski
commit 7c1ff7969961691f1b9562bff5572dd5620b4569
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Aug 1 13:09:17 2012 +0200
Rebuild against javamail
apache-commons-vfs.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/apache-commons-vfs.spec b/apache-commons-vfs.spec
index a083698..e3b8da3 100644
--- a/apache-commons-vfs.spec
+++ b/apache-commons-vfs.spec
@@ -2,7 +2,7 @@
%global short_name commons-%{base_name}
Name: apache-commons-vfs
Version: 2.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Commons Virtual File System
Group: Development/Libraries
License: ASL 2.0
@@ -182,6 +182,9 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
%config %{_sysconfdir}/ant.d/%{short_name}
%changelog
+* Wed Aug 1 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.0-4
+- Rebuild against javamail
+
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
@@ -190,4 +193,4 @@ install -p -m 644 %{short_name} %{buildroot}%{_sysconfdir}/ant.d/%{short_name}
- install NOTICE.txt in javadocs subpackage
* Mon May 14 2012 gil cattaneo <puntogil(a)libero.it> 2.0-1
-- initial rpm
\ No newline at end of file
+- initial rpm
11 years, 8 months
[hamcrest] Add OSGi metadata to hamcrest-generator.
by Alexander Kurtakov
commit b02d11673d2d897788c3b2bc22473f0afe78add9
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Aug 1 11:05:40 2012 +0300
Add OSGi metadata to hamcrest-generator.
hamcrest-generator-MANIFEST.MF | 18 ++++++++++++++++++
hamcrest.spec | 12 +++++++++++-
2 files changed, 29 insertions(+), 1 deletions(-)
---
diff --git a/hamcrest-generator-MANIFEST.MF b/hamcrest-generator-MANIFEST.MF
new file mode 100644
index 0000000..57ca8cc
--- /dev/null
+++ b/hamcrest-generator-MANIFEST.MF
@@ -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.1.0.v20090501071000
+Export-Package: org.hamcrest.generator;version="1.1.0",org.hamcrest.ge
+ nerator.config;version="1.1.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"
diff --git a/hamcrest.spec b/hamcrest.spec
index bd82f3d..0019728 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.1
-Release: 18%{?dist}
+Release: 19%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -68,6 +68,7 @@ Source8: hamcrest-core-MANIFEST.MF
Source9: hamcrest-library-MANIFEST.MF
Source10: hamcrest-text-MANIFEST.MF
Source11: hamcrest-integration-MANIFEST.MF
+Source12: hamcrest-generator-MANIFEST.MF
Patch0: hamcrest-1.1-build.patch
Patch1: hamcrest-1.1-no-jarjar.patch
Patch2: hamcrest-1.1-no-integration.patch
@@ -185,6 +186,12 @@ cp -p %{SOURCE11} META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u build/%{name}-integration-%{version}.jar META-INF/MANIFEST.MF
+rm -fr META-INF
+mkdir -p META-INF
+cp -p %{SOURCE12} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-generator-%{version}.jar META-INF/MANIFEST.MF
+
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -254,6 +261,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Wed Aug 1 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-19
+- Add OSGi metadata to hamcrest-generator.
+
* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-18
- Actually build integration.
11 years, 8 months
[tycho/f17] Non-bootstrap build.
by Roland Grunberg
commit f7d0f4b940bd185a209d977bae85c706ea1e3da3
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Jul 31 16:09:25 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 34b3555..6d92043 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,5 @@
%global eclipsedir %{_libdir}/eclipse
-%global bootstrap 1
+%global bootstrap 0
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.15.0
-Release: 2.1%{?dist}
+Release: 3%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-3
+- Non-bootstrap build.
+
* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2.1
- Ignore defined environments in local mode.
11 years, 8 months
[tycho/f17] Ignore defined environments in local mode.
by Roland Grunberg
commit 8520b94c739bf4815bc39091f0971bb267ba872d
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue Jul 31 15:15:40 2012 -0400
Ignore defined environments in local mode.
When running Tycho in local mode, dependencies will be resolved for all
environments defined in target-platform-configuration. Only the running
environment should be used.
tycho-use-custom-resolver.patch | 24 ++++++++++++++++++++++--
tycho.spec | 7 +++++--
2 files changed, 27 insertions(+), 4 deletions(-)
---
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index e44de14..3a03e75 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 6f332ba550f5d0b29a929503b0d7ca386d337f9c Mon Sep 17 00:00:00 2001
+From 9a323780512a16b0ed3e095d4b0954ed2780fe3d Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 10:38:51 -0400
Subject: [PATCH] Implement a custom resolver for Tycho in local mode.
@@ -16,6 +16,9 @@ for Eclipse bundles. Eclipse Juno platform bundles depend on
javax.annotation. In Fedora this is provided by geronimo-annotation, but
has a dependency on javax.lang.model (since 1.6).
+Ignore all environments defined in target-platform-configuration when
+running in local mode.
+
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
.../tycho/p2/target/TargetDefinitionResolver.java | 8 +++--
@@ -23,9 +26,10 @@ Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
.../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++
.../core/osgitools/EclipseFeatureProject.java | 22 +++++++++++++
.../tycho/core/osgitools/OsgiBundleProject.java | 38 +++++++++++++++++++++-
+ .../DefaultTargetPlatformConfigurationReader.java | 5 ++-
.../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 17 ++++++++++
.../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++
- 7 files changed, 114 insertions(+), 3 deletions(-)
+ 8 files changed, 118 insertions(+), 4 deletions(-)
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetDefinitionResolver.java
index 6a85c49..d9d6055 100644
@@ -198,6 +202,22 @@ index fe6383f..d037faf 100644
} catch (UnknownEnvironmentException e) {
throw new RuntimeException("Unknown execution environment specified in build.properties of project "
+ project, e);
+diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+index aad664a..87fe760 100644
+--- a/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
++++ b/tycho-core/src/main/java/org/eclipse/tycho/core/resolver/DefaultTargetPlatformConfigurationReader.java
+@@ -66,7 +66,10 @@ public class DefaultTargetPlatformConfigurationReader {
+ + configuration.toString());
+ }
+
+- addTargetEnvironments(result, project, configuration);
++ // Ignore defined environments in local mode
++ if (System.getProperty("maven.local.mode") == null) {
++ addTargetEnvironments(result, project, configuration);
++ }
+
+ setTargetPlatformResolver(result, configuration);
+
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java b/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
index 15b3fff..c8f14df 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/osgi/runtime/TychoP2RuntimeLocator.java
diff --git a/tycho.spec b/tycho.spec
index 7f3b3e2..34b3555 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,5 +1,5 @@
%global eclipsedir %{_libdir}/eclipse
-%global bootstrap 0
+%global bootstrap 1
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.15.0
-Release: 2%{?dist}
+Release: 2.1%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -194,6 +194,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Tue Jul 31 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2.1
+- Ignore defined environments in local mode.
+
* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2
- Non-bootstrap build.
11 years, 8 months
