From 3801abd862ad16d2cd0bfac807a405542eaea647 Mon Sep 17 00:00:00 2001 From: Jaromir Capik Date: Dec 21 2011 14:54:59 +0000 Subject: Update to 1.50.0 --- diff --git a/.gitignore b/.gitignore index 7286c66..188aec1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ bnd-0.0.203.jar bnd-0.0.363.jar /bndlib-1.43.0.pom /bndlib-1.43.0-sources.jar +/bndlib-1.50.0.jar +/bndlib-1.50.0.pom diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec index 90ceadf..801dda3 100644 --- a/aqute-bndlib.spec +++ b/aqute-bndlib.spec @@ -1,17 +1,14 @@ Name: aqute-bndlib -Version: 1.43.0 -Release: 2%{?dist} +Version: 1.50.0 +Release: 1%{?dist} Summary: BND Library License: ASL 2.0 Group: Development/Tools URL: http://www.aQute.biz/Code/Bnd -# It was VERY difficult to find a complete source-only package -# Many of the checked URLs contain just broken or incomplete sources -# Upstream GIT repository is missing branches and tags and contains incomplete sources too -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 +Source0: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.jar +Source1: http://repo1.maven.org/maven2/biz/aQute/bndlib/1.50.0/bndlib-1.50.0.pom BuildArch: noarch @@ -42,14 +39,25 @@ Summary: Javadoc for %{name} Group: Documentation %description javadoc -Javadoc for %{name}. +API documentation for %{name}. %prep %setup -q -c # fixing incomplete source directory structure -mkdir -p src/main/java -mv -f aQute src/main/java/ +mkdir -p src/main/java target/classes +mv -f OSGI-OPT/src/* src/main/java/ + +# removing bundled classess & junk +rm -rf OSGI-OPT +rm -rf META-INF +rm -rf src/main/java/aQute/bnd/test +find . -iname '*.class' -delete +find . -iname 'packageinfo' -delete + +# recycling all data files +mv -f aQute target/classes +mv -f org target/classes # for building with maven cp %{SOURCE1} pom.xml @@ -58,18 +66,6 @@ cp %{SOURCE1} pom.xml sed -i "s|\r||g" LICENSE %build -# clone source directory structure -find src/ -type d | while read dirname ; do - newdirname=`echo $dirname | sed "s:src/main/java:target/classes:g"` - mkdir -p $newdirname -done - -# copy everything except *.java sources -find src/ -type f | grep -v "\.java" | while read cpfrom ; do - cpto=`echo $cpfrom | sed "s:src/main/java:target/classes:g"` - cp $cpfrom $cpto -done - export LC_ALL=en_US.UTF-8 mvn-rpmbuild install javadoc:aggregate @@ -97,6 +93,9 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} %{_javadocdir}/%{name} %changelog +* Wed Dec 21 2011 Jaromir Capik - 1.50.0-1 +- Update to 1.50.0 + * Fri Dec 02 2011 Jaromir Capik - 1.43.0-2 - Missing non-class files added diff --git a/aqute-service.tar.gz b/aqute-service.tar.gz deleted file mode 100644 index cbd1920..0000000 Binary files a/aqute-service.tar.gz and /dev/null differ diff --git a/bnd-0.0.363.pom b/bnd-0.0.363.pom deleted file mode 100644 index ef1b897..0000000 --- a/bnd-0.0.363.pom +++ /dev/null @@ -1,22 +0,0 @@ - - 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 e536e4a..32ad43f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c15978fab6cc2202f82c05bb9c16bd2 bndlib-1.43.0.pom -f470c24a4f31b3653fe71d9f73eab711 bndlib-1.43.0-sources.jar +87e30bfe9c465f29321df847fca76246 bndlib-1.50.0.jar +a8e1122c363ac51806b310348fb1aec0 bndlib-1.50.0.pom