Author: qboosh Date: Sun Apr 24 10:20:29 2011 GMT Module: packages Tag: HEAD ---- Log message: - updated to 3.0.2 - removed obsolete link,rules patches - added pc patch - by default build with SFST and openfst enabled, foma disabled
---- Files affected: packages/hfst: hfst.spec (1.1 -> 1.2) , hfst-pc.patch (NONE -> 1.1) (NEW), hfst-link.patch (1.1 -> NONE) (REMOVED), hfst-rules.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/hfst/hfst.spec diff -u packages/hfst/hfst.spec:1.1 packages/hfst/hfst.spec:1.2 --- packages/hfst/hfst.spec:1.1 Sun Nov 28 00:26:43 2010 +++ packages/hfst/hfst.spec Sun Apr 24 12:20:24 2011 @@ -1,22 +1,28 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_with foma # use foma by linking with libfoma (GPL v2-strict, which is not compliant) +# Summary: Helsinki Finite-State Transducer (library and application suite) Summary(pl.UTF-8): Helsinki Finite-State Transducer (biblioteka i zestaw aplikacji) Name: hfst -Version: 2.4.1 +Version: 3.0.2 Release: 1 -License: GPL v3+ +License: GPL v3 Group: Applications/Text Source0: http://downloads.sourceforge.net/hfst/%{name}-%{version}.tar.gz -# Source0-md5: 4e501d68f1ef67ab45029ce14e3ce559 -Patch0: %{name}-link.patch -Patch1: %{name}-rules.patch +# Source0-md5: ae502571684f706b372d669c36652892 +Patch0: %{name}-pc.patch URL: http://www.ling.helsinki.fi/kieliteknologia/tutkimus/hfst/ -BuildRequires: autoconf >= 2.61 -BuildRequires: automake +BuildRequires: SFST-devel +BuildRequires: autoconf >= 2.62 +BuildRequires: automake >= 1:1.11 BuildRequires: bison +%{?with_foma:BuildRequires: foma-devel} BuildRequires: flex >= 2.5.35 BuildRequires: libstdc++-devel BuildRequires: libtool >= 2:2.0 +BuildRequires: openfst-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -35,7 +41,10 @@ Summary(pl.UTF-8): Pliki nagłówkowe biblioteki HFST Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: SFST-devel +%{?with_foma:Requires: foma-devel} Requires: libstdc++-devel +Requires: openfst-devel %description devel Header files for HFST library. @@ -58,38 +67,16 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build -cd hfst2 %{__libtoolize} %{__aclocal} %{__autoconf} %{__autoheader} %{__automake} -cd ../hfst-tools -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -cd hfst-lexc -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -cd ../hfst-twolc -%{__libtoolize} -%{__aclocal} -%{__autoconf} -%{__autoheader} -%{__automake} -cd ../.. -%{__aclocal} -%{__autoconf} -%{__automake} %configure \ + FOMACLI=/usr/bin/foma \ + --disable-silent-rules \ --enable-static %{__make} @@ -100,6 +87,13 @@ %{__make} install \ DESTDIR=$RPM_BUILD_ROOT +# missing in make install +[ ! -f $RPM_BUILD_ROOT%{_pkgconfigdir}/hfst.pc ] || exit 1 +install -D libhfst/hfst.pc $RPM_BUILD_ROOT%{_pkgconfigdir}/hfst.pc + +# obsoleted by pkgconfig +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhfst.la + %clean rm -rf $RPM_BUILD_ROOT @@ -108,37 +102,22 @@ %files %defattr(644,root,root,755) -%doc AUTHORS BUGS ChangeLog NEWS README THANKS +%doc AUTHORS ChangeLog NEWS README THANKS %attr(755,root,root) %{_bindir}/hfst-* %attr(755,root,root) %{_bindir}/htwolcpre* -%attr(755,root,root) %{_bindir}/hwfst-calculate %attr(755,root,root) %{_libdir}/libhfst.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhfst.so.0 -%attr(755,root,root) %{_libdir}/libhfstlexc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libhfstlexc.so.0 +%attr(755,root,root) %ghost %{_libdir}/libhfst.so.1 %{_mandir}/man1/hfst-*.1* %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libhfst.so -%attr(755,root,root) %{_libdir}/libhfstlexc.so -%{_libdir}/libhfst.la -%{_libdir}/libhfstlexc.la -%{_includedir}/hfst2 -%{_includedir}/flex-utils.h -%{_includedir}/lexc.h -%{_includedir}/lexcio.h -%{_includedir}/string-munging.h -%{_includedir}/xducer.h -%{_includedir}/xymbol.h -%{_includedir}/xymbol-bridges.h -%{_includedir}/xymbol-table.h +%{_includedir}/hfst %{_pkgconfigdir}/hfst.pc %files static %defattr(644,root,root,755) %{_libdir}/libhfst.a -%{_libdir}/libhfstlexc.a %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -146,6 +125,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2011/04/24 10:20:24 qboosh +- updated to 3.0.2 +- removed obsolete link,rules patches +- added pc patch +- by default build with SFST and openfst enabled, foma disabled + Revision 1.1 2010/11/27 23:26:43 qboosh - new package - link patch to fix libhfstlexc linking ================================================================ Index: packages/hfst/hfst-pc.patch diff -u /dev/null packages/hfst/hfst-pc.patch:1.1 --- /dev/null Sun Apr 24 12:20:29 2011 +++ packages/hfst/hfst-pc.patch Sun Apr 24 12:20:24 2011 @@ -0,0 +1,19 @@ +--- hfst-3.0.2/configure.ac.orig 2011-04-12 12:00:31.000000000 +0200 ++++ hfst-3.0.2/configure.ac 2011-04-23 13:56:39.704511981 +0200 +@@ -39,7 +39,7 @@ + LIBHFST_MAJOR=3 + LIBHFST_MINOR=0 + LIBHFST_EXTENSION=2 +-LIBHFST_VERSION=$LIBHFST_MAJOR.$LIBHFST_MINOR.LIBHFST_EXTENSION ++LIBHFST_VERSION=$LIBHFST_MAJOR.$LIBHFST_MINOR.$LIBHFST_EXTENSION + AC_SUBST(LIBHFST_MAJOR) + AC_SUBST(LIBHFST_MINOR) + AC_SUBST(LIBHFST_EXTENSION) +--- hfst-3.0.2/libhfst/hfst.pc.in.orig 2011-03-30 15:11:32.000000000 +0200 ++++ hfst-3.0.2/libhfst/hfst.pc.in 2011-04-23 13:57:05.791179522 +0200 +@@ -7,4 +7,4 @@ + Description: Finite-state transducer library bridge for multiple FLOSS packages + Version: @LIBHFST_VERSION@ + Libs: -L${libdir} -l@LIBHFST_NAME@ @LIBS@ +-Cflags: -I${includedir}/hfst/ @FOMA_CFLAGS@ @OPENFST_CFLAGS@ @SFST_CFLAGS@ ++Cflags: -I${includedir}/hfst ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hfst/hfst.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
