Hello community, here is the log from the commit of package presage for openSUSE:Factory checked in at 2012-09-25 10:46:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/presage (Old) and /work/SRC/openSUSE:Factory/.presage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "presage", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/presage/presage.changes 2012-09-17 01:29:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.presage.new/presage.changes 2012-09-25 10:46:31.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Sep 20 15:44:53 UTC 2012 - [email protected] + +- fix build after autoreconf -fi using automake 1.12 + * presage_automake_1.12.abuild.patch + +------------------------------------------------------------------- +Wed Sep 19 04:39:01 UTC 2012 - [email protected] + +- fix cmuclmtk command in arpa. + * patch1: presage_cmuclmtk.patch + * port old CMU-Statistical Language Modelling tools to its + successor CMU-Cambridge Statistical Language Modeling Toolkit v2 + (cmuclmtk) + +------------------------------------------------------------------- +Tue Sep 18 08:01:46 UTC 2012 - [email protected] + +- fix ncurses check flag +- fix fedora flag in spec and remove unnecessary if + +------------------------------------------------------------------- New: ---- presage_automake_1.12.abuild.patch presage_ncurses_flag.patch presage_port_cmuclmtk.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ presage.spec ++++++ --- /var/tmp/diff_new_pack.iyTlAG/_old 2012-09-25 10:46:32.000000000 +0200 +++ /var/tmp/diff_new_pack.iyTlAG/_new 2012-09-25 10:46:32.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package presage # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,21 +15,28 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define py_ver %(python -c "import sys; v=sys.version_info[:2]; print '%%d.%%d'%%v" 2>/dev/null || echo PYTHON-NOT-FOUND) Name: presage Version: 0.8.8 Release: 0 -License: GPL-2.0 Summary: Intelligent predictive text entry platform (tools and demos) -Url: http://presage.sourceforge.net +License: GPL-2.0 Group: Productivity/Text/Utilities +Url: http://presage.sourceforge.net Source: %{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM [email protected] - fix ncurese builds in openSUSE +Patch0: presage_ncurses_flag.patch +# PATCH-FIX-UPSTREAM [email protected] - port to cmuclmtk +Patch1: presage_port_cmuclmtk.patch +# PATCH-FIX-UPSTREAM [email protected] automake 1.12 abuild patch +Patch2: presage_automake_1.12.abuild.patch %if 0%{?suse_version} -BuildRequires: dbus-1-python-devel BuildRequires: dbus-1-glib-devel -BuildRequires: sqlite3-devel +BuildRequires: dbus-1-python-devel BuildRequires: libcppunit-devel +BuildRequires: sqlite3-devel %if 0%{?suse_version} >= 1220 BuildRequires: libXevie-devel %else @@ -37,24 +44,25 @@ %endif BuildRequires: update-desktop-files %else -BuildRequires: dbus-python-devel -BuildRequires: dbus-glib-devel -BuildRequires: sqlite-devel BuildRequires: cppunit-devel -BuildRequires: libXevie-devel +BuildRequires: dbus-glib-devel +BuildRequires: dbus-python-devel BuildRequires: desktop-file-utils +BuildRequires: libXevie-devel +BuildRequires: sqlite-devel %endif +BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ -BuildRequires: python-devel -BuildRequires: ncurses-devel -BuildRequires: swig -BuildRequires: doxygen BuildRequires: graphviz BuildRequires: graphviz-gd +BuildRequires: help2man BuildRequires: libcmuclmtk-devel BuildRequires: libgnome-devel -BuildRequires: help2man +BuildRequires: libtool +BuildRequires: ncurses-devel +BuildRequires: python-devel +BuildRequires: swig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -80,7 +88,7 @@ %package -n libpresage1 Summary: Intelligent predictive text entry platform (shared library) Group: System/Libraries -Requires: libpresage-data = %{version} +Requires: presage-data %description -n libpresage1 Presage is an intelligent predictive text entry platform. @@ -91,11 +99,13 @@ This package contains the shared library. -%package -n libpresage-data +%package -n presage-data Summary: Intelligent predictive text entry platform (data files) Group: System/Libraries +Provides: libpresage-data = %{version} +Obsoletes: libpresage-data < %{version} -%description -n libpresage-data +%description -n presage-data Presage is an intelligent predictive text entry platform. This package contains the sample statistical data files and abbreviation files needed by presage. @@ -173,9 +183,15 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 +%if 0%{?suse_version} >= 1220 +%patch2 -p1 +%endif %build -export LIBS+="-lm -lX11 -lgmodule-2.0" +export LIBS+="-lm -lX11 -lgmodule-2.0 -lncurses" +autoreconf -fi %configure make %{?_smp_mflags} @@ -217,11 +233,9 @@ %files %defattr(-,root,root) %doc AUTHORS ChangeLog NEWS README COPYING THANKS TODO -%if 0%{?fedora_version} %{_bindir}/presage_demo -%{_mandir}/man1/presage_demo.1.gz -%endif %{_bindir}/presage_demo_text +%{_mandir}/man1/presage_demo.1.gz %{_bindir}/presage_simulator %{_bindir}/text2ngram %{_mandir}/man1/presage_demo_text.1.gz @@ -244,7 +258,7 @@ %{_libdir}/libpresage.so.1 %{_libdir}/libpresage.so.1.1.1 -%files -n libpresage-data +%files -n presage-data %defattr(-,root,root) %config %{_sysconfdir}/presage.xml %{_datadir}/presage @@ -280,11 +294,11 @@ %{python_sitearch}/_presage.so %{python_sitearch}/presage.py %{python_sitearch}/presage.pyc -%if 0%{?fedora_version} +%if 0%{?fedora} %{python_sitearch}/presage.pyo %endif -%{python_sitearch}/python_presage-%{version}-py%{py_ver}.egg-info %{_mandir}/man1/presage_python_demo.1.gz +%{python_sitearch}/python_presage-%{version}-py%{py_ver}.egg-info %files -n pyprompter %defattr(-,root,root) ++++++ presage_automake_1.12.abuild.patch ++++++ diff -urN presage-0.8.8.orig/configure.ac presage-0.8.8/configure.ac --- presage-0.8.8.orig/configure.ac 2012-09-19 12:22:39.965369404 +0800 +++ presage-0.8.8/configure.ac 2012-09-20 23:41:46.114745908 +0800 @@ -23,7 +23,7 @@ AC_INIT([presage],[0.8.8],[[email protected]]) -AM_INIT_AUTOMAKE([-Wall -Werror]) +AM_INIT_AUTOMAKE([-Wall -Werror -Wno-extra-portability]) AC_CONFIG_SRCDIR([src/lib/presage.cpp]) AC_CONFIG_HEADERS([config.h:config.hin]) ++++++ presage_ncurses_flag.patch ++++++ Index: presage-0.8.8/configure.ac =================================================================== --- presage-0.8.8.orig/configure.ac +++ presage-0.8.8/configure.ac @@ -105,7 +105,7 @@ AC_CHECK_HEADERS([pwd.h]) dnl ================== dnl Checks for ncurses dnl ================== -AC_CHECK_LIB([curses], +AC_CHECK_LIB([ncurses], [initscr], [have_curses_library=true], [AC_MSG_WARN([curses library not found. curses demo programs will not be built.])]) Index: presage-0.8.8/src/tools/Makefile.am =================================================================== --- presage-0.8.8.orig/src/tools/Makefile.am +++ presage-0.8.8/src/tools/Makefile.am @@ -44,7 +44,7 @@ bin_PROGRAMS += presage_demo presage_demo_SOURCES = presageDemo.cpp presage_demo_LDADD = ../lib/libpresage.la -presage_demo_LDFLAGS = -lcurses +presage_demo_LDFLAGS = -lncurses endif presage_demo_text_SOURCES = presageDemoText.cpp Index: presage-0.8.8/src/tools/Makefile.in =================================================================== --- presage-0.8.8.orig/src/tools/Makefile.in +++ presage-0.8.8/src/tools/Makefile.in @@ -356,7 +356,7 @@ libtools_la_SOURCES = ngram.cpp ngram.h @HAVE_CURSES_TRUE@presage_demo_SOURCES = presageDemo.cpp @HAVE_CURSES_TRUE@presage_demo_LDADD = ../lib/libpresage.la -@HAVE_CURSES_TRUE@presage_demo_LDFLAGS = -lcurses +@HAVE_CURSES_TRUE@presage_demo_LDFLAGS = -lncurses presage_demo_text_SOURCES = presageDemoText.cpp presage_demo_text_LDADD = ../lib/libpresage.la presage_simulator_SOURCES = presageSimulator.cpp ++++++ presage_port_cmuclmtk.patch ++++++ diff -urN presage-0.8.8.orig/resources/arpa/Makefile.am presage-0.8.8/resources/arpa/Makefile.am --- presage-0.8.8.orig/resources/arpa/Makefile.am 2012-09-19 12:22:40.025369728 +0800 +++ presage-0.8.8/resources/arpa/Makefile.am 2012-09-19 12:37:43.002805545 +0800 @@ -33,7 +33,7 @@ $(TEXT2WFREQ) < $< | $(WFREQ2VOCAB) -top 20000 > $@ arpa_en.idngram: ../the_picture_of_dorian_gray.txt arpa_en.vocab - $(TEXT2IDNGRAM) -n 3 -vocab arpa_en.vocab -temp . < $< > $@ + $(TEXT2IDNGRAM) -vocab arpa_en.vocab -idngram arpa_en.idngram < $< > $@ arpa_en.arpa: arpa_en.idngram arpa_en.vocab $(IDNGRAM2LM) -idngram arpa_en.idngram -vocab arpa_en.vocab -arpa arpa_en.arpa @@ -42,7 +42,7 @@ $(TEXT2WFREQ) < $< | $(WFREQ2VOCAB) -top 20000 > $@ arpa_it.idngram: ../the_picture_of_dorian_gray.txt arpa_it.vocab - $(TEXT2IDNGRAM) -n 3 -vocab arpa_it.vocab -temp . < $< > $@ + $(TEXT2IDNGRAM) -vocab arpa_it.vocab -idngram arpa_it.idngram < $< > $@ arpa_it.arpa: arpa_it.idngram arpa_it.vocab $(IDNGRAM2LM) -idngram arpa_it.idngram -vocab arpa_it.vocab -arpa arpa_it.arpa -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
