[link-grammar] Fix FTFBS, update to latest.

Jon Ciesla limb at fedoraproject.org
Tue Jun 24 16:58:34 UTC 2014


commit 68bd864c8d381699a5f7b3375267c845ac33c5f2
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Tue Jun 24 11:54:55 2014 -0500

    Fix FTFBS, update to latest.

 .gitignore        |    1 +
 link-grammar.spec |   33 ++++++++++++++++++++++++++++-----
 sources           |    2 +-
 3 files changed, 30 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 232a929..b1f2c4a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ link-grammar-4.6.7.tar.gz
 /link-grammar-4.7.9.tar.gz
 /link-grammar-4.7.11.tar.gz
 /link-grammar-4.8.6.tar.gz
+/link-grammar-5.0.8.tar.gz
diff --git a/link-grammar.spec b/link-grammar.spec
index 4af25a4..ba49187 100644
--- a/link-grammar.spec
+++ b/link-grammar.spec
@@ -1,12 +1,12 @@
 Summary: A Grammar Checking library
 Name: link-grammar
-Version: 4.8.6
-Release: 3%{?dist}
+Version: 5.0.8
+Release: 1%{?dist}
 Group: System Environment/Libraries
-License: BSD
+License: LGPLv2+
 Source: http://www.abisource.com/downloads/link-grammar/%{version}/link-grammar-%{version}.tar.gz
 URL: http://abisource.com/projects/link-grammar/
-BuildRequires: hunspell-devel, java-devel, libgcj-devel, jpackage-utils, libedit-devel, ant
+BuildRequires: hunspell-devel, java-devel, jpackage-utils, libedit-devel, ant, perl-devel
 
 %description
 A library that can perform grammar checking.
@@ -38,10 +38,22 @@ Requires: link-grammar-devel = %{version}-%{release}
 %description java-devel
 Libraries for developing Java components using liblink-grammar.
 
+%package perl
+Summary: Perl libraries for liblink-grammar
+Group: Development/Libraries
+Requires: perl
+Requires: link-grammar = %{version}-%{release}
+
+%description perl
+Perl libraries for liblink-grammar
+
+
 %prep
 %setup -q
 
 %build
+# help configure find jni.h
+export JAVA_HOME=%{java_home}
 %configure --disable-static --enable-pthreads --disable-aspell
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
 sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -51,8 +63,11 @@ make %{?_smp_mflags}
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 mv $RPM_BUILD_ROOT/%{_datadir}/java/linkgrammar-%{version}.jar $RPM_BUILD_ROOT/%{_datadir}/java/linkgrammar.jar
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}/perl5/
+mv $RPM_BUILD_ROOT/usr/local/lib*/perl5/* $RPM_BUILD_ROOT/%{_libdir}/perl5/
+find $RPM_BUILD_ROOT/%{_libdir}/ -name '*.la' | xargs rm -f
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -80,6 +95,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{_libdir}/liblink-grammar-java.so
 
+%files perl
+%defattr(-,root,root,-)
+%{_libdir}/perl5/*
+
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
@@ -87,6 +106,10 @@ rm -rf $RPM_BUILD_ROOT
 %postun java -p /sbin/ldconfig
 
 %changelog
+* Tue Jun 24 2014 Jon Ciesla <limburgher at gmail.com> - 5.0.8-1
+- Latest upstream to fix FTBFS BZ 1106100, License change.
+- Include JAVA_HOME from Yaakov Selkowitz's patch.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.8.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 8418e03..7de5fb4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12058702fb9434254a47d09a9c661acb  link-grammar-4.8.6.tar.gz
+fdda9f3bc23aeb68b82418e2aed0cbb2  link-grammar-5.0.8.tar.gz


More information about the scm-commits mailing list