[jnr-netdb] Fix FTBFS.

Alexander Kurtakov akurtakov at fedoraproject.org
Tue Jun 28 07:48:33 UTC 2011


commit 791f322eb03b3c9f927b3019511292e1e25695c1
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Tue Jun 28 10:47:51 2011 +0300

    Fix FTBFS.
    
    - Adapt to current guidelines.

 jnr-netdb.spec |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/jnr-netdb.spec b/jnr-netdb.spec
index 89b2403..bcbac05 100644
--- a/jnr-netdb.spec
+++ b/jnr-netdb.spec
@@ -3,7 +3,7 @@
 
 Name:    jnr-netdb
 Version: 1.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: Network services database access for java
 
 Group:   System Environment/Libraries
@@ -18,9 +18,9 @@ BuildRequires: jpackage-utils
 BuildRequires: ant
 BuildRequires: ant-nodeps
 BuildRequires: jaffl
-BuildRequires(check): ant-junit
-BuildRequires(check): junit4
-BuildRequires(check): jffi
+BuildRequires: ant-junit
+BuildRequires: junit4
+BuildRequires: jffi
 Requires: java >= 1:1.6.0
 Requires: jpackage-utils
 Requires: jaffl
@@ -49,7 +49,6 @@ build-jar-repository -s -p lib junit junit4 jaffl objectweb-asm jffi
 ant jar javadoc
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_javadir}
 cp -p dist/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
 
@@ -65,11 +64,7 @@ cp pom.xml  $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-jnr-netdb.pom
 %check
 ant test
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(-,root,root,-)
 %{_javadir}/*
 %doc COPYING
 %doc COPYING.LESSER
@@ -77,10 +72,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mavenpomdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 28 2011 Alexander Kurtakov <akurtako at redhat.com> 1.0.1-5
+- Fix FTBFS.
+- Adapt to current guidelines.
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org>
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 


More information about the scm-commits mailing list