Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rpmlint for openSUSE:Factory checked in at 2024-10-17 18:38:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rpmlint (Old) and /work/SRC/openSUSE:Factory/.rpmlint.new.19354 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rpmlint" Thu Oct 17 18:38:46 2024 rev:486 rq:1208449 version:2.6.1+git20241016.ae941eb7 Changes: -------- --- /work/SRC/openSUSE:Factory/rpmlint/rpmlint.changes 2024-09-22 11:05:21.898978508 +0200 +++ /work/SRC/openSUSE:Factory/.rpmlint.new.19354/rpmlint.changes 2024-10-17 18:39:08.593774397 +0200 @@ -1,0 +2,7 @@ +Wed Oct 16 12:47:08 UTC 2024 - matthias.gerstner@suse.com + +- Update to version 2.6.1+git20241016.ae941eb7: + * dbus-services: adjust gnome-remote-desktop to version 47 (bsc#1230406) + * Add new warning about the usage of %suse_update_desktop_file + +------------------------------------------------------------------- Old: ---- rpmlint-2.6.1+git20240918.5cb5647.tar.xz New: ---- rpmlint-2.6.1+git20241016.ae941eb7.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpmlint.spec ++++++ --- /var/tmp/diff_new_pack.Yu72zU/_old 2024-10-17 18:39:09.453810465 +0200 +++ /var/tmp/diff_new_pack.Yu72zU/_new 2024-10-17 18:39:09.457810633 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rpmlint +# spec file # # Copyright (c) 2024 SUSE LLC # @@ -23,7 +23,7 @@ %define name_suffix -%{flavor} %endif Name: rpmlint%{name_suffix} -Version: 2.6.1+git20240918.5cb5647 +Version: 2.6.1+git20241016.ae941eb7 Release: 0 Summary: RPM file correctness checker License: GPL-2.0-or-later ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Yu72zU/_old 2024-10-17 18:39:09.517813149 +0200 +++ /var/tmp/diff_new_pack.Yu72zU/_new 2024-10-17 18:39:09.521813317 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/rpm-software-management/rpmlint.git</param> - <param name="changesrevision">5cb56478d963a538fc72efce6d9f9ceede0d632c</param></service></servicedata> + <param name="changesrevision">ae941eb7a870b80c2bafb9b01a65c1c8208252e4</param></service></servicedata> (No newline at EOF) ++++++ rpmlint-2.6.1+git20240918.5cb5647.tar.xz -> rpmlint-2.6.1+git20241016.ae941eb7.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/configs/openSUSE/dbus-services.toml new/rpmlint-2.6.1+git20241016.ae941eb7/configs/openSUSE/dbus-services.toml --- old/rpmlint-2.6.1+git20240918.5cb5647/configs/openSUSE/dbus-services.toml 2024-09-18 14:15:47.000000000 +0200 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/configs/openSUSE/dbus-services.toml 2024-10-16 14:44:33.000000000 +0200 @@ -1370,16 +1370,20 @@ [[FileDigestGroup]] package = "gnome-remote-desktop" note = "system wide remote desktop access to the display manager" -bug = "bsc#1222159" +bugs = ["bsc#1222159", "bsc#1230406"] type = "dbus" [[FileDigestGroup.digests]] path = "/usr/share/dbus-1/system.d/org.gnome.RemoteDesktop.conf" digester = "xml" -hash = "5ed8492b7b77bf77beba04b5eb989a028cc90ac193eb598b102189b8374a9c5d" +hash = "d28ae537328593ac6462af9ec6bab63c49f9a6851190e7a4f13fe8dd48fd88b6" [[FileDigestGroup.digests]] path = "/usr/share/dbus-1/system-services/org.gnome.RemoteDesktop.service" digester = "shell" hash = "1053fce12e03e219ff4518c8498b3ce1983597961afcefa93be25005414a50d8" +[[FileDigestGroup.digests]] +path = "/usr/share/dbus-1/system-services/org.gnome.RemoteDesktop.Configuration.service" +digester = "shell" +hash = "ecc8ae6fe29a9ddc6c1f598c8558245b16d8280cd99caecc3ab268c428e1f8ff" [[FileDigestGroup]] package = "kdeplasma6-addons" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/checks/SpecCheck.py new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/checks/SpecCheck.py --- old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/checks/SpecCheck.py 2024-09-18 14:15:47.000000000 +0200 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/checks/SpecCheck.py 2024-10-16 14:44:33.000000000 +0200 @@ -85,6 +85,10 @@ python_module_def_regex = re.compile(r'^[^#]*%{\?!python_module:%define python_module()') python_sitelib_glob_regex = re.compile(r'^[^#]*%{python_site(lib|arch)}/\*\s*$') +# %suse_update_desktop_file deprecation +# https://lists.opensuse.org/archives/list/packaging@lists.opensuse.org/messag... +suse_update_desktop_file_regex = re.compile(r'^BuildRequires:\s*update-desktop-files', re.IGNORECASE) + UNICODE_NBSP = '\xa0' @@ -698,6 +702,7 @@ self._checkline_package_conflicts(line) self._checkline_forbidden_controlchars(line) + self._check_suse_update_desktop_file(line) def _checkline_changelog(self, line): if self.current_section == 'changelog': @@ -802,3 +807,13 @@ # https://github.com/rpm-software-management/rpmlint/issues/1067 if Pkg.has_forbidden_controlchars(line): self.output.add_info('W', self.pkg, 'forbidden-controlchar-found') + + def _check_suse_update_desktop_file(self, line): + """ + Test if update-desktop-files is in BuildRequires. The usage of + %suse_update_desktop_file is deprecated now. + """ + if suse_update_desktop_file_regex.match(line): + self.output.add_info('W', self.pkg, + 'suse-update-desktop-file-deprecated', + '%suse_update_desktop_file is deprecated') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/descriptions/SpecCheck.toml new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/descriptions/SpecCheck.toml --- old/rpmlint-2.6.1+git20240918.5cb5647/rpmlint/descriptions/SpecCheck.toml 2024-09-18 14:15:47.000000000 +0200 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/rpmlint/descriptions/SpecCheck.toml 2024-10-16 14:44:33.000000000 +0200 @@ -225,3 +225,6 @@ The specfile contains a comparison of %suse_version against a suse release that does not exist. Please double check. """ +suse-update-desktop-file-deprecated=""" +The usage of %suse_update_desktop_file is deprecated and should not be used. +""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/gimp.spec new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/gimp.spec --- old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/gimp.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/gimp.spec 2024-10-16 14:44:33.000000000 +0200 @@ -0,0 +1,374 @@ +# +# spec file for package gimp +# +# Copyright (c) 2021 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%global abiver 4 +%global apiver 2.0 +%global gegl_version 0.4.38 + +%if 0%{?suse_version} >= 1550 +%bcond_without libheif +%else +%bcond_with libheif +%endif + +%if 0%{?sle_version} +%bcond_with python_plugin +%else +%bcond_without python_plugin +%endif +Name: gimp +Version: 2.10.38 +Release: 0 +Summary: The GNU Image Manipulation Program +License: GPL-3.0-or-later +Group: Productivity/Graphics/Bitmap Editors +URL: https://www.gimp.org/ +Source: https://download.gimp.org/pub/gimp/v2.10/%{name}-%{version}.tar.bz2 +Source1: macros.gimp +# openSUSE palette file +Source2: openSUSE.gpl +# PATCH-FIX-UPSTREAM fix-gcc14-build.patch bsc#1223892 +Patch0: fix-gcc14-build.patch + +BuildRequires: aalib-devel +BuildRequires: alsa-devel >= 1.0.0 +BuildRequires: fdupes +BuildRequires: fontconfig-devel >= 2.12.4 +BuildRequires: gcc-c++ +BuildRequires: gdk-pixbuf-loader-rsvg +# For some odd reason build needs gegl executable. +BuildRequires: gegl >= %{gegl_version} +BuildRequires: ghostscript-devel +# Explicitly needed, otherwise ghostscript-mini is used during the +# build, and it's not enough for gimp. +BuildRequires: ghostscript-library +BuildRequires: glib-networking +BuildRequires: intltool >= 0.40.1 +BuildRequires: libtiff-devel +BuildRequires: libwmf-devel >= 0.2.8 +BuildRequires: libxslt-tools +BuildRequires: libjxl-devel >= 0.7.0 +BuildRequires: pkgconfig +%if %{with python_plugin} +BuildRequires: python-gtk-devel >= 2.10.4 +%endif +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(atk) >= 2.2.0 +BuildRequires: (pkgconfig(babl) or pkgconfig(babl-0.1)) +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(cairo) >= 1.12.2 +BuildRequires: pkgconfig(cairo-pdf) >= 1.12.2 +BuildRequires: pkgconfig(dbus-glib-1) >= 0.70 +BuildRequires: pkgconfig(gdk-pixbuf-2.0) >= 2.30.8 +BuildRequires: pkgconfig(gegl-0.4) >= %{gegl_version} +BuildRequires: pkgconfig(gexiv2) >= 0.10.6 +BuildRequires: pkgconfig(glib-2.0) >= 2.56.2 +BuildRequires: pkgconfig(gtk+-2.0) >= 2.24.32 +BuildRequires: pkgconfig(gudev-1.0) >= 167 +BuildRequires: pkgconfig(harfbuzz) >= 0.9.19 +BuildRequires: pkgconfig(iso-codes) +BuildRequires: pkgconfig(json-glib-1.0) >= 1.2.6 +BuildRequires: pkgconfig(lcms2) >= 2.8 +BuildRequires: pkgconfig(libexif) >= 0.6.15 +%if %{with libheif} +BuildRequires: pkgconfig(libheif) >= 1.3.2 +%endif +BuildRequires: pkgconfig(libjpeg) +BuildRequires: pkgconfig(liblzma) >= 5.0.0 +BuildRequires: pkgconfig(libmng) +BuildRequires: pkgconfig(libmypaint) >= 1.3.0 +BuildRequires: pkgconfig(libopenjp2) >= 2.1.0 +BuildRequires: pkgconfig(libpng) >= 1.6.25 +BuildRequires: pkgconfig(librsvg-2.0) >= 2.40.6 +BuildRequires: pkgconfig(libunwind) +BuildRequires: pkgconfig(libwebp) >= 0.6.0 +BuildRequires: pkgconfig(xmu) +BuildRequires: pkgconfig(mypaint-brushes-1.0) +BuildRequires: pkgconfig(OpenEXR) >= 1.6.1 +BuildRequires: pkgconfig(pango) >= 1.29.4 +BuildRequires: pkgconfig(poppler-data) >= 0.4.7 +BuildRequires: pkgconfig(poppler-glib) >= 0.44.0 +BuildRequires: pkgconfig(libtiff-4) +BuildRequires: pkgconfig(xcursor) +BuildRequires: pkgconfig(xfixes) +BuildRequires: pkgconfig(xpm) +BuildRequires: pkgconfig(zlib) +BuildRequires: xdg-utils +# obs does not automaticaly add this +Requires: libglib-2_0-0 >= 2.54.2 +Requires: libgexiv2-2 >= 0.10.6 +Requires: libbabl-0_1-0 >= 0.1.78 +# Explicitly declare the libgimp versions for upgrade purposes +Requires: libgimp-2_0-0 = %{version} +Requires: libgimpui-2_0-0 = %{version} +Requires: xdg-utils +Recommends: iso-codes +Suggests: AdobeICCProfiles +Suggests: gimp-2.0-scanner-plugin +Obsoletes: %{name}-help-browser +Provides: gimp-2.0 = %{version} +Provides: gimp(abi) = %{abiver} +Provides: gimp(api) = %{apiver} + +%description +The GIMP is an image composition and editing program, which can be +used for creating logos and other graphics for Web pages. The GIMP +offers many tools and filters, and provides a large image +manipulation toolbox, including channel operations and layers, +effects, subpixel imaging and antialiasing, and conversions, together +with multilevel undo. The GIMP offers a scripting facility, but many +of the included scripts rely on fonts that we cannot distribute. + +%package -n libgimp-2_0-0 +Summary: The GNU Image Manipulation Program - Libraries +Group: System/Libraries +%requires_ge libbabl-0_1-0 +%requires_ge libgegl-0_4-0 + +%description -n libgimp-2_0-0 +The GIMP is an image composition and editing program. GIMP offers +many tools and filters, and provides a large image manipulation +toolbox and scripting. + +This package provides GIMP libraries. + +%package -n libgimpui-2_0-0 +Summary: The GNU Image Manipulation Program - UI Libraries +Group: System/Libraries + +%description -n libgimpui-2_0-0 +The GIMP is an image composition and editing program. GIMP offers +many tools and filters, and provides a large image manipulation +toolbox and scripting. + +This package provides GIMP UI libraries. + +%if %{with python_plugin} +%package plugins-python +Summary: The GNU Image Manipulation Program - python-gtk based plugins +Group: Productivity/Graphics/Bitmap Editors +Requires: %{name} = %{version} +Requires: python-gtk +Recommends: python-xml +Provides: gimp-2.0-plugins-python = %{version} +Obsoletes: gimp-unstable-plugins-python < 2.6.0 +# For update from <= 10.3 and SLED 10: +Provides: %{name}:%{_libdir}/gimp/2.0/plug-ins/pyconsole.py = %{version} + +%description plugins-python +The GIMP is an image composition and editing program. GIMP offers +many tools and filters, and provides a large image manipulation +toolbox and scripting. +%endif + +%package plugin-aa +Summary: The GNU Image Manipulation Program -- ASCII-Art output plugin +Group: Productivity/Graphics/Bitmap Editors +Requires: %{name} = %{version} +# Let's trigger automatic installation if the user already has libaa installed. +Supplements: packageand(%{name}:libaa1) + +%description plugin-aa +The GIMP is an image composition and editing program. GIMP offers +many tools and filters, and provides a large image manipulation +toolbox and scripting. + +%package devel +Summary: The GNU Image Manipulation Program +Group: Development/Libraries/Other +Requires: libgimp-2_0-0 = %{version} +Requires: libgimpui-2_0-0 = %{version} +Provides: gimp-2.0-devel = %{version} +Provides: gimp-doc = 2.6.4 +Obsoletes: gimp-doc < 2.6.4 +Obsoletes: gimp-unstable-devel < 2.6.0 + +%description devel +The GIMP is an image composition and editing program. GIMP offers +many tools and filters, and provides a large image manipulation +toolbox and scripting. + +This subpackage contains libraries and header files for developing +applications that want to make use of the GIMP libraries. + +%lang_package + +%prep +%autosetup -p1 + +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 +# Safety check for ABI version change. +vabi=`printf "%d" $(sed -n '/#define GIMP_MODULE_ABI_VERSION/{s/.* //;p}' libgimpmodule/gimpmodule.h)` +if test "x${vabi}" != "x%{abiver}"; then + : Error: Upstream ABI version is now ${vabi}, expecting %{abiver}. + : Update the apiver macro and rebuild. + exit 1 +fi +# Safety check for API version change. +vapi=`sed -n '/#define GIMP_API_VERSION/{s/.* //;p}' libgimpbase/gimpversion.h | sed -e 's@"@@g'` +if test "x${vapi}" != "x%{apiver}"; then + : Error: Upstream API version is now ${vapi}, expecting %{apiver}. + : Update the apiver macro and rebuild. + exit 1 +fi + +%build +export LC_ALL=en_US.UTF-8 +export LANG=en_US.UTF-8 +export CFLAGS="%{optflags} -fno-strict-aliasing" +%configure \ + --disable-silent-rules \ + --disable-static\ + --without-webkit\ + --with-lcms=lcms2\ + %{!?with_python_plugin:--disable-python} \ + --libexecdir=%{_libexecdir}\ + --enable-default-binary\ + --disable-check-update\ + --enable-mp + +%make_build + +%install +%make_install +install -D -m 0644 %{SOURCE2} %{buildroot}%{_datadir}/gimp/2.0/palettes +%suse_update_desktop_file -N GIMP gimp +rm %{buildroot}%{_libdir}/gimp/2.0/*/*.*a +%find_lang gimp20 %{?no_lang_C} +%find_lang gimp20-libgimp %{?no_lang_C} gimp20.lang +%find_lang gimp20-python %{?no_lang_C} gimp20.lang +%find_lang gimp20-script-fu %{?no_lang_C} gimp20.lang +%find_lang gimp20-std-plug-ins %{?no_lang_C} gimp20.lang +echo "%%defattr(-,root,root)" >plugins.list +echo "%%defattr(-,root,root)" >plugins-python.list +for PLUGIN in %{buildroot}%{_libdir}/gimp/2.0/plug-ins/* ; do + if grep -qr '^#!.*python' $PLUGIN ; then + echo "${PLUGIN#%{buildroot}}" >>plugins-python.list + else + echo "${PLUGIN#%{buildroot}}" >>plugins.list + fi +done +find %{buildroot} -type f -name "*.la" -delete -print +# Install the macros file: +install -d %{buildroot}%{_rpmmacrodir} +sed -e "s/@GIMP_APIVER@/%{apiver}/;s/@GIMP_ABIVER@/%{abiver}/" \ + < $RPM_SOURCE_DIR/macros.gimp > macros.gimp +install -m 644 -c macros.gimp \ + %{buildroot}%{_rpmmacrodir}/macros.gimp +%fdupes %{buildroot}%{_datadir}/gtk-doc/ +%fdupes %{buildroot}%{_libdir}/gimp/2.0/python/ +%fdupes %{buildroot}%{_datadir}/gimp/2.0/ + +%post -n libgimp-2_0-0 -p /sbin/ldconfig +%postun -n libgimp-2_0-0 -p /sbin/ldconfig +%post -n libgimpui-2_0-0 -p /sbin/ldconfig +%postun -n libgimpui-2_0-0 -p /sbin/ldconfig + +%files -f plugins.list +%license COPYING LICENSE +%doc AUTHORS ChangeLog NEWS* README +%{_bindir}/gimp +%{_bindir}/gimp-2.* +%{_bindir}/gimp-console +%{_bindir}/gimp-console-2.* +# should this maybe be in _libexecdir too? +%{_bindir}/gimp-test-clipboard-2.0 +%{_libexecdir}/gimp-debug-tool-2.0 +%dir %{_datadir}/metainfo +%{_datadir}/metainfo/gimp-data-extras.metainfo.xml +%{_datadir}/metainfo/org.gimp.GIMP.appdata.xml +%{_datadir}/applications/gimp.desktop +%{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/gimp/ +%{_datadir}/gimp/2.0/images/gimp-splash.png +%{_libdir}/gimp/2.0/environ/default.env +%{_libdir}/gimp/2.0/interpreters/default.interp +# Explicitly list modules so we don't lose one by accident +%{_libdir}/gimp/2.0/modules/libcolor-selector-cmyk.so +%{_libdir}/gimp/2.0/modules/libcolor-selector-water.so +%{_libdir}/gimp/2.0/modules/libcolor-selector-wheel.so +%{_libdir}/gimp/2.0/modules/libcontroller-linux-input.so +%{_libdir}/gimp/2.0/modules/libcontroller-midi.so +%{_libdir}/gimp/2.0/modules/libdisplay-filter-color-blind.so +%{_libdir}/gimp/2.0/modules/libdisplay-filter-gamma.so +%{_libdir}/gimp/2.0/modules/libdisplay-filter-high-contrast.so +%{_libdir}/gimp/2.0/modules/libdisplay-filter-clip-warning.so +%{_mandir}/man?/gimp.* +%{_mandir}/man?/gimp-2.* +%{_mandir}/man?/gimp-console.* +%{_mandir}/man?/gimp-console-2.* +%{_mandir}/man?/gimprc.* +%{_mandir}/man?/gimprc-2.* +%{_mandir}/man?/gimptool-2.* +%dir %{_sysconfdir}/gimp +%dir %{_sysconfdir}/gimp/2.0 +%config %{_sysconfdir}/gimp/2.0/*rc +# split file-aa into own package (bnc#851509 +%exclude %{_libdir}/gimp/2.0/plug-ins/file-aa + +%files plugin-aa +%{_libdir}/gimp/2.0/plug-ins/file-aa + +%files -n libgimp-2_0-0 +%dir %{_datadir}/gimp +%dir %{_datadir}/gimp/2.0 +%dir %{_libdir}/gimp +%dir %{_libdir}/gimp/2.0 +%dir %{_libdir}/gimp/2.0/environ +%dir %{_libdir}/gimp/2.0/interpreters +%dir %{_libdir}/gimp/2.0/modules +%dir %{_libdir}/gimp/2.0/plug-ins +%{_libdir}/libgimp-2.0.so.* +%{_libdir}/libgimpbase-2.0.so.* +%{_libdir}/libgimpcolor-2.0.so.* +%{_libdir}/libgimpconfig-2.0.so.* +%{_libdir}/libgimpmath-2.0.so.* +%{_libdir}/libgimpmodule-2.0.so.* + +%files -n libgimpui-2_0-0 +%{_libdir}/libgimpthumb-2.0.so.* +%{_libdir}/libgimpui-2.0.so.* +%{_libdir}/libgimpwidgets-2.0.so.* + +%if %{with python_plugin} +%files plugins-python -f plugins-python.list +%{_libdir}/gimp/2.0/environ/pygimp.env +%{_libdir}/gimp/2.0/interpreters/pygimp.interp +%{_libdir}/gimp/2.0/python/ +# FIXME: Maybe split gimp-lang and gimp-plugins-python-lang +%endif + +%files lang -f gimp20.lang + +%files devel +%doc README.i18n +%{_bindir}/gimptool-2.0 +#{_mandir}/man?/gimptool-2.0%%{?ext_man} +%{_includedir}/gimp-2.0/ +%{_libdir}/*.so +%{_datadir}/aclocal/gimp-2.0.m4 +%{_libdir}/pkgconfig/gimp-2.0.pc +%{_libdir}/pkgconfig/gimpthumb-2.0.pc +%{_libdir}/pkgconfig/gimpui-2.0.pc +# Own these repositories to not depend on gtk-doc while building: +%dir %{_datadir}/gtk-doc +%{_datadir}/gtk-doc/html/ +%{_rpmmacrodir}/macros.gimp + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/libcanberra.spec new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/libcanberra.spec --- old/rpmlint-2.6.1+git20240918.5cb5647/test/spec/libcanberra.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/spec/libcanberra.spec 2024-10-16 14:44:33.000000000 +0200 @@ -0,0 +1,311 @@ +# +# spec file for package libcanberra +# +# Copyright (c) 2024 SUSE LLC +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%define debug_package_requires libcanberra0 = %{version}-%{release} +Name: libcanberra +Version: 0.30 +Release: 0 +Summary: Portable sound event library +License: LGPL-2.0-or-later +Group: Development/Libraries/GNOME +URL: http://0pointer.de/lennart/projects/libcanberra +Source: http://0pointer.de/lennart/projects/libcanberra/%{name}-%{version}.tar.xz +Source1: libcanberra-gtk-module.sh +Source99: baselibs.conf +# PATCH-FIX-UPSTREAM libcanberra-multi-backend.patch boo#753243 fdo#51662 dimstar@opensuse.org -- Set the multi backend as default and allow it actually to work. +Patch0: libcanberra-multi-backend.patch +# PATCH-FIX-UPSTREAM libcanberra-broadway-fix.patch boo#789066 michael.meeks@suse.com +Patch1: libcanberra-broadway-fix.patch +BuildRequires: gtk-doc +BuildRequires: libltdl-devel +BuildRequires: pkgconfig +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(alsa) +BuildRequires: pkgconfig(glib-2.0) >= 2.32 +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libpulse) >= 0.9.11 +BuildRequires: pkgconfig(libudev) >= 160 +BuildRequires: pkgconfig(vorbisfile) +BuildRequires: pkgconfig(x11) + +%description +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +%package -n libcanberra0 +Summary: Portable sound event library +Group: System/Libraries +Requires: libpulse0 >= 0.9.11 + +%description -n libcanberra0 +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains the main library. + +%package gtk0 +Summary: Portable sound event library -- GTK+ 2 Library +Group: System/Libraries + +%description gtk0 +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains a library to make it easier to use +libcanberra from GTK+ 2 applications. + +%package gtk3-0 +Summary: Portable sound event library -- GTK+ 3 Library +Group: System/Libraries + +%description gtk3-0 +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains a library to make it easier to use +libcanberra from GTK+ 3 applications. + +%package gtk-module-common +Summary: Portable sound event library -- Common Files for GTK+ Modules +Group: System/Libraries + +%description gtk-module-common +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains files common to both the GTK+ 2 and GTK+ 3 +modules. + +%package gtk2-module +Summary: Portable sound event library -- GTK+ 2 Module +Group: System/Libraries +Requires: %{name}-gtk-module-common = %{version} +Supplements: (libcanberra0 and gtk2) + +%description gtk2-module +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains a GTK+ 2 module that triggers input feedback +event sounds. + +%package gtk3-module +Summary: Portable sound event library -- GTK+ 3 Module +Group: System/Libraries +Requires: %{name}-gtk-module-common = %{version} +Supplements: (libcanberra0 and gtk3) + +%description gtk3-module +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package contains a GTK+ 3 module that triggers input feedback +event sounds. + +%package -n canberra-gtk-play +Summary: Utilities from libcanberra +Group: System/GUI/GNOME +Provides: %{name}-gtk = %{version} +Obsoletes: %{name}-gtk < %{version} + +%description -n canberra-gtk-play +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package provides the canberra-gtk-play utility. + +%package -n canberra-gtk-play-gnome +Summary: .desktop links for the canberra-gtk-play utility +# Disable supplements as we do not want it installed by default. +# This package contains a ready sound for gdm +#Supplements: gdm +# This package contains login/logout sound for GNOME. +#Supplements: gnome-session +Group: System/GUI/GNOME +Provides: %{name}-gtk-gnome = %{version} +Obsoletes: %{name}-gtk-gnome < %{version} + +%description -n canberra-gtk-play-gnome +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package provides the canberra-gtk-play .desktop files for the +gnome-desktop and gdm. +Currently there are no desktop-login, desktop-logout or +session-ready sounds in the freedesktop sound theme, so installing +this will require a different sound-theme for it to be operational. + +%package devel +Summary: Development files for libcanberra, a portable sound event library +Group: Development/Libraries/C and C++ +Requires: libcanberra0 = %{version} + +%description devel +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package provides the development files for libcanberra. + +%package -n libcanberra-gtk3-devel +Summary: GTK+ 3 development files for libcanberra +Group: Development/Libraries/C and C++ +Requires: libcanberra-devel +Requires: libcanberra-gtk3-0 = %{version} +Requires: libcanberra0 = %{version} + +%description -n libcanberra-gtk3-devel +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package provides the development files for libcanberra-gtk3. + +%package -n libcanberra-gtk-devel +Summary: GTK+ 2 development files for libcanberra +Group: Development/Libraries/C and C++ +Requires: libcanberra-devel +Requires: libcanberra-gtk0 = %{version} +Requires: libcanberra0 = %{version} + +%description -n libcanberra-gtk-devel +libcanberra is an implementation of the XDG Sound Theme and Name +Specifications, for generating event sounds on free desktops, such +as GNOME. It comes with several backends (ALSA, PulseAudio, null) +and is designed to be portable. + +This package provides the development files for libcanberra-gtk2. + +%prep +%autosetup -p1 +cp %{SOURCE1} libcanberra-gtk-module.sh + +%build +%configure \ + --disable-static \ + --enable-pulse \ + --enable-alsa \ + --enable-null \ + --disable-oss \ + --enable-udev \ + --with-builtin=dso +make %{?_smp_mflags} V=1 + +%install +%make_install +install -Dpm 0755 libcanberra-gtk-module.sh \ + %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +rm %{buildroot}%{_datadir}/doc/libcanberra/README + +%suse_update_desktop_file %{buildroot}%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop +%suse_update_desktop_file %{buildroot}%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop + +find %{buildroot} -type f -name "*.la" -delete -print + +%post -n libcanberra0 -p /sbin/ldconfig +%postun -n libcanberra0 -p /sbin/ldconfig +%post gtk0 -p /sbin/ldconfig +%postun gtk0 -p /sbin/ldconfig +%post gtk3-0 -p /sbin/ldconfig +%postun gtk3-0 -p /sbin/ldconfig + +%files -n libcanberra0 +%doc README +%license LGPL +%{_libdir}/libcanberra.so.* +%dir %{_libdir}/libcanberra-%{version}/ +%{_libdir}/libcanberra-%{version}/libcanberra-alsa.so +%{_libdir}/libcanberra-%{version}/libcanberra-multi.so +%{_libdir}/libcanberra-%{version}/libcanberra-null.so +%{_libdir}/libcanberra-%{version}/libcanberra-pulse.so + +%files gtk0 +%{_libdir}/libcanberra-gtk.so.* + +%files gtk3-0 +%{_libdir}/libcanberra-gtk3.so.* + +%files gtk-module-common +%{_bindir}/canberra-boot +%dir %{_sysconfdir}/X11/xinit/ +%dir %{_sysconfdir}/X11/xinit/xinitrc.d/ +%{_sysconfdir}/X11/xinit/xinitrc.d/libcanberra-gtk-module.sh +%dir %{_libdir}/gnome-settings-daemon-3.0/ +%dir %{_libdir}/gnome-settings-daemon-3.0/gtk-modules/ +%{_libdir}/gnome-settings-daemon-3.0/gtk-modules/canberra-gtk-module.desktop + +%files gtk2-module +%{_libdir}/gtk-2.0/modules/libcanberra-gtk-module.so + +%files gtk3-module +%{_libdir}/gtk-3.0/modules/libcanberra-gtk*-module.so + +%files -n canberra-gtk-play +%{_bindir}/canberra-gtk-play + +%files -n canberra-gtk-play-gnome +%dir %{_datadir}/gnome/ +%dir %{_datadir}/gnome/autostart/ +%{_datadir}/gnome/autostart/libcanberra-login-sound.desktop +%dir %{_datadir}/gnome/shutdown/ +%{_datadir}/gnome/shutdown/libcanberra-logout-sound.sh +%dir %{_datadir}/gdm/ +%dir %{_datadir}/gdm/autostart/ +%dir %{_datadir}/gdm/autostart/LoginWindow/ +%{_datadir}/gdm/autostart/LoginWindow/libcanberra-ready-sound.desktop + +%files -n libcanberra-gtk-devel +%{_libdir}/libcanberra-gtk.so +%{_libdir}/pkgconfig/libcanberra-gtk.pc + +%files -n libcanberra-gtk3-devel +%{_libdir}/libcanberra-gtk3.so +%{_libdir}/pkgconfig/libcanberra-gtk3.pc + +%files devel +%doc %{_datadir}/gtk-doc/html/libcanberra/ +%{_includedir}/canberra.h +%{_includedir}/canberra-gtk.h +%{_libdir}/libcanberra.so +%{_libdir}/pkgconfig/libcanberra.pc +%dir %{_datadir}/vala/ +%dir %{_datadir}/vala/vapi/ +%{_datadir}/vala/vapi/*.vapi + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpmlint-2.6.1+git20240918.5cb5647/test/test_speccheck.py new/rpmlint-2.6.1+git20241016.ae941eb7/test/test_speccheck.py --- old/rpmlint-2.6.1+git20240918.5cb5647/test/test_speccheck.py 2024-09-18 14:15:47.000000000 +0200 +++ new/rpmlint-2.6.1+git20241016.ae941eb7/test/test_speccheck.py 2024-10-16 14:44:33.000000000 +0200 @@ -1234,3 +1234,16 @@ out = output.print_results(output.results) assert 'W: macro-in-comment %configure' in out assert 'W: macro-in-comment %{name}' not in out + + +@pytest.mark.parametrize('spec,expected', [ + ('spec/gimp', True), + ('spec/libcanberra', True), + ('spec/MacroInComment', False), + ('spec/ghc', False), +]) +def test_deprecated_suse_update_desktop_files(spec, expected, output, test): + package = get_tested_spec_package(spec) + test.check_spec(package) + out = output.print_results(output.results) + assert ('W: suse-update-desktop-file-deprecated' in out) == expected