Hello community, here is the log from the commit of package florence for openSUSE:Factory checked in at 2016-04-12 19:34:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/florence (Old) and /work/SRC/openSUSE:Factory/.florence.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "florence" Changes: -------- --- /work/SRC/openSUSE:Factory/florence/florence.changes 2013-12-16 15:52:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.florence.new/florence.changes 2016-04-12 19:34:53.000000000 +0200 @@ -1,0 +2,35 @@ +Sat Apr 2 18:36:21 UTC 2016 - [email protected] + +- Update to version 0.6.3: + + Many bug fixes +- Changes from version 0.6.2: + + Fix gradients. + + Remove deprecated GTK3 functions. +- Changes from version 0.6.1: + + A lot of bug fixes. + + Add commands to the dbus interface. + + Add command line options to control the keyboard. + + Move at-spi2 handling to a new process in order to avoid + deadlocks. + + Implement a floating icon for desktops with no systray. +- Remove la files, not needed in openSUSE. +- Disable parallel build, currently broken. +- Replace *-devel BuildRequires for their pkgconfig counterparts: + + at-spi2-core-devel for pkgconfig(atspi-2). + + libXtst-devel for pkgconfig(xtst). + + librsvg2-devel for pkgconfig(librsvg-2.0). +- Drop pkgconfig(gstreamer-0.10) and add pkgconfig(gstreamer-1.0) + BuildRequires, upstream ported to current gstreamer. +- Add pkgconfig(cairo), pkgconfig(gio-2.0), pkgconfig(gmodule-2.0), + pkgconfig(x11) and pkgconfig(xext) BuildRequires: configure looks + for them. +- Add new devel and lib subpackages. +- Handle new so files in post/postun. +- Pass --disable-static to configure since we do not need them. +- Rebase and simplify florence-icondir.patch. +- Add libtool BuildRequires and call autoreconf: needed, as + florence-icondir.patch touches the build system. +- Add florence-implicit-definitions.patch: Do not use wait(), which + is implicit defined and has no function. + +------------------------------------------------------------------- Old: ---- florence-0.6.0.tar.bz2 New: ---- florence-0.6.3.tar.bz2 florence-implicit-definitions.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ florence.spec ++++++ --- /var/tmp/diff_new_pack.yhkvdp/_old 2016-04-12 19:34:54.000000000 +0200 +++ /var/tmp/diff_new_pack.yhkvdp/_new 2016-04-12 19:34:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package florence # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -17,7 +17,7 @@ Name: florence -Version: 0.6.0 +Version: 0.6.3 Release: 0 Summary: Extensible scalable on-screen virtual keyboard License: GPL-2.0+ and GFDL-1.2 @@ -27,18 +27,26 @@ Source99: florence-rpmlintrc # PATCH-FIX-OPENSUSE florence-icondir.patch bnc#855529 [email protected] -- Set correct svg icon directory to not breake the application Patch0: florence-icondir.patch -BuildRequires: at-spi2-core-devel +# PATCH-FIX-UPSTREAM florence-implicit-definitions.patch sf#florence#14 [email protected] -- Fix implicit definition of function wait() +Patch1: florence-implicit-definitions.patch BuildRequires: intltool -BuildRequires: libXtst-devel -BuildRequires: librsvg2-devel +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: rarian-scrollkeeper-compat BuildRequires: update-desktop-files +BuildRequires: pkgconfig(atspi-2) +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gmodule-2.0) BuildRequires: pkgconfig(gnome-doc-utils) -BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libnotify) +BuildRequires: pkgconfig(librsvg-2.0) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xext) +BuildRequires: pkgconfig(xtst) Recommends: %{name}-lang Requires(post): glib2-tools Requires(postun): glib2-tools @@ -46,7 +54,7 @@ Requires(postun): desktop-file-utils %description -Florence is an extensible scalable virtual keyboard for GNOME. +Florence is an extensible scalable virtual keyboard for X11. You need it if you can't use a real hardware keyboard, for example because you are disabled, your keyboard is broken or because you use a tablet PC, but you must be able to use a pointing @@ -57,20 +65,44 @@ A Timer-based auto-click functionality is available to help disabled people having difficulties to click. +%package -n libflorence-1_0-1 +Summary: Library files for %{name} +Group: System/X11/Utilities + +%description -n libflorence-1_0-1 +Extensible scalable on-screen virtual keyboard. +This package contains libraries. + + +%package devel +Summary: Development files for %{name} +Group: Development/Libraries/X11 +Requires: %{name} = %{version}-%{release} + +%description devel +This package contains libraries and header files for +developing applications that use florence. + %lang_package %prep %setup -q -%patch0 sed -i 's|Icon=@ICONDIR@/%{name}.svg|Icon=%{name}|g' data/%{name}.desktop.in.in +%patch0 +%patch1 -p1 %build +autoreconf -fiv %configure \ - --disable-scrollkeeper -make %{?_smp_mflags} + --disable-scrollkeeper \ + --disable-static +# Disable parallel build, as it is broken currently. +#make %%{?_smp_mflags} +make %install %make_install +find %{buildroot} -type f -name *.la -delete %suse_update_desktop_file -r %{name} Utility Accessibility %find_lang %{name} %{?no_lang_C} @@ -78,10 +110,14 @@ %glib2_gsettings_schema_post %desktop_database_post +%post -n libflorence-1_0-1 -p /sbin/ldconfig + %postun %glib2_gsettings_schema_postun %desktop_database_postun +%postun -n libflorence-1_0-1 -p /sbin/ldconfig + %files %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING COPYING-DOCS NEWS README @@ -98,6 +134,17 @@ %{_datadir}/glib-2.0/schemas/org.%{name}.gschema.xml %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%files -n libflorence-1_0-1 +%defattr(-,root,root) +%{_libdir}/libflorence-1.0.so.* + +%files devel +%defattr(-,root,root) +%dir %{_includedir}/florence-1.0 +%{_includedir}/florence-1.0/florence.h +%{_libdir}/libflorence-1.0.so +%{_libdir}/pkgconfig/florence-1.0.pc + %files lang -f %{name}.lang %changelog ++++++ florence-0.6.0.tar.bz2 -> florence-0.6.3.tar.bz2 ++++++ ++++ 58151 lines of diff (skipped) ++++++ florence-icondir.patch ++++++ --- /var/tmp/diff_new_pack.yhkvdp/_old 2016-04-12 19:34:54.000000000 +0200 +++ /var/tmp/diff_new_pack.yhkvdp/_new 2016-04-12 19:34:54.000000000 +0200 @@ -1,17 +1,8 @@ ---- configure.orig 2013-12-15 19:55:20.788000046 +0300 -+++ configure 2013-12-15 19:55:20.816000053 +0300 -@@ -8703,7 +8703,7 @@ - - - # Files generated --ICONDIR=${prefix}/share/pixmaps -+ICONDIR=${prefix}/share/icons/hicolor/scalable/apps - if test "x$prefix" = "xNONE"; then - ICONDIR=/usr/local/share/pixmaps - fi ---- configure.ac.orig 2013-12-15 19:55:19.125000058 +0300 -+++ configure.ac 2013-12-15 19:55:19.126000054 +0300 -@@ -132,7 +132,7 @@ +Index: configure.ac +=================================================================== +--- configure.ac.orig ++++ configure.ac +@@ -131,7 +131,7 @@ AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_CHECK_FUNCS([setlocale memset memchr sscanf strcmp strrchr strchr strstr strcpy strncpy strcat atoi putenv fopen fclose fgets fputs lstat opendir readdir closedir]) # Files generated @@ -20,9 +11,11 @@ if test "x$prefix" = "xNONE"; then ICONDIR=/usr/local/share/pixmaps fi ---- data/Makefile.am.orig 2013-12-15 19:33:03.110000041 +0300 -+++ data/Makefile.am 2013-12-15 19:33:03.128000026 +0300 -@@ -13,7 +13,7 @@ +Index: data/Makefile.am +=================================================================== +--- data/Makefile.am.orig ++++ data/Makefile.am +@@ -13,7 +13,7 @@ desktop_DATA=$(desktop_in_files:.desktop $(desktop_in_files): $(desktop_in_files:.desktop.in=.desktop.in.in) sed -e "s|\@ICONDIR\@|$(ICONDIR)|" $< > $@ @@ -31,25 +24,3 @@ icons_DATA=florence.svg gtkbuilderdir=$(datadir)/florence ---- data/Makefile.in.orig 2013-12-15 19:31:57.703000027 +0300 -+++ data/Makefile.in 2013-12-15 19:31:57.716000027 +0300 -@@ -279,7 +279,7 @@ - desktopdir = $(datadir)/applications - desktop_in_files = florence.desktop.in - desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) --iconsdir = $(datadir)/pixmaps -+iconsdir = $(datadir)/icons/hicolor/scalable/apps - icons_DATA = florence.svg - gtkbuilderdir = $(datadir)/florence - gtkbuilder_DATA = florence.glade ---- data/styles/default/symbols.xml.orig 2013-12-15 19:24:07.199000014 +0300 -+++ data/styles/default/symbols.xml 2013-12-15 19:24:07.224000012 +0300 -@@ -9,7 +9,7 @@ - </symbol> - <symbol> - <name>Super_[LR]</name> -- <xi:include href="/usr/share/pixmaps/florence.svg"/> -+ <xi:include href="/usr/share/icons/hicolor/scalable/apps/florence.svg"/> - </symbol> - <symbol> - <name>(Alt_[LR]|Meta_L)</name> ++++++ florence-implicit-definitions.patch ++++++ Index: florence-0.6.3/src/controller.c =================================================================== --- florence-0.6.3.orig/src/controller.c +++ florence-0.6.3/src/controller.c @@ -46,7 +46,6 @@ void controller_icon_expose (GtkWidget * cairo_paint(context); cairo_set_operator(context, CAIRO_OPERATOR_SOURCE); style_render_svg(context, handle, w, h, FALSE, NULL); - wait(); END_FUNC }
