[hamcrest] Remove checksums from manifest.
by Alexander Kurtakov
commit e240ba4f8c39377036acd048d14196d7ebb8979e
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Jul 31 14:39:35 2012 +0300
Remove checksums from manifest.
hamcrest-text-MANIFEST.MF | 100 ---------------------------------------------
hamcrest.spec | 5 ++-
2 files changed, 4 insertions(+), 101 deletions(-)
---
diff --git a/hamcrest-text-MANIFEST.MF b/hamcrest-text-MANIFEST.MF
index da1e20c..7c4bdf9 100644
--- a/hamcrest-text-MANIFEST.MF
+++ b/hamcrest-text-MANIFEST.MF
@@ -12,103 +12,3 @@ Export-Package: org.hamcrest.text.pattern;version="1.1.0",org.hamcrest
.text.pattern.internal.ast;version="1.1.0";x-internal:=true,org.hamcr
est.text.pattern.internal.naming;version="1.1.0";x-internal:=true
Bundle-ManifestVersion: 2
-
-Name: org/hamcrest/text/pattern/internal/naming/Path.class
-SHA1-Digest: 8MEgHJNKZmvm48PUSY9EXkJvx5w=
-
-Name: org/hamcrest/text/pattern/PatternMatchException.class
-SHA1-Digest: BIALrg7Wl5BjT/bH4LdqLTvwsWc=
-
-Name: org/hamcrest/text/pattern/Field.class
-SHA1-Digest: EbqXToAA3hawOkkwDYTOvUkMng8=
-
-Name: org/hamcrest/text/pattern/internal/naming/IndexSequence.class
-SHA1-Digest: 72qA+v8pe0C+gYs2EWYMy8yVXro=
-
-Name: org/hamcrest/text/pattern/internal/ast/OneOrMore.class
-SHA1-Digest: PfExrNYaYJYYqzVWQtLHaOMB9J4=
-
-Name: org/hamcrest/text/pattern/internal/ast/Sequence.class
-SHA1-Digest: UbrVTwQs7qh+KkPEk2JOtsWA4r4=
-
-Name: org/hamcrest/text/pattern/PatternMatcher.class
-SHA1-Digest: 4EFvTIfrz4I9/tRCAeawd0PkgFU=
-
-Name: plugin.properties
-SHA1-Digest: OzE4ka1lXm4WBNXjUyz1V8spxNc=
-
-Name: org/hamcrest/text/pattern/FromTo.class
-SHA1-Digest: hlAVogHbCk1HSvkuqN7y8iK+Sgw=
-
-Name: org/hamcrest/text/pattern/internal/ast/GroupReference.class
-SHA1-Digest: 7YOoMVdabjoWaJJ7UoDJ+k9tlJw=
-
-Name: org/hamcrest/text/pattern/PatternComponent.class
-SHA1-Digest: h/ct5//wEipWgDrneanGhgxU9u8=
-
-Name: about_files/LICENSE.txt
-SHA1-Digest: dTF36wNXk3NZRvp51lzE8FW7KYQ=
-
-Name: org/hamcrest/text/pattern/internal/ast/Literal.class
-SHA1-Digest: Rvs+Q0gPXIPtz9H7NkBsTHPrsAU=
-
-Name: org/hamcrest/text/pattern/internal/ast/ListOf.class
-SHA1-Digest: Iu7QqZBzHefK6sPRpv2JkxKOboQ=
-
-Name: org/hamcrest/text/pattern/SeparablePatternComponent.class
-SHA1-Digest: o6bV8SO3PyMCfOexGaiUe4Myskw=
-
-Name: org/hamcrest/text/pattern/internal/ast/CaptureGroup.class
-SHA1-Digest: Df9Tc9MMk6IUJnKsXEo2Yvo21Xg=
-
-Name: META-INF/eclipse.inf
-SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
-
-Name: org/hamcrest/text/pattern/internal/ast/AnyCharacter.class
-SHA1-Digest: FFHTgwjKSxBEon7JyjS5TPb35P0=
-
-Name: org/hamcrest/text/pattern/internal/ast/ZeroOrMore.class
-SHA1-Digest: dKff/Jfil5f/JucIWxhTj8HisMk=
-
-Name: org/hamcrest/text/pattern/internal/ast/Optional.class
-SHA1-Digest: 7RTnyG5IlgQqk3kZhsSSvdxHg7w=
-
-Name: org/hamcrest/text/pattern/internal/ast/Choice.class
-SHA1-Digest: K6L1r75rnwQWqVAgP4vP+4CnNfo=
-
-Name: about.html
-SHA1-Digest: gL/jUAsRjH3ChAp5sSE4yJE3fb4=
-
-Name: org/hamcrest/text/pattern/Patterns.class
-SHA1-Digest: I3wqgz3xuON3b05nD56sOHXXgg4=
-
-Name: org/hamcrest/text/pattern/internal/ast/PatternModifier.class
-SHA1-Digest: fxHc27TG00nb3idyExY7edfMJqE=
-
-Name: org/hamcrest/text/pattern/internal/ast/CharacterInUnicodeCategor
- y.class
-SHA1-Digest: LvNqEPnqKXJwtUILnQ0pYcs4GQA=
-
-Name: org/hamcrest/text/pattern/internal/ast/CharacterNotInUnicodeCate
- gory.class
-SHA1-Digest: i8iNUaUrmGs4IOWjPwcz/t9Rs04=
-
-Name: org/hamcrest/text/pattern/internal/ast/Exactly.class
-SHA1-Digest: lLXp80a9pZGMgsZ6/PaaZK059a4=
-
-Name: org/hamcrest/text/pattern/internal/ast/CharacterInRange.class
-SHA1-Digest: NAGHr4/5dYklRHwp2/yACMaAwGc=
-
-Name: org/hamcrest/text/pattern/internal/ast/CharacterNotInRange.class
-SHA1-Digest: YZsXqBMIAhKW4fr0JXdbS9mqxl0=
-
-Name: org/hamcrest/text/pattern/internal/naming/GroupNamespace.class
-SHA1-Digest: vY+mJh4LmlJNaMnFOI/0iibKvj8=
-
-Name: org/hamcrest/text/pattern/Parse.class
-SHA1-Digest: XNYfliVZ1SACUeVNoKECmPCQu9Y=
-
-Name: org/hamcrest/text/pattern/internal/ast/NullPatternComponent.clas
- s
-SHA1-Digest: R82R/evr22GwdcrFFno7NOnnmT4=
-
diff --git a/hamcrest.spec b/hamcrest.spec
index 7f2a05f..8009247 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.1
-Release: 15%{?dist}
+Release: 16%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -256,6 +256,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-16
+- Remove checksums from manifest.
+
* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-15
- Add OSGi metadata to hamcrest-text.
11 years, 9 months
[hamcrest] Add OSGi metadata to hamcrest-text.
by Alexander Kurtakov
commit 237cb0c85972483b650ad6b60aa466aa0348b741
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Jul 31 14:29:56 2012 +0300
Add OSGi metadata to hamcrest-text.
hamcrest-text-MANIFEST.MF | 114 +++++++++++++++++++++++++++++++++++++++++++++
hamcrest.spec | 12 ++++-
2 files changed, 125 insertions(+), 1 deletions(-)
---
diff --git a/hamcrest-text-MANIFEST.MF b/hamcrest-text-MANIFEST.MF
new file mode 100644
index 0000000..da1e20c
--- /dev/null
+++ b/hamcrest-text-MANIFEST.MF
@@ -0,0 +1,114 @@
+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.text
+Require-Bundle: org.hamcrest.core;bundle-version="1.1.0",org.hamcrest.
+ library;bundle-version="1.1.0"
+Bundle-Version: 1.1.0.v20090501071000
+Export-Package: org.hamcrest.text.pattern;version="1.1.0",org.hamcrest
+ .text.pattern.internal.ast;version="1.1.0";x-internal:=true,org.hamcr
+ est.text.pattern.internal.naming;version="1.1.0";x-internal:=true
+Bundle-ManifestVersion: 2
+
+Name: org/hamcrest/text/pattern/internal/naming/Path.class
+SHA1-Digest: 8MEgHJNKZmvm48PUSY9EXkJvx5w=
+
+Name: org/hamcrest/text/pattern/PatternMatchException.class
+SHA1-Digest: BIALrg7Wl5BjT/bH4LdqLTvwsWc=
+
+Name: org/hamcrest/text/pattern/Field.class
+SHA1-Digest: EbqXToAA3hawOkkwDYTOvUkMng8=
+
+Name: org/hamcrest/text/pattern/internal/naming/IndexSequence.class
+SHA1-Digest: 72qA+v8pe0C+gYs2EWYMy8yVXro=
+
+Name: org/hamcrest/text/pattern/internal/ast/OneOrMore.class
+SHA1-Digest: PfExrNYaYJYYqzVWQtLHaOMB9J4=
+
+Name: org/hamcrest/text/pattern/internal/ast/Sequence.class
+SHA1-Digest: UbrVTwQs7qh+KkPEk2JOtsWA4r4=
+
+Name: org/hamcrest/text/pattern/PatternMatcher.class
+SHA1-Digest: 4EFvTIfrz4I9/tRCAeawd0PkgFU=
+
+Name: plugin.properties
+SHA1-Digest: OzE4ka1lXm4WBNXjUyz1V8spxNc=
+
+Name: org/hamcrest/text/pattern/FromTo.class
+SHA1-Digest: hlAVogHbCk1HSvkuqN7y8iK+Sgw=
+
+Name: org/hamcrest/text/pattern/internal/ast/GroupReference.class
+SHA1-Digest: 7YOoMVdabjoWaJJ7UoDJ+k9tlJw=
+
+Name: org/hamcrest/text/pattern/PatternComponent.class
+SHA1-Digest: h/ct5//wEipWgDrneanGhgxU9u8=
+
+Name: about_files/LICENSE.txt
+SHA1-Digest: dTF36wNXk3NZRvp51lzE8FW7KYQ=
+
+Name: org/hamcrest/text/pattern/internal/ast/Literal.class
+SHA1-Digest: Rvs+Q0gPXIPtz9H7NkBsTHPrsAU=
+
+Name: org/hamcrest/text/pattern/internal/ast/ListOf.class
+SHA1-Digest: Iu7QqZBzHefK6sPRpv2JkxKOboQ=
+
+Name: org/hamcrest/text/pattern/SeparablePatternComponent.class
+SHA1-Digest: o6bV8SO3PyMCfOexGaiUe4Myskw=
+
+Name: org/hamcrest/text/pattern/internal/ast/CaptureGroup.class
+SHA1-Digest: Df9Tc9MMk6IUJnKsXEo2Yvo21Xg=
+
+Name: META-INF/eclipse.inf
+SHA1-Digest: KyT9FF7C7t86NoBoa2kZT3ZJBfw=
+
+Name: org/hamcrest/text/pattern/internal/ast/AnyCharacter.class
+SHA1-Digest: FFHTgwjKSxBEon7JyjS5TPb35P0=
+
+Name: org/hamcrest/text/pattern/internal/ast/ZeroOrMore.class
+SHA1-Digest: dKff/Jfil5f/JucIWxhTj8HisMk=
+
+Name: org/hamcrest/text/pattern/internal/ast/Optional.class
+SHA1-Digest: 7RTnyG5IlgQqk3kZhsSSvdxHg7w=
+
+Name: org/hamcrest/text/pattern/internal/ast/Choice.class
+SHA1-Digest: K6L1r75rnwQWqVAgP4vP+4CnNfo=
+
+Name: about.html
+SHA1-Digest: gL/jUAsRjH3ChAp5sSE4yJE3fb4=
+
+Name: org/hamcrest/text/pattern/Patterns.class
+SHA1-Digest: I3wqgz3xuON3b05nD56sOHXXgg4=
+
+Name: org/hamcrest/text/pattern/internal/ast/PatternModifier.class
+SHA1-Digest: fxHc27TG00nb3idyExY7edfMJqE=
+
+Name: org/hamcrest/text/pattern/internal/ast/CharacterInUnicodeCategor
+ y.class
+SHA1-Digest: LvNqEPnqKXJwtUILnQ0pYcs4GQA=
+
+Name: org/hamcrest/text/pattern/internal/ast/CharacterNotInUnicodeCate
+ gory.class
+SHA1-Digest: i8iNUaUrmGs4IOWjPwcz/t9Rs04=
+
+Name: org/hamcrest/text/pattern/internal/ast/Exactly.class
+SHA1-Digest: lLXp80a9pZGMgsZ6/PaaZK059a4=
+
+Name: org/hamcrest/text/pattern/internal/ast/CharacterInRange.class
+SHA1-Digest: NAGHr4/5dYklRHwp2/yACMaAwGc=
+
+Name: org/hamcrest/text/pattern/internal/ast/CharacterNotInRange.class
+SHA1-Digest: YZsXqBMIAhKW4fr0JXdbS9mqxl0=
+
+Name: org/hamcrest/text/pattern/internal/naming/GroupNamespace.class
+SHA1-Digest: vY+mJh4LmlJNaMnFOI/0iibKvj8=
+
+Name: org/hamcrest/text/pattern/Parse.class
+SHA1-Digest: XNYfliVZ1SACUeVNoKECmPCQu9Y=
+
+Name: org/hamcrest/text/pattern/internal/ast/NullPatternComponent.clas
+ s
+SHA1-Digest: R82R/evr22GwdcrFFno7NOnnmT4=
+
diff --git a/hamcrest.spec b/hamcrest.spec
index dd1ec24..7f2a05f 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.1
-Release: 14%{?dist}
+Release: 15%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -66,6 +66,7 @@ Source6: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamc
Source7: hamcrest-text-1.1.pom
Source8: hamcrest-core-MANIFEST.MF
Source9: hamcrest-library-MANIFEST.MF
+Source10: hamcrest-text-MANIFEST.MF
Patch0: hamcrest-1.1-build.patch
Patch1: hamcrest-1.1-no-jarjar.patch
Patch2: hamcrest-1.1-no-integration.patch
@@ -177,6 +178,12 @@ cp -p %{SOURCE9} META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u build/%{name}-library-%{version}.jar META-INF/MANIFEST.MF
+rm -fr META-INF
+mkdir -p META-INF
+cp -p %{SOURCE10} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-text-%{version}.jar META-INF/MANIFEST.MF
+
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -249,6 +256,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-15
+- Add OSGi metadata to hamcrest-text.
+
* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-14
- Add OSGi metadata for hamcrest-library.
11 years, 9 months
[hamcrest] Add OSGi metadata for hamcrest-library.
by Alexander Kurtakov
commit 2702706b9451251b60633f2e6433d7d23ae27a6c
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Tue Jul 31 13:35:20 2012 +0300
Add OSGi metadata for hamcrest-library.
hamcrest-library-MANIFEST.MF | 15 +++++++++++++++
hamcrest.spec | 19 +++++++++++--------
2 files changed, 26 insertions(+), 8 deletions(-)
---
diff --git a/hamcrest-library-MANIFEST.MF b/hamcrest-library-MANIFEST.MF
new file mode 100644
index 0000000..829a9a8
--- /dev/null
+++ b/hamcrest-library-MANIFEST.MF
@@ -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.1.0"
+Bundle-Version: 1.1.0.v20090501071000
+Export-Package: org.hamcrest;version="1.1.0";library=split;mandatory:=
+ library,org.hamcrest.beans;version="1.1.0",org.hamcrest.collection;ve
+ rsion="1.1.0",org.hamcrest.number;version="1.1.0",org.hamcrest.object
+ ;version="1.1.0",org.hamcrest.text;version="1.1.0",org.hamcrest.xml;v
+ ersion="1.1.0"
+Bundle-ManifestVersion: 2
diff --git a/hamcrest.spec b/hamcrest.spec
index 14748d0..dd1ec24 100644
--- a/hamcrest.spec
+++ b/hamcrest.spec
@@ -50,7 +50,7 @@
Name: hamcrest
Version: 1.1
-Release: 13%{?dist}
+Release: 14%{?dist}
Epoch: 0
Summary: Library of matchers for building test expressions
License: BSD
@@ -65,6 +65,7 @@ Source5: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.1/ham
Source6: http://repo1.maven.org/maven2/org/hamcrest/hamcrest-all/1.1/hamcrest-all-...
Source7: hamcrest-text-1.1.pom
Source8: hamcrest-core-MANIFEST.MF
+Source9: hamcrest-library-MANIFEST.MF
Patch0: hamcrest-1.1-build.patch
Patch1: hamcrest-1.1-no-jarjar.patch
Patch2: hamcrest-1.1-no-integration.patch
@@ -89,7 +90,6 @@ BuildRequires: jarjar
BuildRequires: jmock
%endif
BuildRequires: junit
-BuildRequires: junit4
BuildRequires: qdox
%if %with tests
BuildRequires: testng
@@ -97,9 +97,6 @@ BuildRequires: testng
BuildArch: noarch
-Requires(post): jpackage-utils >= 0:1.7.4
-Requires(postun): jpackage-utils >= 0:1.7.4
-
%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
@@ -119,7 +116,6 @@ Group: Development/Libraries
Summary: Demos for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: junit
-Requires: junit4
%if %with tests
Requires: testng
%endif
@@ -146,8 +142,6 @@ ln -sf $(build-classpath jmock) lib/integration/
%endif
# BUILD/hamcrest-1.1/lib/integration/junit-3.8.1.jar.no
ln -sf $(build-classpath junit) lib/integration/
-# BUILD/hamcrest-1.1/lib/integration/junit-4.0.jar.no
-ln -sf $(build-classpath junit4) lib/integration/
# BUILD/hamcrest-1.1/lib/integration/testng-4.6-jdk15.jar.no
%if %with tests
ln -sf $(build-classpath testng-jdk15) lib/integration/
@@ -177,6 +171,12 @@ cp -p %{SOURCE8} META-INF/MANIFEST.MF
touch META-INF/MANIFEST.MF
zip -u build/%{name}-core-%{version}.jar META-INF/MANIFEST.MF
+rm -fr META-INF
+mkdir -p META-INF
+cp -p %{SOURCE9} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/%{name}-library-%{version}.jar META-INF/MANIFEST.MF
+
%install
# jars
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
@@ -249,6 +249,9 @@ cp -pr %{name}-examples $RPM_BUILD_ROOT%{_datadir}/%{name}/
%{_datadir}/%{name}
%changelog
+* Tue Jul 31 2012 Alexander Kurtakov <akurtako(a)redhat.com> 0:1.1-14
+- Add OSGi metadata for hamcrest-library.
+
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:1.1-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
11 years, 9 months
[tycho/f17] Non-bootstrap build.
by Roland Grunberg
commit e7b7aa27e44fb1b1283b79d869383bb3c35292a5
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Jul 30 14:55:15 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index bc4b68e..7f3b3e2 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: 1.1%{?dist}
+Release: 2%{?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
+* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2
+- Non-bootstrap build.
+
* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1.1
- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
11 years, 9 months
[tycho/f17] Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
by Roland Grunberg
commit 8f8436e84296427116c6f04361161f071b461fc0
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Jul 30 14:48:52 2012 -0400
Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
When the path to the plugins/features folder for a set of bundles is
"%%{_datadir}/eclipse/dropins/${name}" (missing the additional eclipse
folder), the linking of its jars will fail.
copy-platform-all | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 8a44193..5cbd758 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -46,7 +46,7 @@ pushd $where
ls -d plugins/* features/* 2>/dev/null) |
while read g; do
[ ! -e $g ] && \
- ln -s $datadir/dropins/$g $g
+ ln -s $datadir/dropins/$f/$g $g
done
fi
done
diff --git a/tycho.spec b/tycho.spec
index 12d09ce..bc4b68e 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: 1%{?dist}
+Release: 1.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
+* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1.1
+- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
+
* Thu Jul 26 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1
- Update to 0.15.0.
- Set BREE to at least JavaSE-1.6 for Eclipse feature bundles.
11 years, 9 months
[tycho] Non-bootstrap build.
by Roland Grunberg
commit b335532d6bbb24a96b0b69bde4911368dc6de637
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Jul 30 14:55:15 2012 -0400
Non-bootstrap build.
tycho.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index d5891f2..0a11887 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 1
+%global bootstrap 0
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -8,7 +8,7 @@
Name: tycho
Version: 0.15.0
-Release: 1.1%{?dist}
+Release: 2%{?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
+* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-2
+- Non-bootstrap build.
+
* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1.1
- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
11 years, 9 months
[tycho] Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
by Roland Grunberg
commit 7431c5844eff2bb256b13ba08046b38742b6845d
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Mon Jul 30 14:48:52 2012 -0400
Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
When the path to the plugins/features folder for a set of bundles is
"%%{_datadir}/eclipse/dropins/${name}" (missing the additional eclipse
folder), the linking of its jars will fail.
copy-platform-all | 2 +-
tycho.spec | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/copy-platform-all b/copy-platform-all
index 8a44193..5cbd758 100755
--- a/copy-platform-all
+++ b/copy-platform-all
@@ -46,7 +46,7 @@ pushd $where
ls -d plugins/* features/* 2>/dev/null) |
while read g; do
[ ! -e $g ] && \
- ln -s $datadir/dropins/$g $g
+ ln -s $datadir/dropins/$f/$g $g
done
fi
done
diff --git a/tycho.spec b/tycho.spec
index 240d0b5..d5891f2 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
%if %{bootstrap}
%global snap -SNAPSHOT
@@ -8,7 +8,7 @@
Name: tycho
Version: 0.15.0
-Release: 1%{?dist}
+Release: 1.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
+* Mon Jul 30 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1.1
+- Fix copy-platform-all script to properly link %%{_datadir}/eclipse jars.
+
* Thu Jul 26 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.15.0-1
- Update to 0.15.0.
- Set BREE to at least JavaSE-1.6 for Eclipse feature bundles.
11 years, 9 months
[maven-script-interpreter/f17] Inital commit
by tradej@fedoraproject.org
commit a63de53acb9314763a97291c9ca7421430b2245f
Author: Tomas Radej <tradej(a)redhat.com>
Date: Mon Jul 30 13:31:50 2012 +0200
Inital commit
.gitignore | 1 +
maven-script-interpreter-plexus.patch | 21 +++++++++
maven-script-interpreter.spec | 77 +++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 100 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..fb3a090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/maven-script-interpreter-1.0-source-release.zip
diff --git a/maven-script-interpreter-plexus.patch b/maven-script-interpreter-plexus.patch
new file mode 100644
index 0000000..c5f48ad
--- /dev/null
+++ b/maven-script-interpreter-plexus.patch
@@ -0,0 +1,21 @@
+diff --git a/pom.xml b/pom.xml
+index 3d674d2..2bbb913 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -97,14 +97,14 @@
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+- <artifactId>plexus-maven-plugin</artifactId>
++ <artifactId>plexus-component-metadata</artifactId>
+ <version>1.3.8</version>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <phase>generate-resources</phase>
+ <goals>
+- <goal>descriptor</goal>
++ <goal>generate-metadata</goal>
+ </goals>
+ </execution>
+ </executions>
diff --git a/maven-script-interpreter.spec b/maven-script-interpreter.spec
new file mode 100644
index 0000000..2c403d0
--- /dev/null
+++ b/maven-script-interpreter.spec
@@ -0,0 +1,77 @@
+Name: maven-script-interpreter
+Version: 1.0
+Release: 1%{?dist}
+Summary: Maven Script Interpreter
+Group: Development/Libraries
+License: ASL 2.0
+URL: http://maven.apache.org/shared/%{name}
+Source0: http://central.maven.org/maven2/org/apache/maven/shared/%{name}/%{version...
+
+# Plexus-maven-plugin no longer used
+Patch0: %{name}-plexus.patch
+
+BuildArch: noarch
+
+BuildRequires: java-devel >= 1:1.6.0
+BuildRequires: jpackage-utils
+BuildRequires: groovy
+BuildRequires: maven
+BuildRequires: maven-surefire-provider-junit4
+BuildRequires: plexus-containers-component-metadata
+
+Requires: java
+Requires: jpackage-utils
+Requires: bsh
+Requires: groovy
+Requires: maven
+Requires: plexus-utils
+
+%description
+This component provides some utilities to interpret/execute some scripts for
+various implementations: Groovy or BeanShell.
+
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+API documentation for %{name}.
+
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+mvn-rpmbuild install javadoc:aggregate -Dproject.build.sourceEncoding=UTF-8
+
+%install
+# JAR
+install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+
+# POM
+install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+
+# JavaDoc
+install -Ddm 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
+
+%files
+%doc DEPENDENCIES LICENSE NOTICE
+%{_javadir}/%{name}.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+
+%files javadoc
+%doc LICENSE NOTICE
+%doc %{_javadocdir}/%{name}
+
+
+%changelog
+* Tue Jul 24 2012 Tomas Radej <tradej(a)redhat.com> - 1.0-1
+- Initial version
+
diff --git a/sources b/sources
index e69de29..ed41329 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+b7d1859dd80e8c37e97132d19e439e1e maven-script-interpreter-1.0-source-release.zip
11 years, 9 months