Hello community,
here is the log from the commit of package presage for openSUSE:Factory checked
in at 2017-05-20 14:30:09
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/presage (Old)
and /work/SRC/openSUSE:Factory/.presage.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "presage"
Sat May 20 14:30:09 2017 rev:15 rq:496878 version:0.9.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/presage/presage.changes 2016-06-21
12:29:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.presage.new/presage.changes 2017-05-20
14:30:14.096846957 +0200
@@ -1,0 +2,7 @@
+Fri May 19 14:28:13 UTC 2017 - jeng...@inai.de
+
+- Add presage-buildcycle.diff to break the build cycle
+ preemptively.
+- Limit fdupes to not cross typical partition boundaries.
+
+-------------------------------------------------------------------
New:
----
presage-buildcycle.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ presage.spec ++++++
--- /var/tmp/diff_new_pack.lRiAjH/_old 2017-05-20 14:30:15.452655135 +0200
+++ /var/tmp/diff_new_pack.lRiAjH/_new 2017-05-20 14:30:15.456654569 +0200
@@ -1,7 +1,7 @@
#
# spec file for package presage
#
-# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -38,6 +38,7 @@
Patch5: presage-0.9.1-gcc6.patch
# PATCH-FIX-UPSTREAM doxygen no longer ships with the FreeSans font
Patch6: presage-0.9.1-doxygen-no-freesans.patch
+Patch7: presage-buildcycle.diff
BuildRequires: fdupes
BuildRequires: gcc-c++
# Documentation Start
@@ -55,13 +56,6 @@
BuildRequires: python-atspi
BuildRequires: python-devel
BuildRequires: python-gtk-devel
-%if 0%{?suse_version} >= 1320
-BuildRequires: python-wxWidgets >= 3
-BuildRequires: python-wxWidgets-devel >= 3
-%else
-BuildRequires: python-wxWidgets
-BuildRequires: python-wxWidgets-devel
-%endif
BuildRequires: python-xlib
BuildRequires: swig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -225,6 +219,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
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
@@ -254,7 +249,7 @@
%suse_update_desktop_file gprompter Utility DesktopUtility
%suse_update_desktop_file pyprompter Utility DesktopUtility
-%fdupes %{buildroot}
+%fdupes %{buildroot}/%{_prefix}
%else
++++++ presage-buildcycle.diff ++++++
From: Jan Engelhardt <jeng...@inai.de>
build: always pretend wxpython is available
Relying on wxpython's presence if it is not even needed for building
is a bad idea, because that causes a build cycle:
presage (pyprompter) depends on python-wxWidgets
python-wxWidgets depends on wxWidgets
wxWidgets depends on SDL2
SDL2 depends on fcitx
fcitx depends on presage (libpresage)
---
configure.ac | 18 ------------------
1 file changed, 18 deletions(-)
Index: presage-0.9.1/configure.ac
===================================================================
--- presage-0.9.1.orig/configure.ac
+++ presage-0.9.1/configure.ac
@@ -343,26 +343,8 @@ dnl Checks for pyprompter
dnl =====================
if test "$PYTHON" != :
then
- AC_MSG_CHECKING(for python wx module)
- $PYTHON -c "import wx" 2&>/dev/null
- if test $? -eq 0;
- then
have_python_wx=yes
- else
- have_python_wx=no
- fi
- AC_MSG_RESULT($have_python_wx)
-
-
- AC_MSG_CHECKING(for python wx.stc module)
- $PYTHON -c "import wx.stc" 2&>/dev/null
- if test $? -eq 0;
- then
have_python_wx_stc=yes
- else
- have_python_wx_stc=no
- fi
- AC_MSG_RESULT($have_python_wx_stc)
fi
if test "$PYTHON" != : -a \
