[aqute-bndlib] Missing non-class files added

[Jaromír Cápík]

commit e60f46df2820bf4d21b2e97b06e65b72f6edb2b5
Author: Jaromir Capik <jcapik at redhat.com>
Date:   Fri Dec 2 14:13:54 2011 +0100

    Missing non-class files added

 aqute-bndlib.spec |   24 +++++++++++++++++++++---
 1 files changed, 21 insertions(+), 3 deletions(-)
---
diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec
index af5094e..90ceadf 100644
--- a/aqute-bndlib.spec
+++ b/aqute-bndlib.spec
@@ -1,13 +1,15 @@
 
 Name:           aqute-bndlib
 Version:        1.43.0
-Release:        1%{?dist}
+Release:        2%{?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 URLs contain broken or incomplete sources)
+# 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
 
@@ -19,6 +21,7 @@ BuildRequires:  maven
 BuildRequires:  maven-surefire-provider-junit4
 
 Requires:       java
+Requires:       jpackage-utils
 
 %description
 The bnd tool helps you create and diagnose OSGi R4 bundles.
@@ -55,6 +58,18 @@ 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
 
@@ -82,7 +97,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/%{name}
 
 %changelog
-* Thu Sep 15 2011 Jaromir Capik <rel-eng at lists.fedoraproject.org> - 1.43.0-1
+* Fri Dec 02 2011 Jaromir Capik <jcapik at redhat.com> - 1.43.0-2
+- Missing non-class files added
+
+* Thu Sep 15 2011 Jaromir Capik <jcapik at redhat.com> - 1.43.0-1
 - Update to 1.43.0
 - Spec file changes according to the latest guidelines