Hello community, here is the log from the commit of package florence for openSUSE:Factory checked in at 2018-05-18 14:27:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/florence (Old) and /work/SRC/openSUSE:Factory/.florence.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "florence" Fri May 18 14:27:37 2018 rev:7 rq:609849 version:0.6.3 Changes: -------- --- /work/SRC/openSUSE:Factory/florence/florence.changes 2016-04-12 19:34:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.florence.new/florence.changes 2018-05-18 14:27:52.406435673 +0200 @@ -1,0 +2,6 @@ +Wed May 16 15:36:32 UTC 2018 - dims...@opensuse.org + +- Add florence-buildfix.patch: Fix reference to libflorence, fixes + also parallel build. + +------------------------------------------------------------------- New: ---- florence-buildfix.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ florence.spec ++++++ --- /var/tmp/diff_new_pack.mZMqBZ/_old 2018-05-18 14:27:53.574392811 +0200 +++ /var/tmp/diff_new_pack.mZMqBZ/_new 2018-05-18 14:27:53.578392664 +0200 @@ -1,7 +1,7 @@ # # spec file for package florence # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -20,18 +20,20 @@ Version: 0.6.3 Release: 0 Summary: Extensible scalable on-screen virtual keyboard -License: GPL-2.0+ and GFDL-1.2 +License: GPL-2.0-or-later AND GFDL-1.2-only Group: System/X11/Utilities -Url: http://florence.sourceforge.net +URL: http://florence.sourceforge.net Source0: http://downloads.sourceforge.net/florence/%{name}-%{version}.tar.bz2 Source99: florence-rpmlintrc # PATCH-FIX-OPENSUSE florence-icondir.patch bnc#855529 dap.darkn...@gmail.com -- Set correct svg icon directory to not breake the application Patch0: florence-icondir.patch # PATCH-FIX-UPSTREAM florence-implicit-definitions.patch sf#florence#14 dims...@opensuse.org -- Fix implicit definition of function wait() Patch1: florence-implicit-definitions.patch +# PATCH-FIX-UPSTREAM florence-buildfix.patch dims...@opensuse.org -- Fix build system: link libflorence-1.0.la +Patch2: florence-buildfix.patch BuildRequires: intltool BuildRequires: libtool -BuildRequires: pkg-config +BuildRequires: pkgconfig BuildRequires: rarian-scrollkeeper-compat BuildRequires: update-desktop-files BuildRequires: pkgconfig(atspi-2) @@ -47,11 +49,11 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xtst) -Recommends: %{name}-lang -Requires(post): glib2-tools -Requires(postun): glib2-tools Requires(post): desktop-file-utils +Requires(post): glib2-tools Requires(postun): desktop-file-utils +Requires(postun): glib2-tools +Recommends: %{name}-lang %description Florence is an extensible scalable virtual keyboard for X11. @@ -73,7 +75,6 @@ Extensible scalable on-screen virtual keyboard. This package contains libraries. - %package devel Summary: Development files for %{name} Group: Development/Libraries/X11 @@ -90,15 +91,14 @@ sed -i 's|Icon=@ICONDIR@/%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in.in %patch0 %patch1 -p1 +%patch2 -p1 %build autoreconf -fiv %configure \ --disable-scrollkeeper \ --disable-static -# Disable parallel build, as it is broken currently. -#make %%{?_smp_mflags} -make +make %{?_smp_mflags} %install %make_install @@ -120,14 +120,15 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README +%license COPYING +%doc AUTHORS ChangeLog COPYING-DOCS NEWS README %dir %{_datadir}/gnome/help/%{name} %doc %{_datadir}/gnome/help/%{name}/C/ %dir %{_datadir}/omf %dir %{_datadir}/omf/%{name} %doc %{_datadir}/omf/%{name}/%{name}-C.omf -%doc %{_mandir}/man1/%{name}.1%{?ext_man} -%doc %{_mandir}/man1/%{name}_applet.1%{?ext_man} +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_mandir}/man1/%{name}_applet.1%{?ext_man} %{_bindir}/%{name} %{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop ++++++ florence-buildfix.patch ++++++ Index: florence-0.6.3/src/Makefile.am =================================================================== --- florence-0.6.3.orig/src/Makefile.am +++ florence-0.6.3/src/Makefile.am @@ -16,7 +16,7 @@ florence_CPPFLAGS = -I$(top_srcdir) -DIC -DDATADIR="\"$(datadir)/florence\"" $(DEPS_CFLAGS) $(GTK3_CFLAGS)\ $(LIBGNOME_CFLAGS) $(LIBNOTIFY_CFLAGS) $(XTST_CFLAGS) $(AT_SPI2_CFLAGS) $(INCLUDES) florence_LDADD = $(DEPS_LIBS) $(LIBM) $(X11_LIBS) $(LIBGNOME_LIBS) $(LIBNOTIFY_LIBS)\ - $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) -lflorence-1.0 + $(XTST_LIBS) $(AT_SPI2_LIBS) $(GTK3_LIBS) libflorence-1.0.la libflorence_1_0_la_SOURCES = lib/florence.c library_includedir=$(includedir)/florence-1.0
