diff --git a/.aqute-bnd.metadata b/.aqute-bnd.metadata new file mode 100644 index 0000000..670be31 --- /dev/null +++ b/.aqute-bnd.metadata @@ -0,0 +1,2 @@ +444f5784d5eab94a3d86dcaf42191e1d42eb544c SOURCES/bnd-0.0.363.jar +5c4383f04742004abb57567860f6e9eace1660e8 SOURCES/aqute-service.tar.gz diff --git a/README.md b/README.md deleted file mode 100644 index 0e7897f..0000000 --- a/README.md +++ /dev/null @@ -1,5 +0,0 @@ -The master branch has no content - -Look at the c7 branch if you are working with CentOS-7, or the c4/c5/c6 branch for CentOS-4, 5 or 6 - -If you find this file in a distro specific branch, it means that no content has been checked in yet diff --git a/SOURCES/0001-Port-to-Ant-1.9.patch b/SOURCES/0001-Port-to-Ant-1.9.patch new file mode 100644 index 0000000..d4b95b7 --- /dev/null +++ b/SOURCES/0001-Port-to-Ant-1.9.patch @@ -0,0 +1,44 @@ +From aff3baf83b795f99494b2d5bead1a6ee0c654fc5 Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Thu, 19 Sep 2013 13:49:07 +0200 +Subject: [PATCH] Port to Ant 1.9 + +--- + OSGI-OPT/src/aQute/bnd/main/bnd.java | 2 +- + OSGI-OPT/src/aQute/lib/osgi/Analyzer.java | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/OSGI-OPT/src/aQute/bnd/main/bnd.java b/OSGI-OPT/src/aQute/bnd/main/bnd.java +index 71e4483..3ec33bc 100644 +--- a/OSGI-OPT/src/aQute/bnd/main/bnd.java ++++ b/OSGI-OPT/src/aQute/bnd/main/bnd.java +@@ -1020,7 +1020,7 @@ public class bnd extends Processor { + } + + public boolean doWrap(File properties, File bundle, File output, +- File classpath[], int options, Map additional) ++ File classpath[], int options, Map additional) + throws Exception { + if (!bundle.exists()) { + error("No such file: " + bundle.getAbsolutePath()); +diff --git a/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java b/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java +index 0a10d42..c6591fd 100644 +--- a/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java ++++ b/OSGI-OPT/src/aQute/lib/osgi/Analyzer.java +@@ -1216,10 +1216,10 @@ public class Analyzer extends Processor { + return sb.toString(); + } + +- public void putAll(Map additional, boolean force) { +- for (Iterator> i = additional.entrySet() ++ public void putAll(Map additional, boolean force) { ++ for (Iterator> i = additional.entrySet() + .iterator(); i.hasNext();) { +- Map.Entry entry = i.next(); ++ Map.Entry entry = i.next(); + if (force || getProperties().get(entry.getKey()) == null) + setProperty((String) entry.getKey(), (String) entry.getValue()); + } +-- +1.8.1.4 + diff --git a/SOURCES/bnd-0.0.363.pom b/SOURCES/bnd-0.0.363.pom new file mode 100644 index 0000000..ef1b897 --- /dev/null +++ b/SOURCES/bnd-0.0.363.pom @@ -0,0 +1,22 @@ + + 4.0.0 + biz.aQute + bnd + 0.0.363 + + A utility and plugin to wrap, build, or print bundles + + aQute Bundle Tool + http://www.aQute.biz/Code/Bnd + + aQute SARL + http://www.aQute.biz + + + + All files contained in this JAR are licensed under the Apache 2.0 license, unless noted differently in their source (see swing2swt). + http://www.opensource.org/licenses/apache2.0.php + repo + + + diff --git a/SPECS/aqute-bnd.spec b/SPECS/aqute-bnd.spec new file mode 100644 index 0000000..e802918 --- /dev/null +++ b/SPECS/aqute-bnd.spec @@ -0,0 +1,174 @@ +# 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: aqute-bnd +Version: 0.0.363 +Release: 10%{?dist} +Summary: BND Tool +License: ASL 2.0 +Group: Development/Tools +URL: http://www.aQute.biz/Code/Bnd + +# NOTE : sources for 0.0.363 are no longer available +# The following links would work for 0.0.370-0.0.401 version range, but +# we need to stay by 0.0.363 to minimize problems during the 1.43.0 introduction +Source0: http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/bnd-%{version}.jar +Source1: http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/bnd-%{version}.pom +Source2: aqute-service.tar.gz + +Patch0: 0001-Port-to-Ant-1.9.patch + +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: java-devel +BuildRequires: ant + +Requires: java + +%description +The bnd tool helps you create and diagnose OSGi R4 bundles. +The key functions are: +- Show the manifest and JAR contents of a bundle +- Wrap a JAR so that it becomes a bundle +- Create a Bundle from a specification and a class path +- Verify the validity of the manifest entries +The tool is capable of acting as: +- Command line tool +- File format +- Directives +- Use of macros + +%package javadoc +Requires: jpackage-utils +Summary: Javadoc for %{name} +Group: Documentation + +%description javadoc +Javadoc for %{name}. + +%prep +%setup -q -c +%patch0 -p1 + +mkdir -p target/site/apidocs/ +mkdir -p target/classes/ +mkdir -p src/main/ +mv OSGI-OPT/src src/main/java +pushd src/main/java +tar xfs %{SOURCE2} +popd +sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ComponentDef.java +sed -i "s|import aQute.lib.filter.*;||g" src/main/java/aQute/bnd/make/ServiceComponent.java + +# get rid of eclipse plugins which are not usable anyway and complicate +# things +rm -rf src/main/java/aQute/bnd/annotation/Test.java \ + src/main/java/aQute/bnd/{classpath,jareditor,junit,launch,plugin} \ + aQute/bnd/classpath/messages.properties + +# remove bundled stuff +for f in $(find aQute/ -type f -name "*.class"); do + rm -f $f +done + +# Convert CR+LF to LF +sed -i "s|\r||g" LICENSE + +%build +export LANG=en_US.utf8 +export OPT_JAR_LIST=: +export CLASSPATH=$(build-classpath ant) + +%{javac} -d target/classes -target 1.5 -source 1.5 $(find src/main/java -type f -name "*.java") +%{javadoc} -d target/site/apidocs -sourcepath src/main/java aQute.lib.header aQute.lib.osgi aQute.lib.qtokens aQute.lib.filter +cp -p LICENSE maven-dependencies.txt plugin.xml pom.xml target/classes +for f in $(find aQute/ -type f -not -name "*.class"); do + cp -p $f target/classes/$f +done +pushd target/classes +%{jar} cmf ../../META-INF/MANIFEST.MF ../%{name}-%{version}.jar * +popd + +%install +# jars +install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar + +# pom +install -Dm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom + +# javadoc +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name} + +%add_maven_depmap JPP-%{name}.pom %{name}.jar + +%files +%doc LICENSE +%{_javadir}/%{name}.jar +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} + +%files javadoc +%doc LICENSE +%{_javadocdir}/%{name} + +%changelog +* Thu Sep 19 2013 Mikolaj Izdebski - 0.0.363-10 +- Add patch for compatibility with Ant 1.9 + +* Fri Jun 28 2013 Mikolaj Izdebski - 0.0.363-9 +- Rebuild to regenerate API documentation +- Resolves: CVE-2013-1571 + +* Wed Feb 13 2013 Fedora Release Engineering - 0.0.363-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.0.363-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 25 2012 Stanislav Ochotnicky - 0.0.363-6 +- Get rid of unusable eclipse plugins to simplify dependencies + +* Fri Mar 02 2012 Jaromir Capik - 0.0.363-5 +- Fixing build failures on f16 and later + +* Thu Jan 12 2012 Fedora Release Engineering - 0.0.363-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-3 +- Resurrection of bundled non-class files + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-2 +- Bundled classes removed +- jpackage-utils dependency added to the javadoc subpackage + +* Wed Sep 21 2011 Jaromir Capik - 0.0.363-1 +- Initial version (cloned from aqute-bndlib 0.0.363)