- Upstream release 1.4

- Fixing "archiver requires 'AM_PROG_AR' in 'configure.ac'" error
- FTBFS: config.status: error: cannot find input file: `Makefile.in' RHBZ#858377
This commit is contained in:
Marek Goldmann 2012-07-24 11:42:50 +02:00
parent 56d7ae9df3
commit 37795a0726
4 changed files with 39 additions and 5 deletions

1
.gitignore vendored
View File

@ -1 +1,2 @@
/jansi-native-1.2.tar.xz
/jansi-native-1.4.tar.xz

View File

@ -0,0 +1,25 @@
From 324f6f20451942d228ddcc4a2153fd8d9487bddb Mon Sep 17 00:00:00 2001
From: Marek Goldmann <goldmann@fedoraproject.org>
Date: Tue, 24 Jul 2012 11:39:56 +0200
Subject: [PATCH] Fixing "archiver requires 'AM_PROG_AR' in 'configure.ac'"
error
---
src/main/native-package/m4/custom.m4 | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/main/native-package/m4/custom.m4 b/src/main/native-package/m4/custom.m4
index 3b5e92e..75cbdec 100644
--- a/src/main/native-package/m4/custom.m4
+++ b/src/main/native-package/m4/custom.m4
@@ -18,4 +18,5 @@ dnl ---------------------------------------------------------------------------
AC_DEFUN([CUSTOM_M4_SETUP],
[
AC_CHECK_LIB([c], [isatty],[AC_DEFINE([HAVE_ISATTY], [1], [Define to 1 if you have the isatty function.])])
-])
\ No newline at end of file
+ AM_PROG_AR
+])
--
1.7.11.2

View File

@ -6,16 +6,18 @@
%endif
Name: jansi-native
Version: 1.2
Release: 4%{?dist}
Version: 1.4
Release: 1%{?dist}
Summary: Jansi Native implements the JNI Libraries used by the Jansi project
Group: Development/Libraries
License: ASL 2.0
URL: http://jansi.fusesource.org/
# git clone git://github.com/fusesource/jansi-native.git
# cd jansi-native && git archive --format=tar --prefix=jansi-native-1.2/ jansi-native-1.2 | xz > jansi-native-1.2.tar.xz
Source0: %{name}-%{version}.tar.xz
# cd jansi-native && git archive --format=tar --prefix=jansi-native-1.4/ jansi-native-1.4 | xz > jansi-native-1.4.tar.xz
Source0: jansi-native-%{version}.tar.xz
Patch0: 0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch
BuildRequires: jpackage-utils
BuildRequires: java-devel
@ -58,6 +60,7 @@ This package contains the API documentation for %{name}.
%prep
%setup -q
%patch0 -p1
%build
mvn-rpmbuild install javadoc:aggregate
@ -94,6 +97,11 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
%doc license.txt
%changelog
* Wed Sep 19 2012 Marek Goldmann <mgoldman@redhat.com> - 1.4-1
- Upstream release 1.4
- Fixing "archiver requires 'AM_PROG_AR' in 'configure.ac'" error
- FTBFS: config.status: error: cannot find input file: `Makefile.in' RHBZ#858377
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

View File

@ -1 +1 @@
081e9d245b86ef327fae9b99debde9b8 jansi-native-1.2.tar.xz
1fbcce12b150575c234f57086609c0d0 jansi-native-1.4.tar.xz