diff --git a/.gitignore b/.gitignore index 01cf1e1..910e2b5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jansi-native-1.2.tar.xz +/jansi-native-1.4.tar.xz diff --git a/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch b/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch new file mode 100644 index 0000000..b14aeb0 --- /dev/null +++ b/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch @@ -0,0 +1,25 @@ +From 324f6f20451942d228ddcc4a2153fd8d9487bddb Mon Sep 17 00:00:00 2001 +From: Marek Goldmann +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 + diff --git a/jansi-native.spec b/jansi-native.spec index c5a5997..50e4895 100644 --- a/jansi-native.spec +++ b/jansi-native.spec @@ -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 - 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 - 1.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index f537ea4..ba17367 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -081e9d245b86ef327fae9b99debde9b8 jansi-native-1.2.tar.xz +1fbcce12b150575c234f57086609c0d0 jansi-native-1.4.tar.xz