Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xfce4-notifyd for openSUSE:Factory checked in at 2023-10-25 18:05:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfce4-notifyd (Old) and /work/SRC/openSUSE:Factory/.xfce4-notifyd.new.24901 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xfce4-notifyd" Wed Oct 25 18:05:03 2023 rev:51 rq:1120282 version:0.9.2 Changes: -------- --- /work/SRC/openSUSE:Factory/xfce4-notifyd/xfce4-notifyd.changes 2023-10-04 22:32:33.714049264 +0200 +++ /work/SRC/openSUSE:Factory/.xfce4-notifyd.new.24901/xfce4-notifyd.changes 2023-10-25 18:05:52.916616278 +0200 @@ -1,0 +2,11 @@ +Tue Oct 24 08:34:57 UTC 2023 - Manfred Hollstein <manfre...@gmx.net> + +- Add xfce4-notifyd-relax-x11-version.patch, see boo#1216516 +- Add minimum version expected for package xdg-dev-tools. + +------------------------------------------------------------------- +Mon Oct 23 20:54:39 UTC 2023 - Andreas Stieger <andreas.stie...@gmx.de> + +- fix all packaging warnings + +------------------------------------------------------------------- New: ---- xfce4-notifyd-relax-x11-version.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfce4-notifyd.spec ++++++ --- /var/tmp/diff_new_pack.q1c68I/_old 2023-10-25 18:05:54.464668341 +0200 +++ /var/tmp/diff_new_pack.q1c68I/_new 2023-10-25 18:05:54.484669014 +0200 @@ -26,10 +26,13 @@ Source: https://archive.xfce.org/src/apps/xfce4-notifyd/0.9/%{name}-%{version}.tar.bz2 Source1: %{name}.xml Source100: %{name}-rpmlintrc +# PATCH-FIX-OPENSUSE xfce4-notifyd-relax-x11-version.patch lower required X11 version to allow building for Leap which only has 1.6.5, which is enough, though +Patch0: xfce4-notifyd-relax-x11-version.patch BuildRequires: gettext +BuildRequires: pkgconfig BuildRequires: systemd >= 245 BuildRequires: update-desktop-files -BuildRequires: xfce4-dev-tools +BuildRequires: xfce4-dev-tools >= 4.18.1 BuildRequires: pkgconfig(dbus-1) >= 1.0 BuildRequires: pkgconfig(gio-2.0) >= 2.68.0 BuildRequires: pkgconfig(gio-unix-2.0) >= 2.68.0 @@ -42,7 +45,7 @@ BuildRequires: pkgconfig(libxfce4util-1.0) >= 4.12.0 BuildRequires: pkgconfig(libxfconf-0) >= 4.10.0 BuildRequires: pkgconfig(sqlite3) >= 3.34 -BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(x11) >= 1.6.5 Requires: libnotify-tools Requires: xfce4-notifyd-branding = %{version}-%{release} Recommends: %{name}-lang = %{version}-%{release} @@ -57,9 +60,9 @@ Summary: Upstream Branding of xfce4-notifyd # BRAND: xfce4-notifyd.xml: Controls the appearance of notifications. Group: System/GUI/XFCE -Conflicts: otherproviders(xfce4-notifyd-branding) +Supplements: (xfce4-notifyd and branding-upstream) +Conflicts: xfce4-notifyd-branding = %{version} Provides: xfce4-notifyd-branding = %{version}-%{release} -Supplements: packageand(xfce4-notifyd:branding-upstream) BuildArch: noarch %description branding-upstream @@ -68,10 +71,10 @@ %lang_package %prep -%setup -q +%autosetup -p1 %build -# xdt-autogen +xdt-autogen %configure \ --with-helper-path-prefix=%{_libexecdir} \ --enable-systemd \ @@ -84,13 +87,10 @@ install -D -p -m 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml %suse_update_desktop_file -i xfce4-notifyd-config -rm %{buildroot}%{_libdir}/xfce4/panel/plugins/*.la +find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} -%clean -rm -rf %{buildroot} - %files %doc AUTHORS NEWS README.md TODO %license COPYING @@ -108,13 +108,15 @@ %{_libdir}/xfce4/panel/plugins/libnotification-plugin.so %{_datadir}/dbus-1/services/org.xfce.xfce4-notifyd.N*.service %{_datadir}/xfce4/panel/plugins/notification-plugin.desktop -%{_sysconfdir}/xdg/autostart/xfce4-notifyd.desktop +%config %{_sysconfdir}/xdg/autostart/xfce4-notifyd.desktop %{_prefix}/lib/systemd/user/xfce4-notifyd.service -%doc %{_mandir}/man1/xfce4-notifyd-config.1* +%{_mandir}/man1/xfce4-notifyd-config.1%{?ext_man} %files lang -f %{name}.lang +%license COPYING %files branding-upstream +%license COPYING %dir %{_sysconfdir}/xdg/xfce4 %dir %{_sysconfdir}/xdg/xfce4/xfconf %dir %{_sysconfdir}/xdg/xfce4/xfconf/xfce-perchannel-xml ++++++ xfce4-notifyd-relax-x11-version.patch ++++++ diff -rup a/configure.ac b/configure.ac --- a/configure.ac 2023-09-24 20:34:47.000000000 +0200 +++ b/configure.ac 2023-10-24 08:53:48.236002834 +0200 @@ -7,7 +7,7 @@ dnl Copyright (c) 2019 Simon Steinbeiss dnl m4_define([notifications_spec_version], [1.2]) -m4_define([libx11_minimum_version], [1.6.7]) +m4_define([libx11_minimum_version], [1.6.5]) m4_define([glib_minimum_version], [2.68]) m4_define([gtk_minimum_version], [3.22]) m4_define([canberra_minimum_version], [0.30]) diff -rup a/configure b/configure --- a/configure 2023-09-24 20:35:46.000000000 +0200 +++ b/configure 2023-10-24 08:54:23.119349104 +0200 @@ -19112,11 +19112,11 @@ fi if test x"$xdt_feature_deps_check_only" = x"yes"; then - if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then + if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then if test x"$xdt_feature_deps_missing" = x""; then - xdt_feature_deps_missing="x11 >= 1.6.7" + xdt_feature_deps_missing="x11 >= 1.6.5" else - xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7" + xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5" fi fi else @@ -19270,9 +19270,9 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5 -printf %s "checking for x11 >= 1.6.7... " >&6; } - if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5 +printf %s "checking for x11 >= 1.6.5... " >&6; } + if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5 printf "%s\n" "$LIBX11_VERSION" >&6; } @@ -19289,7 +19289,7 @@ printf %s "checking LIBX11_LIBS... " >&6 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5 printf "%s\n" "$LIBX11_LIBS" >&6; } - LIBX11_REQUIRED_VERSION=1.6.7 + LIBX11_REQUIRED_VERSION=1.6.5 @@ -19318,7 +19318,7 @@ printf "%s\n" "found, but $xdt_cv_versio echo "*** The required package x11 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust" + echo "*** Please upgrade x11 to atleast version 1.6.5, 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." @@ -19330,7 +19330,7 @@ printf "%s\n" "not found" >&6; } echo "*** The required package x11 was not found on your system." - echo "*** Please install x11 (atleast version 1.6.7) or adjust" + echo "*** Please install x11 (atleast version 1.6.5) 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." @@ -19580,11 +19580,11 @@ printf "%s\n" "not found" >&6; } if test x"$xdt_feature_deps_check_only" = x"yes"; then - if ! $PKG_CONFIG --exists "x11 >= 1.6.7" >/dev/null 2>&1; then + if ! $PKG_CONFIG --exists "x11 >= 1.6.5" >/dev/null 2>&1; then if test x"$xdt_feature_deps_missing" = x""; then - xdt_feature_deps_missing="x11 >= 1.6.7" + xdt_feature_deps_missing="x11 >= 1.6.5" else - xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.7" + xdt_feature_deps_missing="$xdt_feature_deps_missing, x11 >= 1.6.5" fi fi else @@ -19738,9 +19738,9 @@ fi - { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.7" >&5 -printf %s "checking for x11 >= 1.6.7... " >&6; } - if $PKG_CONFIG "--atleast-version=1.6.7" "x11" >/dev/null 2>&1; then + { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for x11 >= 1.6.5" >&5 +printf %s "checking for x11 >= 1.6.5... " >&6; } + if $PKG_CONFIG "--atleast-version=1.6.5" "x11" >/dev/null 2>&1; then LIBX11_VERSION=`$PKG_CONFIG --modversion "x11"` { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_VERSION" >&5 printf "%s\n" "$LIBX11_VERSION" >&6; } @@ -19757,7 +19757,7 @@ printf %s "checking LIBX11_LIBS... " >&6 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $LIBX11_LIBS" >&5 printf "%s\n" "$LIBX11_LIBS" >&6; } - LIBX11_REQUIRED_VERSION=1.6.7 + LIBX11_REQUIRED_VERSION=1.6.5 @@ -19786,7 +19786,7 @@ printf "%s\n" "found, but $xdt_cv_versio echo "*** The required package x11 was found on your system," echo "*** but the installed version ($xdt_cv_version) is too old." - echo "*** Please upgrade x11 to atleast version 1.6.7, or adjust" + echo "*** Please upgrade x11 to atleast version 1.6.5, 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." @@ -19798,7 +19798,7 @@ printf "%s\n" "not found" >&6; } echo "*** The required package x11 was not found on your system." - echo "*** Please install x11 (atleast version 1.6.7) or adjust" + echo "*** Please install x11 (atleast version 1.6.5) 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."
