From c6d7ad4c7af53f7533863a37af07df2b40f68603 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sep 03 2009 20:51:36 +0000 Subject: Update to 0.0.363 --- diff --git a/.cvsignore b/.cvsignore index 67ae562..cb91b3c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ bnd-0.0.203.jar +bnd-0.0.363.jar diff --git a/aQute-bndlib-Filter.patch b/aQute-bndlib-Filter.patch deleted file mode 100644 index b59032a..0000000 --- a/aQute-bndlib-Filter.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- src/main/java/aQute/lib/filter/Filter.java.sav0 2007-07-31 16:39:46.000000000 +0200 -+++ src/main/java/aQute/lib/filter/Filter.java 2007-12-21 17:50:24.000000000 +0100 -@@ -190,17 +190,17 @@ - } else if (numClass == Character.class) { - return compareString(obj.toString(), op, s); - } else if (numClass == Long.class) { -- return compareSign(op, Long.valueOf(s).compareTo(obj)); -+ return compareSign(op, Long.valueOf(s).compareTo((Long)obj)); - } else if (numClass == Integer.class) { -- return compareSign(op, Integer.valueOf(s).compareTo(obj)); -+ return compareSign(op, Integer.valueOf(s).compareTo((Integer)obj)); - } else if (numClass == Short.class) { -- return compareSign(op, Short.valueOf(s).compareTo(obj)); -+ return compareSign(op, Short.valueOf(s).compareTo((Short)obj)); - } else if (numClass == Byte.class) { -- return compareSign(op, Byte.valueOf(s).compareTo(obj)); -+ return compareSign(op, Byte.valueOf(s).compareTo((Byte)obj)); - } else if (numClass == Double.class) { -- return compareSign(op, Double.valueOf(s).compareTo(obj)); -+ return compareSign(op, Double.valueOf(s).compareTo((Double)obj)); - } else if (numClass == Float.class) { -- return compareSign(op, Float.valueOf(s).compareTo(obj)); -+ return compareSign(op, Float.valueOf(s).compareTo((Float)obj)); - } else if (numClass == Boolean.class) { - if (op != EQ) - return false; -@@ -208,9 +208,9 @@ - int b = ((Boolean) obj).booleanValue() ? 1 : 0; - return compareSign(op, a - b); - } else if (numClass == BigInteger.class) { -- return compareSign(op, new BigInteger(s).compareTo(obj)); -+ return compareSign(op, new BigInteger(s).compareTo((BigInteger)obj)); - } else if (numClass == BigDecimal.class) { -- return compareSign(op, new BigDecimal(s).compareTo(obj)); -+ return compareSign(op, new BigDecimal(s).compareTo((BigDecimal)obj)); - } else if (obj instanceof Vector) { - for (Enumeration e = ((Vector) obj).elements(); - e.hasMoreElements(); diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec index 7ae388d..50c0fec 100644 --- a/aqute-bndlib.spec +++ b/aqute-bndlib.spec @@ -29,17 +29,16 @@ # Name: aqute-bndlib -Version: 0.0.203 -Release: 4.3%{?dist} +Version: 0.0.363 +Release: 1%{?dist} Epoch: 0 Summary: BND Library License: ASL 2.0 Group: Development/Tools URL: http://www.aQute.biz/Code/Bnd -Source0: http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.jar -Source1: http://www.aqute.biz/repo/biz/aQute/bnd/0.0.203/bnd-0.0.203.pom -Patch0: aQute-bndlib-Filter.patch - +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 BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -56,16 +55,16 @@ Requires(postun): jpackage-utils >= 0:1.7.2 %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 +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 Summary: Javadoc for %{name} @@ -80,7 +79,11 @@ mkdir -p target/site/apidocs/ mkdir -p target/classes/ mkdir -p src/main/ mv OSGI-OPT/src src/main/java -%patch0 -b .sav0 +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 %build export LANG=en_US.utf8 @@ -89,17 +92,31 @@ export CLASSPATH=$(build-classpath ant) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.osgi.services_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.databinding_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.jface.text_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.ide_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.commands_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.jobs_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.runtime_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.core.resources_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.core_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.debug.ui_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.text_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.console_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.editors_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.ui.workbench.texteditor_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.debug.ui_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.launching_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.junit_*.jar) +CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/dropins/jdt/plugins/org.eclipse.jdt.ui_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.common_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.equinox.registry_*.jar) CLASSPATH=${CLASSPATH}:$(ls /usr/lib*/eclipse/plugins/org.eclipse.swt.*.jar) -%{javac} -d target/classes $(find src/main/java -type f -name "*.java") +%{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 @@ -152,6 +169,9 @@ rm -rf $RPM_BUILD_ROOT %{_javadocdir}/%{name} %changelog +* Thu Sep 3 2009 Alexander Kurtakov 0:0.0.363-1 +- Update to 0.0.363. + * Wed Aug 19 2009 Andrew Overholt 0:0.0.203-4.3 - Add LICENSE - Clean up Group tag @@ -182,4 +202,3 @@ rm -rf $RPM_BUILD_ROOT * Mon Jan 07 2008 Ralph Apel - 0:0.0.203-1jpp - First release - diff --git a/aqute-service.tar.gz b/aqute-service.tar.gz new file mode 100644 index 0000000..cbd1920 Binary files /dev/null and b/aqute-service.tar.gz differ diff --git a/bnd-0.0.203.pom b/bnd-0.0.203.pom deleted file mode 100644 index 1b0127b..0000000 --- a/bnd-0.0.203.pom +++ /dev/null @@ -1,22 +0,0 @@ - - 4.0.0 - biz.aQute - bnd - 0.0.203 - - 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 - - - - This material is licensed under the Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0 - repo - - - diff --git a/bnd-0.0.363.pom b/bnd-0.0.363.pom new file mode 100644 index 0000000..ef1b897 --- /dev/null +++ b/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/sources b/sources index 7d7376a..9434155 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -517cc8edead3dbd520c6a8e3f82f7321 bnd-0.0.203.jar +1d36d0271381964304c08b00b5fd1b4a bnd-0.0.363.jar