[bindex] Fix BuildRequire on aqute-bndlib (renamed to aqute-bnd)

Omair Majid omajid at fedoraproject.org
Tue Oct 11 17:53:40 UTC 2011


commit 4e901762566f5d80fd871087b72011f0bec9f8de
Author: Omair Majid <omajid at redhat.com>
Date:   Tue Oct 11 13:52:21 2011 -0400

    Fix BuildRequire on aqute-bndlib (renamed to aqute-bnd)

 bindex.spec |   16 +++++++---------
 1 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/bindex.spec b/bindex.spec
index 0121d03..aec0041 100644
--- a/bindex.spec
+++ b/bindex.spec
@@ -6,7 +6,7 @@
 
 Name:    bindex
 Version: 2.2
-Release: 3.svn96%{?dist}
+Release: 4.svn96%{?dist}
 Summary: Bundle Manifest Header Mapper
 
 Group:   Development/Libraries
@@ -21,11 +21,10 @@ URL:     http://www.osgi.org/Repository/BIndex
 #  tar -czvf bindex.r${svnRev}.svn.tar.gz bindex
 Source0: %{name}.r%{svnRev}.svn.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 BuildRequires: ant
-BuildRequires: aqute-bndlib
+BuildRequires: aqute-bnd
 BuildRequires: felix-osgi-obr
 BuildRequires: felix-osgi-core
 BuildRequires: java-devel >= 1:1.6.0
@@ -34,6 +33,7 @@ BuildRequires: junit4
 BuildRequires: kxml
 
 Requires: java >= 1:1.6.0
+Requires: jpackage-utils
 
 %description
 A Java program that implements the manifest header to repository 
@@ -54,24 +54,22 @@ pushd jar
   %__ln_s $(build-classpath kxml.jar) kxml2-min.jar
   %__ln_s $(build-classpath felix/org.osgi.service.obr.jar)
 popd
-java -jar $(build-classpath aqute-bndlib.jar) \
+java -jar $(build-classpath aqute-bnd.jar) \
      build -output %{name}-%{version}.jar bindex.bnd
 
 %install
-%__rm -rf %{buildroot}
 %__install -d -m 0755 %{buildroot}%{_javadir}
 %__install -m 644 %{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 (cd %{buildroot}%{_javadir} && %__ln_s %{name}-%{version}.jar %{name}.jar)
 
-%clean
-%__rm -rf %{buildroot}
-
 %files
-%defattr(-,root,root,-)
 %doc LICENSE.txt README
 %{_javadir}/*
 
 %changelog
+* Tue Oct 11 2011 Omair Majid <omajid at redhat.com> - 2.2-4.svn96
+- Fix BuildRequire on aqute-bndlib (renamed to aqute-bnd)
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2-3.svn96
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list