Hello community,

here is the log from the commit of package presage for openSUSE:Factory checked 
in at 2013-07-07 22:22:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/presage (Old)
 and      /work/SRC/openSUSE:Factory/.presage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "presage"

Changes:
--------
--- /work/SRC/openSUSE:Factory/presage/presage.changes  2012-09-25 
10:46:31.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.presage.new/presage.changes     2013-07-07 
22:22:59.000000000 +0200
@@ -1,0 +2,6 @@
+Wed Jul  3 02:23:36 UTC 2013 - [email protected]
+
+- update version 0.8.9.beta20130208
+  * see ChangeLog for details
+
+-------------------------------------------------------------------

Old:
----
  presage-0.8.8.tar.gz
  presage_automake_1.12.abuild.patch
  presage_ncurses_flag.patch
  presage_port_cmuclmtk.patch

New:
----
  presage-0.8.9-automake_1.12_abuild.patch
  presage-0.8.9-ncurses_flag.patch
  presage-0.8.9-port_cmuclmtk.patch
  presage-0.8.9.beta20130208.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ presage.spec ++++++
--- /var/tmp/diff_new_pack.2nuOoJ/_old  2013-07-07 22:23:00.000000000 +0200
+++ /var/tmp/diff_new_pack.2nuOoJ/_new  2013-07-07 22:23:00.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package presage
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 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
@@ -19,7 +19,7 @@
 %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
+Version:        0.8.9.beta20130208
 Release:        0
 Summary:        Intelligent predictive text entry platform (tools and demos)
 License:        GPL-2.0
@@ -27,11 +27,11 @@
 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
+Patch0:         presage-0.8.9-ncurses_flag.patch
 # PATCH-FIX-UPSTREAM [email protected] - port to cmuclmtk
-Patch1:         presage_port_cmuclmtk.patch
+Patch1:         presage-0.8.9-port_cmuclmtk.patch
 # PATCH-FIX-UPSTREAM [email protected] automake 1.12 abuild patch
-Patch2:         presage_automake_1.12.abuild.patch
+Patch2:         presage-0.8.9-automake_1.12_abuild.patch
 %if 0%{?suse_version}
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel
@@ -61,7 +61,12 @@
 BuildRequires:  libgnome-devel
 BuildRequires:  libtool
 BuildRequires:  ncurses-devel
+BuildRequires:  python-atspi
 BuildRequires:  python-devel
+BuildRequires:  python-gtk-devel
+BuildRequires:  python-wxWidgets
+BuildRequires:  python-wxWidgets-devel
+BuildRequires:  python-xlib
 BuildRequires:  swig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -127,6 +132,7 @@
 %package -n python-presage
 Summary:        Intelligent predictive text entry platform (Python binding)
 Group:          System/Libraries
+%py_requires
 
 %description -n python-presage
 Presage is an intelligent predictive text entry platform.
@@ -156,6 +162,12 @@
 %package -n python-presagemate
 Summary:        Universial predictive text companion
 Group:          Productivity/Text/Utilities
+Requires:       python-atspi
+Requires:       python-gtk
+Requires:       python-presage
+Requires:       python-xlib
+BuildArch:      noarch
+%py_requires
 
 %description -n python-presagemate
 Pypresagemate is a universal predictive text companion. Pypresagemate works 
alongside any AT-SPI aware application. The Assistive Technology Service 
Provider Interface (AT-SPI) is a toolkit-neutral way of providing accessibility 
facilities in applications. Pypresagemate works in the background by tracking 
what keystrokes are typed and displaying predictions in its window. When a 
prediction is selected, text is sent to the active application.
@@ -173,6 +185,9 @@
 Summary:        Intelligent predictive wxPython text editor
 Group:          Productivity/Text/Editors
 Requires:       python-presagemate
+Requires:       python-wxWidgets
+BuildArch:      noarch
+%py_requires
 
 %description -n pyprompter
 This package contains the wxPython predictive text editor pyprompter.
@@ -183,11 +198,16 @@
 
 %prep
 %setup -q
