From 4c01555dd0d474c70c1931474da389cd47ba40c8 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Aug 13 2013 10:04:33 +0000
Subject: fix rhbz#991986


Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/aqute-bndlib.spec b/aqute-bndlib.spec
index c845542..818eb8e 100644
--- a/aqute-bndlib.spec
+++ b/aqute-bndlib.spec
@@ -1,25 +1,18 @@
-
 Name:           aqute-bndlib
 Version:        1.50.0
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        BND Library
 License:        ASL 2.0
-Group:          Development/Tools
 URL:            http://www.aQute.biz/Code/Bnd
-
 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
 
-BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
 BuildRequires:  maven-local
 BuildRequires:  maven-surefire-provider-junit4
 
-Requires:       java
-Requires:       jpackage-utils
-
 %description
 The bnd tool helps you create and diagnose OSGi R4 bundles.
 The key functions are:
@@ -34,9 +27,7 @@ The tool is capable of acting as:
 - Use of macros
 
 %package javadoc
-BuildRequires:  jpackage-utils
 Summary:        Javadoc for %{name}
-Group:          Documentation
 
 %description javadoc
 API documentation for %{name}.
@@ -67,32 +58,24 @@ sed -i "s|\r||g" LICENSE
 
 %build
 export LC_ALL=en_US.UTF-8
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file :bndlib %{name}
+%mvn_build
 
 %install
-# jars
-install -Dpm 644 target/bndlib-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# pom
-install -Dpm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-%files
+%files -f .mfiles
 %doc LICENSE
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Aug 13 2013 gil cattaneo <puntogil@libero.it> 1.50.0-7
+- fix rhbz#991986
+- removed some rpmlint problems
+- minor changes to adapt to current guideline
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.50.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -147,7 +130,7 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 - rebuild with new maven2 2.0.8 built in bootstrap mode
 - merge from JPP-6
 
-* Tue Jan 15 2009 David Walluck <dwalluck@redhat.com> 0:0.0.203-3
+* Thu Jan 15 2009 David Walluck <dwalluck@redhat.com> 0:0.0.203-3
 - fix build
 
 * Thu Jan 15 2009 Yong Yang <yyang@redhat.com> 0.0.203-3jpp.1