Hello community, here is the log from the commit of package exo for openSUSE:Factory checked in at 2018-02-20 17:54:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/exo (Old) and /work/SRC/openSUSE:Factory/.exo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "exo" Tue Feb 20 17:54:23 2018 rev:57 rq:577660 version:0.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/exo/exo.changes 2017-12-09 20:33:52.023318797 +0100 +++ /work/SRC/openSUSE:Factory/.exo.new/exo.changes 2018-02-20 17:54:25.599865694 +0100 @@ -1,0 +2,12 @@ +Sat Feb 17 12:07:54 UTC 2018 - seife+...@b1-systems.com + +- update to 0.12.0 (Stable Release) + * Add google-chrome-stable binary for the google-chrome helper + (bxo#13876) + * Requirements updated: GTK 2.24, GTK 3.22, GLib 2.42, + libxfce4ui 4.12, libxfce4util 4.12 + * Translation updates +- add exo-revert-gnome-3.22-req.diff for Leap < 15 to allow build +- spec-cleaner suggestions (but not the braindead ones) + +------------------------------------------------------------------- Old: ---- exo-0.11.5.tar.bz2 New: ---- exo-0.12.0.tar.bz2 exo-revert-gnome-3.22-req.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ exo.spec ++++++ --- /var/tmp/diff_new_pack.ZN320L/_old 2018-02-20 17:54:26.803822343 +0100 +++ /var/tmp/diff_new_pack.ZN320L/_new 2018-02-20 17:54:26.807822199 +0100 @@ -19,31 +19,35 @@ %define libname_gtk2 libexo-1-0 %define libname_gtk3 libexo-2-0 Name: exo -Version: 0.11.5 +Version: 0.12.0 Release: 0 Summary: Application Development Library for Xfce -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Development/Libraries/C and C++ Url: http://docs.xfce.org/xfce/exo/start -Source0: http://archive.xfce.org/src/xfce/exo/0.11/%{name}-%{version}.tar.bz2 +Source0: http://archive.xfce.org/src/xfce/exo/0.12/%{name}-%{version}.tar.bz2 # icons taken from tango-icon-theme 0.8.90 Source1: %{name}-icons.tar.bz2 +# for building on Leap 42.3 - the requirements have bumped, but the code is identical to 0.11.5 +# which was working with gnome 3.20 +Patch1: exo-revert-gnome-3.22-req.diff BuildRequires: fdupes BuildRequires: intltool BuildRequires: perl-URI +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(glib-2.0) >= 2.42 BuildRequires: pkgconfig(gtk+-2.0) >= 2.24 +# >= 3.22 BuildRequires: pkgconfig(gtk+-3.0) >= 3.20 BuildRequires: pkgconfig(gtk-doc) BuildRequires: pkgconfig(libstartup-notification-1.0) BuildRequires: pkgconfig(libxfce4ui-1) >= 4.12.0 BuildRequires: pkgconfig(libxfce4ui-2) >= 4.12.0 -BuildRequires: pkgconfig(libxfce4util-1.0) +BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12.0 # Prevent dependency cycle exo -> libxfce4ui-devel -> libxfce4ui-1-0 -> exo-tools #!BuildIgnore: exo-tools -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Exo is an extension library to Xfce which is targeted at application @@ -51,7 +55,7 @@ %package tools Summary: Tools for exo -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/GUI/XFCE Provides: exo:%{_bindir}/exo-csource Provides: exo:%{_bindir}/exo-desktop-item-edit @@ -63,7 +67,7 @@ %package data Summary: Helpers Data for exo -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/GUI/XFCE Requires: %{name}-branding = %{version} Requires: %{name}-helpers = %{version} @@ -73,7 +77,7 @@ %package helpers Summary: Helpers for exo -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/GUI/XFCE %description helpers @@ -81,7 +85,7 @@ %package -n %{libname_gtk2} Summary: Application Development Library for Xfce -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/Libraries Requires: %{name}-branding = %{version} # >= because of crazy rpmlint stuff @@ -100,7 +104,7 @@ %package -n %{libname_gtk3} Summary: Application Development Library for Xfce -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/Libraries Requires: %{name}-branding = %{version} Requires: %{name}-data >= %{version} @@ -118,7 +122,7 @@ %package devel Summary: Development Files for exo -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: Development/Libraries/C and C++ Requires: %{libname_gtk2} = %{version} Requires: %{libname_gtk3} = %{version} @@ -135,7 +139,7 @@ Supplements: packageand(%{libname_gtk2}:branding-upstream) Supplements: packageand(%{libname_gtk3}:branding-upstream) # BRAND: helpers.rc: Controls default applications and MIME handler. -Conflicts: otherproviders(%{name}-branding) +Conflicts: %{name}-branding Provides: %{libname_gtk2}-branding = %{version} Provides: exo-branding = %{version} Obsoletes: %{libname_gtk2}-branding <= 0.10.6 @@ -145,15 +149,16 @@ This package provides the upstream look and feel for the exo library. # this should be replaced by %%lang_package once bnc#513786 is resolved +# additional bug: %%lang_package will always reuire %%name, which is unwanted here %package lang Summary: Languages for package %{name} -License: GPL-2.0+ and LGPL-2.1+ +License: GPL-2.0+ AND LGPL-2.1+ Group: System/Localization Requires: %{libname_gtk2} = %{version} Requires: %{libname_gtk3} = %{version} -Provides: %{name}-lang-all = %{version} Supplements: packageand(bundle-lang-other:%{libname_gtk2}) Supplements: packageand(bundle-lang-other:%{libname_gtk3}) +Provides: %{name}-lang-all = %{version} BuildArch: noarch %description lang @@ -161,6 +166,9 @@ %prep %setup -q -b1 +%if 0%{?suse_version} < 1500 +%patch1 -p1 +%endif mkdir m4 find . -name '*.pl' -o -name exo-compose-mail-1 | \ xargs sed -i 's|^#! */usr/bin/env *\perl|#!%{_bindir}/perl|' @@ -203,13 +211,9 @@ %suse_update_desktop_file exo-web-browser %post -n %{libname_gtk2} -p /sbin/ldconfig - %postun -n %{libname_gtk2} -p /sbin/ldconfig - %post -n %{libname_gtk3} -p /sbin/ldconfig - %postun -n %{libname_gtk3} -p /sbin/ldconfig - %post tools %icon_theme_cache_post %desktop_database_post @@ -219,7 +223,6 @@ %desktop_database_postun %files tools -%defattr(-,root,root) %{_bindir}/exo-csource %{_bindir}/exo-desktop-item-edit %{_bindir}/exo-open @@ -234,7 +237,6 @@ %{_datadir}/icons/hicolor/*/*/* %files data -%defattr(-,root,root) %dir %{_datadir}/xfce4 %{_datadir}/xfce4/helpers # frame image directly used by the library @@ -250,20 +252,16 @@ %{_libdir}/xfce4/exo-1/exo-helper-1 %files lang -f exo-1.lang -%defattr(-,root,root) %files -n %{libname_gtk2} -%defattr(-,root,root) %doc README NEWS COPYING COPYING.LIB AUTHORS THANKS TODO %{_libdir}/libexo-1.so.* %files -n %{libname_gtk3} -%defattr(-,root,root) %doc README NEWS COPYING COPYING.LIB AUTHORS THANKS TODO %{_libdir}/libexo-2.so.* %files devel -%defattr(-,root,root) %{_includedir}/exo-1 %{_includedir}/exo-2 %{_libdir}/libexo*.so @@ -271,7 +269,6 @@ %{_datadir}/gtk-doc/html/exo-1/ %files branding-upstream -%defattr(-,root,root) %dir %{_sysconfdir}/xdg/xfce4 %config %{_sysconfdir}/xdg/xfce4/helpers.rc ++++++ exo-0.11.5.tar.bz2 -> exo-0.12.0.tar.bz2 ++++++ ++++ 46991 lines of diff (skipped) ++++++ exo-revert-gnome-3.22-req.diff ++++++ diff --git a/configure b/configure index 6cfbfa7..cc15d47 100755 --- a/configure +++ b/configure @@ -15998,9 +15998,9 @@ fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.22.0" >&5 -$as_echo_n "checking for gtk+-3.0 >= 3.22.0... " >&6; } - if $PKG_CONFIG "--atleast-version=3.22.0" "gtk+-3.0" >/dev/null 2>&1; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.20.0" >&5 +$as_echo_n "checking for gtk+-3.0 >= 3.20.0... " >&6; } + if $PKG_CONFIG "--atleast-version=3.20.0" "gtk+-3.0" >/dev/null 2>&1; then GTK3_VERSION=`$PKG_CONFIG --modversion "gtk+-3.0"` { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_VERSION" >&5 $as_echo "$GTK3_VERSION" >&6; } @@ -16017,7 +16017,7 @@ $as_echo_n "checking GTK3_LIBS... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK3_LIBS" >&5 $as_echo "$GTK3_LIBS" >&6; } - GTK3_REQUIRED_VERSION=3.22.0 + GTK3_REQUIRED_VERSION=3.20.0 @@ -16033,7 +16033,7 @@ $as_echo "found, but $xdt_cv_version" >&6; } echo "*** The required package gtk+-3.0 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade gtk+-3.0 to atleast version 3.22.0, or adjust" + echo "*** Please upgrade gtk+-3.0 to atleast version 3.20.0, or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you installed" echo "*** the new version of the package in a nonstandard prefix so" echo "*** pkg-config is able to find it." @@ -16045,7 +16045,7 @@ $as_echo "not found" >&6; } echo "*** The required package gtk+-3.0 was not found on your system." - echo "*** Please install gtk+-3.0 (atleast version 3.22.0) or adjust" + echo "*** Please install gtk+-3.0 (atleast version 3.20.0) or adjust" echo "*** the PKG_CONFIG_PATH environment variable if you" echo "*** installed the package in a nonstandard prefix so that" echo "*** pkg-config is able to find it." diff --git a/configure.ac b/configure.ac index 0de5ceb..388a834 100644 --- a/configure.ac +++ b/configure.ac @@ -171,7 +171,7 @@ dnl *********************************** XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0]) +XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0]) XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0])
