[sinjdoc] fix FTBFS

Peter Robinson pbrobinson at fedoraproject.org
Sun Apr 29 15:17:14 UTC 2012


commit cf7f224415aff021d41049550b97580ffe16e38c
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Sun Apr 29 16:17:03 2012 +0100

    fix FTBFS

 sinjdoc.spec |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/sinjdoc.spec b/sinjdoc.spec
index 2905b0e..b4bafa6 100644
--- a/sinjdoc.spec
+++ b/sinjdoc.spec
@@ -1,6 +1,6 @@
 Name:           sinjdoc
 Version:        0.5
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Documentation generator for Java source code
 
 Group:          Development/Tools
@@ -10,10 +10,9 @@ URL:            http://cscott.net/Projects/GJ/sinjdoc-latest/
 Source0:        http://cscott.net/Projects/GJ/sinjdoc-latest/sinjdoc-0.5.tar.gz
 Patch0:         sinjdoc-annotations.patch
 Patch1:         sinjdoc-autotools-changes.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: autoconf
-BuildRequires: automake16
+BuildRequires: automake
 BuildRequires: eclipse-ecj >= 3.2.1
 BuildRequires: gcc-java >= 4.0.2
 BuildRequires: java-gcj-compat-devel >= 1.0.70
@@ -36,13 +35,13 @@ documentation from Java source code
 %patch1 -p0
 
 %build
-automake-1.6
+aclocal
+automake
 autoconf
 %configure
 make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cat > sinjdoc << EOF
 #!/bin/sh
 %{_bindir}/gij -classpath \
@@ -55,9 +54,6 @@ install -d 755 $RPM_BUILD_ROOT%{_javadir}
 install -D -m 644 sinjdoc.jar $RPM_BUILD_ROOT%{_javadir}/sinjdoc.jar
 aot-compile-rpm
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %post
 if [ -x %{_bindir}/rebuild-gcj-db ]
 then
@@ -78,6 +74,9 @@ fi
 %{_libdir}/gcj/%{name}
 
 %changelog
+* Sun Apr 29 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.5-12
+- Fix FTBFS
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list