+find . -type f -exec sed -i  's/\r//g' "{}" \;
 %patch0 -p1
 %patch1 -p1
 %if 0%{?suse_version} >= 1220
 %patch2 -p1
 %endif
+echo "[D-BUS Service]" > apps/dbus/org.gnome.presage.service.in
+echo "Name=org.gnome.presage.beta" >> apps/dbus/org.gnome.presage.service.in
+echo "Exec={bindir}/presage_dbus_service --start" >> 
apps/dbus/org.gnome.presage.service.in
+echo "User=root" >> apps/dbus/org.gnome.presage.service.in
 
 %build
 export LIBS+="-lm -lX11 -lgmodule-2.0 -lncurses"
@@ -298,13 +318,13 @@
 %{python_sitearch}/presage.pyo
 %endif
 %{_mandir}/man1/presage_python_demo.1.gz
-%{python_sitearch}/python_presage-%{version}-py%{py_ver}.egg-info
+%{python_sitearch}/python_presage-0.8.9_beta-py%{py_ver}.egg-info
 
 %files -n pyprompter
 %defattr(-,root,root)
 %{_bindir}/pyprompter
 %{python_sitelib}/prompter
-%{python_sitelib}/pyprompter-%{version}-py%{py_ver}.egg-info
+%{python_sitelib}/pyprompter-0.8.9_beta-py%{py_ver}.egg-info
 %{_datadir}/applications/pyprompter.desktop
 %{_datadir}/icons/hicolor/scalable/apps/pyprompter.svg
 %{_mandir}/man1/pyprompter.1.gz

++++++ presage-0.8.9-automake_1.12_abuild.patch ++++++
Index: presage-0.8.9.beta20130208/Makefile.am
===================================================================
--- presage-0.8.9.beta20130208.orig/Makefile.am
+++ presage-0.8.9.beta20130208/Makefile.am
@@ -65,7 +65,7 @@ EXTRA_DIST =  FAQ
 
 # Ensure local m4 macros are included during autoreconf and automatic
 # aclocal.m4 remaking
-ACLOCAL_AMFLAGS = -I m4
+#ACLOCAL_AMFLAGS = -I m4
 
 
 # Build Debian package
Index: presage-0.8.9.beta20130208/configure.ac
===================================================================
--- presage-0.8.9.beta20130208.orig/configure.ac
+++ presage-0.8.9.beta20130208/configure.ac
@@ -23,7 +23,7 @@ dnl Process this file with autoconf to p
 
 
 AC_INIT([presage],[0.8.9~beta],[[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-0.8.9-ncurses_flag.patch ++++++
Index: presage-0.8.9.beta20130208/configure.ac
===================================================================
--- presage-0.8.9.beta20130208.orig/configure.ac
+++ presage-0.8.9.beta20130208/configure.ac
@@ -106,7 +106,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.9.beta20130208/src/tools/Makefile.am
===================================================================
--- presage-0.8.9.beta20130208.orig/src/tools/Makefile.am
+++ presage-0.8.9.beta20130208/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.9.beta20130208/src/tools/Makefile.in
===================================================================
--- presage-0.8.9.beta20130208.orig/src/tools/Makefile.in
+++ presage-0.8.9.beta20130208/src/tools/Makefile.in
@@ -360,7 +360,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-0.8.9-port_cmuclmtk.patch ++++++
Index: presage-0.8.9.beta20130208/resources/arpa/Makefile.am
===================================================================
--- presage-0.8.9.beta20130208.orig/resources/arpa/Makefile.am
+++ presage-0.8.9.beta20130208/resources/arpa/Makefile.am
@@ -33,7 +33,7 @@ arpa_en.vocab:        ../the_picture_of_dorian_
        $(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) -idngram arpa_en.idngram -vocab arpa_en.vocab < $< > $@
 
 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 @@ arpa_it.vocab:        ../the_picture_of_dorian_
        $(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) -idngram arpa_it.idngram -vocab arpa_it.vocab < $< > $@
 
 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]

Reply via email to