[netty] upgrading to the new version
by Mikolaj Izdebski
commit 9e017ea721a359dfa2daa2388066f67fd9c57888
Author: Tomas Rohovsky <tomas(a)dhcp-25-193.brq.redhat.com>
Date: Thu Aug 16 14:26:51 2012 +0200
upgrading to the new version
netty.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/netty.spec b/netty.spec
index 1fec79b..e4dce25 100644
--- a/netty.spec
+++ b/netty.spec
@@ -1,5 +1,5 @@
Name: netty
-Version: 3.5.3
+Version: 3.5.4
Release: 1%{?dist}
Summary: An asynchronous event-driven network application framework and tools for Java
@@ -103,6 +103,9 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
%{_javadocdir}/%{name}
%changelog
+* Thu Aug 15 2012 Tomas Rohovsky <trohovsk(a)redhat.com> - 3.5.4-1
+- Update to upstream version 3.5.4
+
* Tue Jul 24 2012 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.5.3-1
- Update to upstream version 3.5.3
diff --git a/sources b/sources
index 3fcad79..f99ca65 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e4f90b4b3e9157cfd3e405068d8cbb33 netty-3.5.3.Final-dist.tar.bz2
+f979270ade2b035b6e3c14a79d16b0c5 netty-3.5.4.Final-dist.tar.bz2
11 years, 10 months
[tycho] Update spec file to honour new java packaging guidelines.
by Roland Grunberg
commit b01c67e8cbc1f273b2cdc2e85565c3658afa0287
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 10 13:57:20 2012 -0400
Update spec file to honour new java packaging guidelines.
tycho.spec | 55 +++++++++++++++++++++----------------------------------
1 files changed, 21 insertions(+), 34 deletions(-)
---
diff --git a/tycho.spec b/tycho.spec
index 9c3e1d5..01ef79b 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -69,9 +69,6 @@ Requires: maven-shared-verifier
Requires: maven-surefire-provider-junit4
Requires: eclipse-jdt
-Requires(post): jpackage-utils
-Requires(postun): jpackage-utils
-
%description
Tycho is a set of Maven plugins and extensions for building Eclipse
@@ -135,6 +132,8 @@ mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE2} -Dmaven.test.skip=true install
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
+
+# pom and jar installation
for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
tycho-{artifactcomparator,core,embedder-api,metadata-model,testing-harness} \
sisu-equinox/sisu-equinox{-api,-launching,-embedder} \
@@ -146,54 +145,41 @@ for mod in target-platform-configuration tycho-compiler-{jdt,plugin} \
aid=`basename $mod`
install -pm 644 $mod/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
install -m 644 $mod/target/$aid-%{version}%{snap}.jar %{buildroot}%{_javadir}/%{name}/$aid.jar
- %add_to_maven_depmap org.eclipse.tycho $aid %{version} JPP/%{name} $aid
- %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+ %add_maven_depmap JPP.%{name}-$aid.pom %{name}/$aid.jar -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
-for pommod in tycho-p2 tycho-bundles{,/org.eclipse.tycho.p2.resolver.impl} \
- tycho-surefire tycho-release \
- sisu-equinox \
- ;do
+# pom installation
+for pommod in tycho-p2 tycho-bundles tycho-surefire \
+ tycho-release sisu-equinox; do
aid=`basename $pommod`
install -pm 644 $pommod/pom.xml \
$RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-$aid.pom
- %add_to_maven_depmap org.eclipse.tycho $aid %{version} JPP/%{name} $aid
- %add_to_maven_depmap org.sonatype.tycho $aid %{version} JPP/%{name} $aid
+ %add_maven_depmap JPP.%{name}-$aid.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
done
-# runtime
+# p2 runtime
pushd tycho-bundles/tycho-bundles-external
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
-install -m 644 target/tycho-bundles-external-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-bundles-external.zip
-%add_to_maven_depmap org.eclipse.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
-%add_to_maven_depmap org.sonatype.tycho tycho-bundles-external %{version} JPP/%{name} tycho-bundles-external
+install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-bundles-external.pom
+install -m 644 target/tycho-bundles-external-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-bundles-external.zip
+%add_maven_depmap JPP.%{name}-tycho-bundles-external.pom %{name}/tycho-bundles-external.zip -a "org.eclipse.tycho:tycho-bundles-external,org.sonatype.tycho:tycho-bundles-external"
popd
+# main
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-main.pom
-%add_to_maven_depmap org.eclipse.tycho %{name} %{version} JPP/%{name} main
-%add_to_maven_depmap org.sonatype.tycho %{name} %{version} JPP/%{name} main
+%add_maven_depmap JPP.%{name}-main.pom -a "org.eclipse.tycho:$aid,org.sonatype.tycho:$aid"
-# standalone p2
+# standalone p2 director
pushd .m2/org/eclipse/tycho/tycho-standalone-p2-director/%{version}*/
- install -m 644 tycho-standalone-p2-director-%{version}*.zip %{buildroot}%{_javadir}/%{name}/tycho-standalone-p2-director.zip
-
- sed -i -e "s/eclipse-repository/pom/" tycho-standalone-p2-director-%{version}*.pom
- install -pm 644 tycho-standalone-p2-director-%{version}*.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.tycho-%{name}-standalone-p2-director.pom
+install -m 644 tycho-standalone-p2-director-%{version}*.zip $RPM_BUILD_ROOT%{_javadir}/%{name}/tycho-standalone-p2-director.zip
+install -pm 644 tycho-standalone-p2-director-%{version}*.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{name}-tycho-standalone-p2-director.pom
popd
-
-%add_maven_depmap JPP.tycho-%{name}-standalone-p2-director.pom tycho/tycho-standalone-p2-director.zip -a "org.eclipse.tycho:tycho-standalone-p2-director,org.sonatype.tycho:tycho-standalone-p2-director"
+%add_maven_depmap JPP.%{name}-tycho-standalone-p2-director.pom tycho/tycho-standalone-p2-director.zip -a "org.eclipse.tycho:tycho-standalone-p2-director,org.sonatype.tycho:tycho-standalone-p2-director"
# javadoc
-install -dm 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
-
-%post
-%update_maven_depmap
+install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -pr target/site/api*/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-%postun
-%update_maven_depmap
+install -pm 755 %{SOURCE3} $RPM_BUILD_ROOT%{_javadir}/%{name}/copy-platform-all
%files
%{_mavenpomdir}/*
@@ -207,6 +193,7 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%changelog
* Mon Aug 13 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.1.df2c35
- Correctly reference objectweb-asm4 and fix local mode resolution bug.
+- Update spec file to honour new java packaging guidelines.
* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.df2c35
- Non-bootstrap build.
11 years, 10 months
[tycho] Reference objectweb-asm4 gid:aid and fix local mode resolution bug.
by Roland Grunberg
commit a687c60712d0499acbf9a10ab71d99b2d5e242a9
Author: Roland Grunberg <rgrunber(a)redhat.com>
Date: Fri Aug 10 13:22:13 2012 -0400
Reference objectweb-asm4 gid:aid and fix local mode resolution bug.
When in local mode, but not offline, Tycho should favour local system
dependencies over remote ones in all cases.
tycho-fix-build.patch | 30 +++-----------
tycho-use-custom-resolver.patch | 88 +++++++++++++++++++++++++++++++++-----
tycho.spec | 7 ++-
3 files changed, 87 insertions(+), 38 deletions(-)
---
diff --git a/tycho-fix-build.patch b/tycho-fix-build.patch
index ff6347c..51e0318 100644
--- a/tycho-fix-build.patch
+++ b/tycho-fix-build.patch
@@ -1,4 +1,4 @@
-From 2d1e009c256c26c8b1bf66dace56bb7a8436c236 Mon Sep 17 00:00:00 2001
+From 2ddba330f84d010cb462848c3686d084667091ec Mon Sep 17 00:00:00 2001
From: Roland Grunberg <rgrunber(a)redhat.com>
Date: Tue, 12 Jun 2012 09:56:38 -0400
Subject: [PATCH 1/4] Fix the Tycho build to work on Fedora.
@@ -12,13 +12,10 @@ when using those libraries.
Remove org.eclipse.equinox.concurrent until present in Fedora Eclipse.
-Fix API issues with org.objectweb.asm (Need 4.0 but only have 3.0).
-
Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
---
pom.xml | 5 -----
- tycho-artifactcomparator/pom.xml | 6 +++---
- .../tycho/zipcomparator/internal/ClassfileComparator.java | 2 +-
+ tycho-artifactcomparator/pom.xml | 4 ++--
.../tycho-bundles-external/tycho-bundles-external.product | 1 -
tycho-bundles/tycho-bundles-target/tycho.target | 4 ----
.../tycho-standalone-p2-director/p2 Director.product | 1 -
@@ -27,7 +24,7 @@ Change-Id: Ic8c0514c1fa10ee53580d2654ac6a363ccd66814
.../tycho/core/osgitools/StandalonePluginConverterTest.java | 8 ++++----
.../org/eclipse/tycho/test/AbstractTychoIntegrationTest.java | 11 +++++------
.../org/eclipse/tycho/testing/EmptyLifecycleExecutor.java | 8 ++++++++
- 11 files changed, 27 insertions(+), 35 deletions(-)
+ 10 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/pom.xml b/pom.xml
index dc7c1f5..1868f9a 100644
@@ -46,16 +43,14 @@ index dc7c1f5..1868f9a 100644
<artifactId>surefire-booter</artifactId>
<version>2.10</version>
diff --git a/tycho-artifactcomparator/pom.xml b/tycho-artifactcomparator/pom.xml
-index 775107a..a6ff6f7 100644
+index 775107a..11bcb70 100644
--- a/tycho-artifactcomparator/pom.xml
+++ b/tycho-artifactcomparator/pom.xml
-@@ -23,8 +23,8 @@
- <dependencies>
+@@ -24,7 +24,7 @@
<dependency>
<!-- CQ https://dev.eclipse.org/ipzilla/show_bug.cgi?id=6591 -->
-- <groupId>org.ow2.asm</groupId>
+ <groupId>org.ow2.asm</groupId>
- <artifactId>asm-debug-all</artifactId>
-+ <groupId>asm</groupId>
+ <artifactId>asm-all</artifactId>
<version>4.0</version>
</dependency>
@@ -67,19 +62,6 @@ index 775107a..a6ff6f7 100644
-</project>
\ No newline at end of file
+</project>
-diff --git a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
-index 6944b03..a3a9825 100644
---- a/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
-+++ b/tycho-artifactcomparator/src/main/java/org/eclipse/tycho/zipcomparator/internal/ClassfileComparator.java
-@@ -61,7 +61,7 @@ public class ClassfileComparator implements ContentsComparator {
- private String disassemble(byte[] bytes) {
- ClassReader reader = new ClassReader(bytes);
- ClassNode clazz = new ClassNode();
-- reader.accept(clazz, Opcodes.ASM4 | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-+ reader.accept(clazz, (4 << 16 | 0 << 8 | 0) | ClassReader.SKIP_DEBUG | ClassReader.SKIP_FRAMES);
-
- // inner class list gets reordered during pack200 normalization
- if (clazz.innerClasses != null) {
diff --git a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product b/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
index 3e584f5..8b54310 100644
--- a/tycho-bundles/tycho-bundles-external/tycho-bundles-external.product
diff --git a/tycho-use-custom-resolver.patch b/tycho-use-custom-resolver.patch
index afbaa57..587056d 100644
--- a/tycho-use-custom-resolver.patch
+++ b/tycho-use-custom-resolver.patch
@@ -1,4 +1,4 @@
-From 204897532cb0a533634dc66faef31afb1822df03 Mon Sep 17 00:00:00 2001
+From 595646a547fca48d8211b29f9951190ba737f42a 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.
@@ -21,15 +21,15 @@ tycho.local.keepTarget is set.
Change-Id: Ia1ece07ece2412bc4a88901631f3f651ad2b634b
---
- .../tycho/p2/target/TargetDefinitionResolver.java | 10 ++++--
- .../tycho/p2/target/TargetPlatformBuilderImpl.java | 6 ++++
- .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++++
- .../core/osgitools/EclipseFeatureProject.java | 22 ++++++++++++
- .../tycho/core/osgitools/OsgiBundleProject.java | 42 ++++++++++++++++++++--
- .../DefaultTargetPlatformConfigurationReader.java | 5 ++-
- .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 15 ++++++++
- .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++++
- 8 files changed, 120 insertions(+), 6 deletions(-)
+ .../tycho/p2/target/TargetDefinitionResolver.java | 10 ++--
+ .../tycho/p2/target/TargetPlatformBuilderImpl.java | 55 ++++++++++++++++++++--
+ .../core/maven/TychoMavenLifecycleParticipant.java | 16 +++++++
+ .../core/osgitools/EclipseFeatureProject.java | 22 +++++++++
+ .../tycho/core/osgitools/OsgiBundleProject.java | 42 ++++++++++++++++-
+ .../DefaultTargetPlatformConfigurationReader.java | 5 +-
+ .../tycho/osgi/runtime/TychoP2RuntimeLocator.java | 15 ++++++
+ .../p2/resolver/P2TargetPlatformResolver.java | 10 ++++
+ 8 files changed, 164 insertions(+), 11 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 5fdc6a1..838e267 100644
@@ -60,10 +60,20 @@ index 5fdc6a1..838e267 100644
IQueryable<IInstallableUnit> locationUnits = new CompoundQueryable<IInstallableUnit>(
diff --git a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
-index fa1cfab..23cdb5d 100644
+index fa1cfab..489903e 100644
--- a/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
+++ b/tycho-bundles/org.eclipse.tycho.p2.resolver.impl/src/main/java/org/eclipse/tycho/p2/target/TargetPlatformBuilderImpl.java
-@@ -223,6 +223,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+@@ -38,6 +38,9 @@ import org.eclipse.equinox.p2.core.IProvisioningAgent;
+ import org.eclipse.equinox.p2.core.ProvisionException;
+ import org.eclipse.equinox.p2.metadata.IInstallableUnit;
+ import org.eclipse.equinox.p2.metadata.VersionedId;
++import org.eclipse.equinox.p2.metadata.expression.ExpressionUtil;
++import org.eclipse.equinox.p2.metadata.expression.IExpression;
++import org.eclipse.equinox.p2.query.IQuery;
+ import org.eclipse.equinox.p2.query.IQueryResult;
+ import org.eclipse.equinox.p2.query.QueryUtil;
+ import org.eclipse.equinox.p2.repository.artifact.IArtifactRepository;
+@@ -223,6 +226,12 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
IMetadataRepository metadataRepository = null;
IArtifactRepository artifactRepository = null;
@@ -76,6 +86,60 @@ index fa1cfab..23cdb5d 100644
try {
remoteRepositoryIdManager.addMapping(location.getId(), location.getURL());
+@@ -359,12 +368,48 @@ public class TargetPlatformBuilderImpl implements TargetPlatformBuilder {
+ result.addAll(contentPart.getUnits());
+ }
+
+- SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
+- for (IMetadataRepository repository : metadataRepositories) {
+- IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
+- result.addAll(matches.toUnmodifiableSet());
++ if (System.getProperty("maven.local.mode") != null && !offline) {
++ final String uri = "file:" + System.getProperty("user.dir") + "/.m2/p2/repo";
++ final IExpression notmatchIU_ID = ExpressionUtil.parse("id != $0");
++ IMetadataRepository systemLocalP2Repo = null;
++
++ // Sanity check even though the repo we want should be at index 1
++ for (IMetadataRepository repository : metadataRepositories) {
++ if (repository.getLocation().toString().equals(uri)) {
++ systemLocalP2Repo = repository;
++ break;
++ }
++ }
++
++ IQuery<IInstallableUnit> noLocalIUs = QueryUtil.createIUAnyQuery();
++
++ // Create a conjunction query that negates all IUs on the local system
++ for (IInstallableUnit unit : systemLocalP2Repo.query(QueryUtil.ALL_UNITS, null).toUnmodifiableSet()) {
++ noLocalIUs = QueryUtil.createCompoundQuery(noLocalIUs, QueryUtil.createMatchQuery(notmatchIU_ID, unit.getId()), true);
++ }
++
++ SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
++ for (IMetadataRepository repository : metadataRepositories) {
++ IQueryResult<IInstallableUnit> matches;
++ if (repository.getLocation().toString().equals(uri)) {
++ matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ } else {
++ // Don't collect any remote IUs that can be found on the system
++ // This will favour IUs in the system local p2 repository
++ matches = repository.query(noLocalIUs, sub.newChild(100));
++ }
++ result.addAll(matches.toUnmodifiableSet());
++ }
++ sub.done();
++ } else {
++ SubMonitor sub = SubMonitor.convert(monitor, metadataRepositories.size() * 200);
++ for (IMetadataRepository repository : metadataRepositories) {
++ IQueryResult<IInstallableUnit> matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ matches = repository.query(QueryUtil.ALL_UNITS, sub.newChild(100));
++ result.addAll(matches.toUnmodifiableSet());
++ }
++ sub.done();
+ }
+- sub.done();
+
+ if (logger.isDebugEnabled()) {
+ IQueryResult<IInstallableUnit> locallyInstalledIUs = localMetadataRepository.query(QueryUtil.ALL_UNITS,
diff --git a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java b/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
index 0dd2fd4..15669a6 100644
--- a/tycho-core/src/main/java/org/eclipse/tycho/core/maven/TychoMavenLifecycleParticipant.java
diff --git a/tycho.spec b/tycho.spec
index 8b6d7da..9c3e1d5 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -1,4 +1,4 @@
-%global bootstrap 0
+%global bootstrap 1
%global sha df2c3591ae0e641a8d12c13ca9c1058eaf8439b2
%if %{bootstrap}
@@ -9,7 +9,7 @@
Name: tycho
Version: 0.16.0
-Release: 4.df2c35%{?dist}
+Release: 4.1.df2c35%{?dist}
Summary: Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
Group: Development/Libraries
@@ -205,6 +205,9 @@ install -pm 755 %{SOURCE3} %{buildroot}%{_javadir}/%{name}/copy-platform-all
%{_javadocdir}/%{name}
%changelog
+* Mon Aug 13 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.1.df2c35
+- Correctly reference objectweb-asm4 and fix local mode resolution bug.
+
* Thu Aug 9 2012 Roland Grunberg <rgrunber(a)redhat.com> 0.16.0-4.df2c35
- Non-bootstrap build.
11 years, 10 months
[activemq-protobuf] Initial import (#822929).
by gil
commit 9085d3cd4aa2ee17a3ab7b8d1b5f492bc9ac01fe
Author: gil <puntogil(a)libero.it>
Date: Wed Aug 15 20:25:38 2012 +0200
Initial import (#822929).
.gitignore | 1 +
activemq-protobuf-1.1-parent-pom.patch | 123 ++++++++++++++++++++++++++++++++
activemq-protobuf.spec | 93 ++++++++++++++++++++++++
sources | 1 +
4 files changed, 218 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b374a85 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/activemq-protobuf-1.1-src-svn.tar.gz
diff --git a/activemq-protobuf-1.1-parent-pom.patch b/activemq-protobuf-1.1-parent-pom.patch
new file mode 100644
index 0000000..15022a3
--- /dev/null
+++ b/activemq-protobuf-1.1-parent-pom.patch
@@ -0,0 +1,123 @@
+--- pom.xml 2010-08-03 14:16:57.000000000 +0200
++++ pom.xml-gil 2012-03-09 12:57:28.481823868 +0100
+@@ -90,12 +90,12 @@
+ <dependency>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf</artifactId>
+- <version>${version}</version>
++ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf-test</artifactId>
+- <version>${version}</version>
++ <version>${project.version}</version>
+ </dependency>
+
+
+@@ -127,20 +127,20 @@
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>1.0.0</version>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <version>1.0-alpha-1</version>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.0</version>
+ </plugin>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>rat-maven-plugin</artifactId>
+- <version>1.0-alpha-3</version>
++ <groupId>org.apache.rat</groupId>
++ <artifactId>apache-rat-plugin</artifactId>
++ <version>0.8-SNAPSHOT</version>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ </configuration>
+@@ -164,8 +164,8 @@
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+- <Bundle-Name>${artifactId}</Bundle-Name>
+- <Bundle-SymbolicName>${groupId}.${artifactId}</Bundle-SymbolicName>
++ <Bundle-Name>${project.artifactId}</Bundle-Name>
++ <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.activemq.protobuf.*</Export-Package>
+ <Implementation-Title>Apache ActiveMQ Protobuf</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+@@ -204,7 +204,7 @@
+ </execution>
+ </executions>
+ </plugin>
+- <plugin>
++ <!--plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>ianal-maven-plugin</artifactId>
+ <executions>
+@@ -217,7 +217,7 @@
+ </configuration>
+ </execution>
+ </executions>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+@@ -239,8 +239,8 @@
+ </configuration>
+ </plugin>
+ <plugin>
+- <groupId>org.codehaus.mojo</groupId>
+- <artifactId>rat-maven-plugin</artifactId>
++ <groupId>org.apache.rat</groupId>
++ <artifactId>apache-rat-plugin</artifactId>
+ </plugin>
+
+ </plugins>
+@@ -287,7 +287,7 @@
+ </activation>
+ <build>
+ <plugins>
+- <plugin>
++ <!--plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+@@ -307,16 +307,16 @@
+ </execution>
+ </executions>
+ <dependencies>
+- <dependency>
++ <dependency-->
+ <!-- apache version not yet released -->
+ <!--<groupId>org.apache</groupId>-->
+- <groupId>org.apache.geronimo.genesis</groupId>
+- <artifactId>apache-source-release-assembly-descriptor</artifactId>
++ <!--groupId>org.apache.geronimo.genesis</groupId>
++ <artifactId>apache-source-release-assembly-descriptor</artifactId-->
+ <!-- apache version not yet known -->
+- <version>2.0</version>
++ <!--version>2.0</version>
+ </dependency>
+ </dependencies>
+- </plugin>
++ </plugin-->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+@@ -327,7 +327,7 @@
+ <plugin>
+ <groupId>org.apache.activemq.protobuf</groupId>
+ <artifactId>activemq-protobuf</artifactId>
+- <version>${version}</version>
++ <version>${project.version}</version>
+ </plugin>
+ </plugins>
+ </build>
diff --git a/activemq-protobuf.spec b/activemq-protobuf.spec
new file mode 100644
index 0000000..6df0617
--- /dev/null
+++ b/activemq-protobuf.spec
@@ -0,0 +1,93 @@
+Name: activemq-protobuf
+Version: 1.1
+Release: 2%{?dist}
+Summary: ActiveMQ Protocol Buffers
+Group: Development/Libraries
+License: ASL 2.0
+Url: http://activemq.apache.org/
+# svn export http://svn.apache.org/repos/asf/activemq/activemq-protobuf/tags/activemq-...
+# tar czf activemq-protobuf-1.1-src-svn.tar.gz activemq-protobuf-1.1
+Source0: activemq-protobuf-1.1-src-svn.tar.gz
+# remove ianal-maven-plugin
+# remove assembly-plugin and its deps (org.apache.geronimo.genesis apache-source-release-assembly-descriptor)
+# fix rat-plugin groupId artifactId version
+Patch0: activemq-protobuf-1.1-parent-pom.patch
+
+BuildRequires: java-devel
+BuildRequires: jpackage-utils
+
+BuildRequires: junit4
+
+BuildRequires: maven
+BuildRequires: javacc-maven-plugin
+BuildRequires: maven-compiler-plugin
+BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-install-plugin
+BuildRequires: maven-jar-plugin
+BuildRequires: maven-javadoc-plugin
+BuildRequires: maven-plugin-plugin
+BuildRequires: maven-resources-plugin
+BuildRequires: maven-surefire-plugin
+BuildRequires: maven-surefire-provider-junit4
+
+Requires: maven
+
+Requires: java
+Requires: jpackage-utils
+BuildArch: noarch
+
+%description
+A Simpler Protocol Buffer Java API.
+Comes with a built in proto file
+compiler and Java source code generator.
+
+%package javadoc
+Group: Documentation
+Summary: Javadoc for %{name}
+Requires: jpackage-utils
+
+%description javadoc
+This package contains javadoc for %{name}.
+
+%prep
+%setup -q
+%patch0 -p0
+chmod 644 LICENSE
+
+%build
+
+mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+
+%install
+
+mkdir -p %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-pom.pom
+%add_maven_depmap JPP.%{name}-pom.pom
+
+mkdir -p %{buildroot}%{_javadir}/activemq
+for m in protobuf protobuf-test; do
+ install -m 644 activemq-${m}/target/activemq-${m}-%{version}.jar %{buildroot}%{_javadir}/activemq/${m}.jar
+ install -pm 644 activemq-${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.activemq-${m}.pom
+%add_maven_depmap JPP.activemq-${m}.pom activemq/${m}.jar
+done
+
+mkdir -p %{buildroot}%{_javadocdir}/%{name}
+cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+
+%files
+%dir %{_javadir}/activemq
+%{_javadir}/activemq/*.jar
+%{_mavenpomdir}/JPP.%{name}*.pom
+%{_mavendepmapfragdir}/%{name}
+%doc LICENSE NOTICE README.txt
+
+%files javadoc
+%{_javadocdir}/%{name}
+%doc LICENSE NOTICE
+
+%changelog
+* Wed Aug 15 2012 gil cattaneo <puntogil(a)libero.it> 1.1-2
+- Fix directory ownership
+
+* Fri May 18 2012 gil cattaneo <puntogil(a)libero.it> 1.1-1
+- initial rpm
\ No newline at end of file
diff --git a/sources b/sources
index e69de29..898245b 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+d567940cfdc640abd29b92e16986648d activemq-protobuf-1.1-src-svn.tar.gz
11 years, 10 months