rpms/aqute-bndlib/devel aQute-bndlib-Filter.patch, 1.1, 1.2 aqute-bndlib.spec, 1.1, 1.2 bnd-0.0.203.pom, 1.1, 1.2 import.log, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Andrew Overholt overholt at fedoraproject.org
Mon Aug 17 20:00:26 UTC 2009


Author: overholt

Update of /cvs/pkgs/rpms/aqute-bndlib/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31656/devel

Modified Files:
	.cvsignore sources 
Added Files:
	aQute-bndlib-Filter.patch aqute-bndlib.spec bnd-0.0.203.pom 
	import.log 
Log Message:
Initial import (#500245).

aQute-bndlib-Filter.patch:
 Filter.java |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

Index: aQute-bndlib-Filter.patch
===================================================================
RCS file: aQute-bndlib-Filter.patch
diff -N aQute-bndlib-Filter.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aQute-bndlib-Filter.patch	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,38 @@
+--- 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();


Index: aqute-bndlib.spec
===================================================================
RCS file: aqute-bndlib.spec
diff -N aqute-bndlib.spec
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ aqute-bndlib.spec	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,208 @@
+# 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.
+#
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
+%define section   free
+
+Name:           aqute-bndlib
+Version:        0.0.203
+Release:        4%{?dist}
+Epoch:          0
+Summary:        BND Library
+License:        ASL 2.0
+Group:          Development/Java
+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
+
+
+%if %{gcj_support}
+BuildRequires:    java-gcj-compat-devel
+Requires(post):   java-gcj-compat
+Requires(postun): java-gcj-compat
+%endif
+
+
+%if ! %{gcj_support}
+BuildArch:      noarch
+%endif
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires:  jpackage-utils >= 0:1.7.2
+BuildRequires:  java-devel >= 0:1.5.0
+BuildRequires:  ant >= 0:1.6.5
+#BuildRequires:  ecj
+BuildRequires:  eclipse-ecj
+BuildRequires:  eclipse-platform
+BuildRequires:  eclipse-rcp
+BuildRequires:  eclipse-jdt
+
+Requires:  java >= 0:1.5.0
+Requires(post):    jpackage-utils >= 0:1.7.2
+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 
+
+%package javadoc
+Summary:        Javadoc for %{name}
+Group:          Development/Documentation
+
+%description javadoc
+Javadoc for %{name}.
+
+
+%prep
+%setup -q -c
+mkdir -p target/site/apidocs/
+mkdir -p target/classes/
+mkdir -p src/main/
+mv OSGI-OPT/src src/main/java
+%patch0 -b .sav0
+
+%build
+export LANG=en_US.utf8
+export OPT_JAR_LIST=:
+export CLASSPATH=$(build-classpath ant)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.osgi.services_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.jface_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.jobs_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.runtime_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.core.resources_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.ui.workbench_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/dropins/jdt/plugins/org.eclipse.jdt.core_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.common_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.equinox.registry_*.jar)
+CLASSPATH=${CLASSPATH}:$(ls %{_libdir}/eclipse/plugins/org.eclipse.swt.*.jar)
+
+%{javac} -d target/classes $(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
+rm -rf $RPM_BUILD_ROOT
+
+# jars
+install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+install -pm 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+%add_to_maven_depmap biz.aQute bndlib %{version} JPP %{name}
+(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+
+# pom
+install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms
+install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom
+
+# javadoc
+install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%update_maven_depmap
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%files
+%defattr(0644,root,root,0755)
+%{_javadir}/%{name}-%{version}.jar
+%{_javadir}/%{name}.jar
+%{_datadir}/maven2/poms/JPP-aqute-bndlib.pom
+%{_mavendepmapfragdir}/aqute-bndlib
+%if %{gcj_support}
+%dir %{_libdir}/gcj/%{name}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db
+%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so
+%endif
+
+%files javadoc
+%defattr(0644,root,root,0755)
+%{_javadocdir}/%{name}-%{version}
+%{_javadocdir}/%{name}
+
+%changelog
+* Fri Mar 20 2009 Yong Yang <yyang at redhat.com> 0.0.203-4
+- rebuild with new maven2 2.0.8 built in bootstrap mode
+- merge from JPP-6
+
+* Tue Jan 15 2009 David Walluck <dwalluck at redhat.com> 0:0.0.203-3
+- fix build
+
+* Thu Jan 15 2009 Yong Yang <yyang at redhat.com> 0.0.203-3jpp.1
+- Imported from dbhole's maven 2.0.8 packages, initial building
+
+* Tue Mar 11 2008 Deepak Bhole <dbhole at redhat.com> 0.0.203-2jpp.1
+- Import from JPackage + change per Fedora requirements
+
+* Thu Feb 14 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.0.203-2jpp
+- Add several non class files to jar
+
+* Mon Jan 07 2008 Ralph Apel <r.apel at r-apel.de> - 0:0.0.203-1jpp
+- First release
+


Index: bnd-0.0.203.pom
===================================================================
RCS file: bnd-0.0.203.pom
diff -N bnd-0.0.203.pom
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ bnd-0.0.203.pom	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1,22 @@
+<project xmlns='http://maven.apache.org/POM/4.0.0' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>biz.aQute</groupId>
+  <artifactId>bnd</artifactId>
+  <version>0.0.203</version>
+  <description>
+    A utility and plugin to wrap, build, or print bundles
+  </description>
+  <name>aQute Bundle Tool</name>
+  <url>http://www.aQute.biz/Code/Bnd</url>
+  <organization>
+    <name>aQute SARL</name>
+    <url>http://www.aQute.biz</url>
+  </organization>
+  <licenses>
+    <license>
+    <name>This material is licensed under the Apache Software License, Version 2.0</name>
+    <url>http://www.apache.org/licenses/LICENSE-2.0</url>
+    <distribution>repo</distribution>
+    </license>
+  </licenses>
+</project>


--- NEW FILE import.log ---
aqute-bndlib-0_0_203-4_jpp6:HEAD:aqute-bndlib-0.0.203-4.jpp6.src.rpm:1250539159


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- .cvsignore	18 May 2009 04:22:03 -0000	1.1
+++ .cvsignore	17 Aug 2009 20:00:25 -0000	1.2
@@ -0,0 +1 @@
+bnd-0.0.203.jar


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/aqute-bndlib/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- sources	18 May 2009 04:22:03 -0000	1.1
+++ sources	17 Aug 2009 20:00:26 -0000	1.2
@@ -0,0 +1 @@
+517cc8edead3dbd520c6a8e3f82f7321  bnd-0.0.203.jar




More information about the scm-commits mailing list