From 7325886112d814ce4df656d0aa62ed2c271d59e6 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Oct 21 2011 18:39:36 +0000 Subject: Update to 1.43.0 --- diff --git a/.gitignore b/.gitignore index cb91b3c..7286c66 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ bnd-0.0.203.jar bnd-0.0.363.jar +/bndlib-1.43.0.pom +/bndlib-1.43.0-sources.jar diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec index ca26d11..af5094e 100644 --- a/aqute-bndlib.spec +++ b/aqute-bndlib.spec @@ -1,57 +1,24 @@ -# 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-bndlib -Version: 0.0.363 -Release: 4%{?dist} -Epoch: 0 +Version: 1.43.0 +Release: 1%{?dist} 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/%{version}/bnd-%{version}.jar -Source1: http://www.aqute.biz/repo/biz/aQute/bnd/%{version}/bnd-%{version}.pom -Source2: aqute-service.tar.gz + +# It was VERY difficult to find a complete source only package (many of the URLs contain broken or incomplete sources) +Source0: http://apache-felix-intellij-plugin.googlecode.com/svn-history/r8/trunk/lib/bndlib-%{version}-sources.jar +Source1: http://repo.typesafe.com/typesafe/releases/biz/aQute/bndlib/%{version}/bndlib-%{version}.pom BuildArch: noarch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -BuildRequires: jpackage-utils >= 0:1.7.2 -BuildRequires: java-devel >= 0:1.6.0 -BuildRequires: ant >= 0:1.6.5 -BuildRequires: eclipse-ecj -BuildRequires: eclipse-jdt +BuildRequires: jpackage-utils +BuildRequires: java-devel +BuildRequires: maven +BuildRequires: maven-surefire-provider-junit4 -Requires: java >= 0:1.5.0 -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 +Requires: java %description The bnd tool helps you create and diagnose OSGi R4 bundles. @@ -67,6 +34,7 @@ The tool is capable of acting as: - Use of macros %package javadoc +BuildRequires: jpackage-utils Summary: Javadoc for %{name} Group: Documentation @@ -75,101 +43,49 @@ 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 -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 -export OPT_JAR_LIST=: -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.junit.core_*.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 -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 +# fixing incomplete source directory structure +mkdir -p src/main/java +mv -f aQute src/main/java/ + +# for building with maven +cp %{SOURCE1} pom.xml +# CR+LF -> LF sed -i "s|\r||g" LICENSE -%install -rm -rf $RPM_BUILD_ROOT +%build +export LC_ALL=en_US.UTF-8 +mvn-rpmbuild install javadoc:aggregate +%install # 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) +install -Dpm 644 target/bndlib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom +install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/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} - -%clean -rm -rf $RPM_BUILD_ROOT - -%post -%update_maven_depmap +install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} +cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%postun -%update_maven_depmap +%add_maven_depmap JPP-%{name}.pom %{name}.jar %files -%defattr(-,root,root,-) %doc LICENSE -%{_javadir}/%{name}-%{version}.jar %{_javadir}/%{name}.jar -%{_datadir}/maven2/poms/JPP-aqute-bndlib.pom -%{_mavendepmapfragdir}/aqute-bndlib +%{_mavenpomdir}/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %files javadoc -%defattr(-,root,root,-) -%{_javadocdir}/%{name}-%{version} +%doc LICENSE %{_javadocdir}/%{name} %changelog +* Thu Sep 15 2011 Jaromir Capik - 1.43.0-1 +- Update to 1.43.0 +- Spec file changes according to the latest guidelines + * Mon Feb 07 2011 Fedora Release Engineering - 0:0.0.363-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 9434155..e536e4a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -1d36d0271381964304c08b00b5fd1b4a bnd-0.0.363.jar +4c15978fab6cc2202f82c05bb9c16bd2 bndlib-1.43.0.pom +f470c24a4f31b3653fe71d9f73eab711 bndlib-1.43.0-sources.jar