Hello community,
here is the log from the commit of package presage for openSUSE:Factory checked
in at 2019-07-08 14:59:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/presage (Old)
and /work/SRC/openSUSE:Factory/.presage.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "presage"
Mon Jul 8 14:59:50 2019 rev:18 rq:713072 version:0.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/presage/presage.changes 2019-06-27
16:23:05.614331142 +0200
+++ /work/SRC/openSUSE:Factory/.presage.new.4615/presage.changes
2019-07-08 14:59:51.430428613 +0200
@@ -1,0 +2,14 @@
+Tue Jul 2 13:26:59 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Add explicit BuildRequires for pkg-config for doc flavor, otherwise
+ configuration on Leap 15.x / SLE 15 fails.
+- Disable build and checks for tools/bindings when building API docs.
+
+-------------------------------------------------------------------
+Thu Jun 27 00:14:16 UTC 2019 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Make the package name dependent on the flavor, otherwise OBS can not track
+ the packages correctly and keeps blocking until all flavors are finished.
+- Remove unnneded Requires: presage in devel subpackge
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ presage.spec ++++++
--- /var/tmp/diff_new_pack.FGpsUG/_old 2019-07-08 14:59:52.142429691 +0200
+++ /var/tmp/diff_new_pack.FGpsUG/_new 2019-07-08 14:59:52.146429696 +0200
@@ -17,16 +17,22 @@
%global flavor @BUILD_FLAVOR@%{nil}
+%global sname presage
+%if "%{flavor}" != ""
+%global pname %{sname}-%{flavor}
+%else
+%global pname %{sname}
+%endif
%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
+Name: %pname
Version: 0.9.1
Release: 0
Summary: Intelligent predictive text entry platform (tools and demos)
License: GPL-2.0-only
Group: Productivity/Text/Utilities
Url: http://presage.sourceforge.net
-Source:
http://ncu.dl.sourceforge.net/project/%{name}/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source:
http://ncu.dl.sourceforge.net/project/%{sname}/%{sname}/%{version}/%{sname}-%{version}.tar.gz
# PATCH-FIX-UPSTREAM jzh...@suse.com - fix ncurese builds in openSUSE
Patch0: presage-0.8.9-ncurses_flag.patch
# PATCH-FIX-UPSTREAM i...@marguerite.su - port to cmuclmtk
@@ -46,12 +52,13 @@
BuildRequires: fdupes
BuildRequires: gcc-c++
BuildRequires: libtool
-%if "%{flavor}" == doc
+%if "%{flavor}" == "doc"
# Documentation Start
BuildRequires: doxygen
BuildRequires: ghostscript-fonts-std
BuildRequires: graphviz
BuildRequires: graphviz-gd
+BuildRequires: pkgconfig
# Documentation End
%else
BuildRequires: help2man
@@ -63,7 +70,6 @@
BuildRequires: python-gtk-devel
BuildRequires: python-xlib
BuildRequires: swig
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if 0%{?suse_version}
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel
@@ -90,7 +96,6 @@
%package -n libpresage-devel
Summary: Intelligent predictive text entry platform (development files)
Group: Development/Libraries/C and C++
-Requires: %{name} = %{version}
Requires: libpresage1 = %{version}
%description -n libpresage-devel
@@ -103,7 +108,7 @@
%package -n libpresage1
Summary: Intelligent predictive text entry platform (shared library)
Group: System/Libraries
-Requires: presage-data
+Requires: presage-data = %{version}
%description -n libpresage1
Presage is an intelligent predictive text entry platform.
@@ -198,7 +203,7 @@
%endif
%prep
-%setup -q
+%setup -q -n %{sname}-%{version}
find . -type f -exec sed -i 's/\r//g' "{}" \;
%patch0 -p1
%patch1 -p1
@@ -216,7 +221,8 @@
%build
autoreconf -fi
%if "%{flavor}" == "doc"
-%configure --disable-sqlite
+# nl -ba ./configure
+%configure --disable-sqlite --disable-gprompter --disable-gpresagemate
--disable-python-binding
make -C doc %{?_smp_mflags}
%else
export LIBS+="-lm -lgmodule-2.0"
