From fa414bc265344bfa541a215d05c49bb5fd911c41ae3f5634e57ecc49594471b0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Oct 2021 09:54:29 +0000 Subject: [PATCH] Accepting request 926890 from GNOME:Next - Add gtk2-rpmlintrc (boo#1191758): + Filter wrong split request for libgdk-x11-2.0.so.0: the library shares the version info with gtk2 and is allowed to be in the same library package. + Filter libgail.so.18 split request: the error is actually correct, but gtk2 being a legacy package does not justify the extra efort. The libgtk-2_0-0 package is the only consumer. OBS-URL: https://build.opensuse.org/request/show/926890 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk2?expand=0&rev=289 --- gtk2-rpmlintrc | 5 +++++ gtk2.changes | 11 +++++++++++ gtk2.spec | 24 +++++++++++++----------- 3 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 gtk2-rpmlintrc diff --git a/gtk2-rpmlintrc b/gtk2-rpmlintrc new file mode 100644 index 0000000..ee2617a --- /dev/null +++ b/gtk2-rpmlintrc @@ -0,0 +1,5 @@ +# Legacy package, gtk2 internally is the only consumer of libgail +addFilter("shlib-policy-name-error SONAME: libgailutil.so.18"); +# rpmlint error, the library shares so-version info and is allowed in the main package +addFilter("shlib-policy-name-error SONAME: libg[dt]k-x11-2.0.so.0"); + diff --git a/gtk2.changes b/gtk2.changes index 015ef4f..5374a1e 100644 --- a/gtk2.changes +++ b/gtk2.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Oct 21 09:23:07 UTC 2021 - Dominique Leuenberger + +- Add gtk2-rpmlintrc (boo#1191758): + + Filter wrong split request for libgdk-x11-2.0.so.0: the + library shares the version info with gtk2 and is allowed to be + in the same library package. + + Filter libgail.so.18 split request: the error is actually + correct, but gtk2 being a legacy package does not justify the + extra efort. The libgtk-2_0-0 package is the only consumer. + ------------------------------------------------------------------- Tue Dec 22 16:59:43 UTC 2020 - Bjørn Lie diff --git a/gtk2.spec b/gtk2.spec index 4ec93b5..5acf68f 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -1,7 +1,7 @@ # # spec file for package gtk2 # -# Copyright (c) 2020 SUSE LLC +# 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 @@ -33,6 +33,7 @@ Source2: README.SUSE Source3: gtkrc Source4: baselibs.conf Source5: macros.gtk2 +Source99: gtk2-rpmlintrc # PATCH-FIX-OPENSUSE gtk2-GTK_PATH64.patch sbrabec@novell.com - 64-bit dual install. Use GTK_PATH64 environment variable instead of GTK_PATH Patch0: gtk2-GTK_PATH64.patch # PATCH-FEATURE-UPSTREAM bugzilla-129753-gtk+-2.8.9-localize-font-style-name.diff bnc129753 bgo319484 mfabian@novell.com - Translate the font styles in the GUI @@ -129,7 +130,7 @@ Summary: Amharic input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: locale(%{name}:am) %description immodule-amharic @@ -144,7 +145,7 @@ Summary: Inuktitut input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: locale(%{name}:iu) %description immodule-inuktitut @@ -159,7 +160,7 @@ Summary: Multipress input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 %description immodule-multipress GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -174,7 +175,7 @@ Summary: Thai-Lao input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: locale(%{name}:lo) Provides: locale(%{name}:th) @@ -190,7 +191,7 @@ Summary: Tigrigna input methods for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: %{name}-immodules-tigrigna = %{version} Provides: locale(%{name}:ti) Obsoletes: %{name}-immodules-tigrigna < %{version} @@ -207,7 +208,7 @@ Summary: Vietnamese input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: locale(%{name}:vi) %description immodule-vietnamese @@ -222,7 +223,7 @@ Summary: X input method for the GTK+ toolkit library v2 Group: System/Libraries Requires: %{name} = %{version} Requires(post): %{name}-tools >= 2.24.20 -Requires(postun): %{name}-tools >= 2.24.20 +Requires(postun):%{name}-tools >= 2.24.20 Provides: locale(%{name}:ja) Provides: locale(%{name}:ko) Provides: locale(%{name}:th) @@ -239,7 +240,7 @@ This package provides an input method based on the X Input Method. Summary: Auxiliary utilities for the GTK+ toolkit library v2 Group: System/Libraries Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives %description tools GTK+ is a multi-platform toolkit for creating graphical user interfaces. @@ -260,7 +261,7 @@ ranging from small one-off projects to complete application suites. Summary: Upstream theme configuration for the GTK+ toolkit library v2 Group: System/Libraries Requires: libgtk-2_0-0 = %{version} -Supplements: packageand(%{name}:branding-upstream) +Supplements: (%{name} and branding-upstream) Conflicts: %{name}-branding Provides: %{name}-branding = %{version} BuildArch: noarch @@ -457,6 +458,7 @@ fi %endif %postun -n libgtk-2_0-0 -p /sbin/ldconfig + %postun immodule-amharic %{_gtk_query_immodules_update_cache} @@ -488,7 +490,7 @@ fi %files -n libgtk-2_0-0 %license COPYING -%doc AUTHORS README NEWS +%doc AUTHORS NEWS %if "%{_lib}" == "lib64" %doc README.SUSE %endif