[javapackages-tools] Add Requires on objectweb-pom
by Mikolaj Izdebski
commit 0d77f3a18b3a9af091c6c682c04fb95fd025f6f6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Dec 4 08:16:10 2013 +0100
Add Requires on objectweb-pom
javapackages-tools.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 4f20d1a..424b3e3 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -1,6 +1,6 @@
Name: javapackages-tools
Version: 3.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Macros and scripts for Java packaging support
@@ -49,6 +49,7 @@ Requires: jvnet-parent
Requires: maven-parent
Requires: maven-plugins-pom
Requires: mojo-parent
+Requires: objectweb-pom
Requires: plexus-components-pom
Requires: plexus-pom
Requires: plexus-tools-pom
@@ -134,6 +135,9 @@ popd
%changelog
+* Wed Dec 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.4.1-3
+- Add Requires on objectweb-pom
+
* Tue Nov 19 2013 Stanislav Ochotnicky <sochotnicky(a)redhat.com> - 3.4.1-2
- Do not create parent dirs for pom.properties
- Resolves: rhbz#1031769
10 years, 5 months
[objectweb-asm] Update to 5.0 beta
by Mikolaj Izdebski
commit 8dd7044d4b990fcf1d9c95fcd4b69ffff526f1a8
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Mon Nov 11 17:31:56 2013 +0100
Update to 5.0 beta
.gitignore | 2 +
asm-MANIFEST.MF | 14 ---
objectweb-asm-no-classpath-in-manifest.patch | 10 --
objectweb-asm.spec | 136 ++++++++------------------
sources | 3 +-
5 files changed, 46 insertions(+), 119 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1c0ce92..aaa8cf8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
asm-*.tar.gz
+/asm-5.0_BETA.tar.gz
+/LICENSE-2.0.txt
diff --git a/objectweb-asm.spec b/objectweb-asm.spec
index 8b7e4be..35c4f19 100644
--- a/objectweb-asm.spec
+++ b/objectweb-asm.spec
@@ -1,121 +1,69 @@
-# 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: objectweb-asm
-Version: 3.3.1
-Release: 8%{?dist}
-Epoch: 0
-Summary: A code manipulation tool to implement adaptable systems
+Version: 5.0
+Release: 0.1.beta%{?dist}
+Summary: Java bytecode manipulation and analysis framework
License: BSD
-URL: http://asm.objectweb.org/
-Group: Development/Libraries/Java
-Source0: http://download.forge.objectweb.org/asm/asm-3.3.1.tar.gz
-Source1: asm-MANIFEST.MF
-Patch0: objectweb-asm-no-classpath-in-manifest.patch
-# Needed by asm-xml.jar
-Requires: xml-commons-jaxp-1.3-apis
-Requires(post): jpackage-utils >= 0:1.7.4
-Requires(postun): jpackage-utils >= 0:1.7.4
-BuildRequires: jpackage-utils >= 0:1.7.4
-BuildRequires: java-devel >= 0:1.5.0
-BuildRequires: ant >= 0:1.6.5
-BuildRequires: objectweb-anttask
-BuildRequires: xml-commons-jaxp-1.3-apis
-BuildRequires: zip
+URL: http://asm.ow2.org/
BuildArch: noarch
+Source0: http://download.forge.ow2.org/asm/asm-%{version}_BETA.tar.gz
+Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
+
+BuildRequires: ant
+BuildRequires: aqute-bnd
+BuildRequires: maven-local
+
+Obsoletes: %{name}4 < 5
+Provides: %{name}4 = %{version}-%{release}
+
%description
-ASM is a code manipulation tool to implement adaptable systems.
+ASM is an all purpose Java bytecode manipulation and analysis
+framework. It can be used to modify existing classes or dynamically
+generate classes, directly in binary form. Provided common
+transformations and analysis algorithms allow to easily assemble
+custom complex transformations and code analysis tools.
%package javadoc
-Summary: Javadoc for %{name}
-Group: Documentation
+Summary: API documentation for %{name}
%description javadoc
-Javadoc for %{name}.
+This package provides %{summary}.
%prep
-%setup -q -n asm-%{version}
-%patch0 -p1
-perl -pi -e 's/\r$//g' LICENSE.txt README.txt
+%setup -q -n asm-%{version}_BETA
+find -name *.jar -delete
+%mvn_alias :asm-all org.eclipse.jetty.orbit:org.objectweb.asm
-mkdir META-INF
-cp -p %{SOURCE1} META-INF/MANIFEST.MF
+sed -i /Class-Path/d archive/*.bnd
+sed -i "s/Import-Package:/&org.objectweb.asm,org.objectweb.asm.util,/" archive/asm-xml.bnd
+sed -i "s|\${config}/biz.aQute.bnd.jar|`build-classpath aqute-bnd`|" archive/*.xml
+sed -i -e '/kind="lib"/d' -e 's|output/eclipse|output/build|' .classpath
%build
-ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
+%ant -Dobjectweb.ant.tasks.path= jar jdoc
%install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-
-for jar in output/dist/lib/*.jar; do
-install -m 644 ${jar} \
-$RPM_BUILD_ROOT%{_javadir}/%{name}/`basename ${jar/-%{version}/}`
+%mvn_artifact output/dist/lib/asm-parent-%{version}_BETA.pom
+for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all; do
+ %mvn_artifact output/dist/lib/${m}-%{version}_BETA.pom \
+ output/dist/lib/${m}-%{version}_BETA.jar
done
+%mvn_install -J output/dist/doc/javadoc/user
-touch META-INF/MANIFEST.MF
-zip -u output/dist/lib/all/asm-all-%{version}.jar META-INF/MANIFEST.MF
-
-install -m 644 output/dist/lib/all/asm-all-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}/asm-all.jar
-install -m 644 output/dist/lib/all/asm-all-%{version}.pom $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-asm-all.pom
+%jpackage_script org.objectweb.asm.xml.Processor "" "" %{name}/asm:%{name}/asm-attrs:%{name}/asm-util:%{name}/asm-xml %{name}-processor true
-# pom
-for pom in output/dist/lib/*.pom; do
-install -m 644 ${pom} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.objectweb-asm-`basename ${pom/-%{version}/}`
-done
-%add_maven_depmap JPP.objectweb-asm-asm.pom %{name}/asm.jar
-%add_maven_depmap JPP.objectweb-asm-asm-analysis.pom %{name}/asm-analysis.jar
-%add_maven_depmap JPP.objectweb-asm-asm-commons.pom %{name}/asm-commons.jar
-%add_maven_depmap JPP.objectweb-asm-asm-tree.pom %{name}/asm-tree.jar
-%add_maven_depmap JPP.objectweb-asm-asm-util.pom %{name}/asm-util.jar
-%add_maven_depmap JPP.objectweb-asm-asm-xml.pom %{name}/asm-xml.jar
-%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar -a "org.eclipse.jetty.orbit:org.objectweb.asm"
-%add_maven_depmap JPP.objectweb-asm-asm-parent.pom
-
-# javadoc
-install -p -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr output/dist/doc/javadoc/user/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
%doc LICENSE.txt README.txt
+%{_bindir}/%{name}-processor
%dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt
%changelog
+* Tue Dec 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 5.0-0.1.beta
+- Update to 5.0 beta
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:3.3.1-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index 4af6a91..af4bed9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-433024df8176f09922646316e415631c asm-3.3.1.tar.gz
+3025693f410c6e66d5422d4d9c855637 asm-5.0_BETA.tar.gz
+3b83ef96387f14655fc854ddc3c6bd57 LICENSE-2.0.txt
10 years, 5 months
[maven-shade-plugin] Update to upstream version 2.2
by Mikolaj Izdebski
commit e20d93c09cf933ade90db62da47fccca79d4b6b6
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Wed Dec 4 07:53:49 2013 +0100
Update to upstream version 2.2
.gitignore | 1 +
maven-shade-plugin.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bb79458..7e2fcce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ maven-shade-plugin-1.6-source-release.zip
maven-shade-plugin-1.7.1-source-release.zip
/maven-shade-plugin-2.0-source-release.zip
/maven-shade-plugin-2.1-source-release.zip
+/maven-shade-plugin-2.2-source-release.zip
diff --git a/maven-shade-plugin.spec b/maven-shade-plugin.spec
index f5eadd8..92feeed 100644
--- a/maven-shade-plugin.spec
+++ b/maven-shade-plugin.spec
@@ -1,5 +1,5 @@
Name: maven-shade-plugin
-Version: 2.1
+Version: 2.2
Release: 1%{?dist}
Summary: This plugin provides the capability to package the artifact in an uber-jar
License: ASL 2.0
@@ -60,6 +60,9 @@ ln -s $(build-classpath plexus/utils) src/test/jars/plexus-utils-1.4.1.jar
%doc LICENSE NOTICE
%changelog
+* Wed Dec 4 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.2-1
+- Update to upstream version 2.2
+
* Tue May 21 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 2.1-1
- Update to upstream version 2.1
diff --git a/sources b/sources
index 45b57dc..0765194 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6034febc937967b20b0a2df995fad545 maven-shade-plugin-2.1-source-release.zip
+7bbf9a7f15c2868750312368abba9ef3 maven-shade-plugin-2.2-source-release.zip
10 years, 5 months
[objectweb-asm3] Install asm-parent POM
by Mikolaj Izdebski
commit 356d38b008019c19a85665ea24da76233c3992d1
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Dec 3 15:31:46 2013 +0100
Install asm-parent POM
objectweb-asm3.spec | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/objectweb-asm3.spec b/objectweb-asm3.spec
index 0e075b1..3b2a9a4 100644
--- a/objectweb-asm3.spec
+++ b/objectweb-asm3.spec
@@ -1,6 +1,6 @@
Name: objectweb-asm3
Version: 3.3.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Java bytecode manipulation and analysis framework
License: BSD
URL: http://asm.ow2.org/
@@ -36,6 +36,7 @@ sed -i /Class-path/d archive/asm-xml.xml
%ant -Dobjectweb.ant.tasks.path= jar jdoc
%install
+%mvn_artifact output/dist/lib/asm-parent-%{version}.pom
for m in asm asm-analysis asm-commons asm-tree asm-util asm-xml all/asm-all; do
%mvn_artifact output/dist/lib/${m}-%{version}.pom \
output/dist/lib/${m}-%{version}.jar
@@ -53,6 +54,9 @@ done
%doc LICENSE.txt
%changelog
+* Tue Dec 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.3.1-3
+- Install asm-parent POM
+
* Thu Nov 14 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 3.3.1-2
- Remove classpath from manifest
- Install %{name}-processor command
10 years, 5 months
[plexus-archiver] Update to upstream version 2.4.4
by Mikolaj Izdebski
commit 64334a77bb5927c44ef68df6a1ddbc5e2c26c9fb
Author: Mikolaj Izdebski <mizdebsk(a)redhat.com>
Date: Tue Dec 3 12:39:10 2013 +0100
Update to upstream version 2.4.4
.gitignore | 1 +
plexus-archiver.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index df272ae..5667b63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ sonatype-plexus-archiver-plexus-archiver-2.1.1-0-ge64d181.tar.gz
/LICENSE-2.0.txt
/plexus-archiver-2.3.tar.gz
/plexus-archiver-2.4.2.tar.gz
+/plexus-archiver-2.4.4.tar.gz
diff --git a/plexus-archiver.spec b/plexus-archiver.spec
index e63562c..c338f52 100644
--- a/plexus-archiver.spec
+++ b/plexus-archiver.spec
@@ -29,8 +29,8 @@
#
Name: plexus-archiver
-Version: 2.4.2
-Release: 3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
Epoch: 0
Summary: Plexus Archiver Component
License: ASL 2.0
@@ -80,6 +80,9 @@ Javadoc for %{name}.
%doc LICENSE
%changelog
+* Tue Dec 3 2013 Mikolaj Izdebski <mizdebsk(a)redhat.com> - 0:2.4.4-1
+- Update to upstream version 2.4.4
+
* Sun Aug 04 2013 Fedora Release Engineering <rel-eng(a)lists.fedoraproject.org> - 0:2.4.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index ab15ad3..d573eed 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d63cda26fdf851d347cd583ba02aa995 plexus-archiver-2.4.2.tar.gz
+98ec07fe86660ec9c0f116f248a1a02c plexus-archiver-2.4.4.tar.gz
10 years, 5 months
