From bb6dbd889adce4f4a0d5b52b7dc711f6b139dd53c426fd13c67e24522d5013b4 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Mon, 25 Oct 2021 18:31:05 +0000 Subject: [PATCH 1/2] Accepting request 927301 from home:EGDFree:branches:network:pidgin - Extract libpurple.so.* and libpurple-client.so.* to own packages (boo#1191780). OBS-URL: https://build.opensuse.org/request/show/927301 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=53 --- pidgin.changes | 6 ++++++ pidgin.spec | 34 ++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/pidgin.changes b/pidgin.changes index 78b809f..a000e64 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 25 12:00:44 MSK 2021 - Andrey Karepin + +- Extract libpurple.so.* and libpurple-client.so.* to own packages + (boo#1191780). + ------------------------------------------------------------------- Tue Oct 12 16:44:39 UTC 2021 - Lukas Müller diff --git a/pidgin.spec b/pidgin.spec index f17c88d..bbdf7df 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -113,6 +113,8 @@ and plugins. Summary: GLib-based Instant Messenger Library Group: System/Libraries Requires: ca-certificates-mozilla +Requires: libpurple0 = %{version} +Requires: libpurple-client0 = %{version} # Not really required, but standard XMPP accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 Requires: cyrus-sasl-plain @@ -132,6 +134,26 @@ support many more with plugins. %lang_package -n libpurple +%package -n libpurple0 +Summary: GLib-based Instant Messenger Library -- main library +Group: System/Libraries + +%description -n libpurple0 +libpurple is a library intended to be used by programmers seeking +to write an IM client that connects to many IM networks. + +This package provides the core libpurple library. + +%package -n libpurple-client0 +Summary: GLib-based Instant Messenger Library -- main library +Group: System/Libraries + +%description -n libpurple-client0 +libpurple is a library intended to be used by programmers seeking +to write an IM client that connects to many IM networks. + +This package provides the core libpurple client library. + %package -n libpurple-branding-upstream Summary: GLib-based Instant Messenger Library -- Upstream default configuration Group: System/Libraries @@ -274,6 +296,10 @@ find %{buildroot} -type f -name "*.la" -delete -print %post -n libpurple -p /sbin/ldconfig %postun -n libpurple -p /sbin/ldconfig +%post -n libpurple0 -p /sbin/ldconfig +%postun -n libpurple0 -p /sbin/ldconfig +%post -n libpurple-client0 -p /sbin/ldconfig +%postun -n libpurple-client0 -p /sbin/ldconfig %post -n finch -p /sbin/ldconfig %postun -n finch -p /sbin/ldconfig @@ -301,13 +327,17 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_bindir}/purple-send %{_bindir}/purple-send-async %{_bindir}/purple-url-handler -%{_libdir}/libpurple.so.* -%{_libdir}/libpurple-client.so.* %{_libdir}/purple-2/ %exclude %{_libdir}/purple-2/libjabber.so %exclude %{_libdir}/purple-2/libsametime.so %exclude %{_libdir}/purple-2/tcl.so +%files -n libpurple0 +%{_libdir}/libpurple.so.* + +%files -n libpurple-client0 +%{_libdir}/libpurple-client.so.* + %files -n libpurple-lang -f %{name}.lang %files -n libpurple-branding-upstream From 652c1698df93ce25e4b144b71b7eab215c6788590a4622073a92a7b7b0148495 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Mon, 25 Oct 2021 19:20:06 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=54 --- pidgin.spec | 44 +++++++++++++++++++++----------------------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/pidgin.spec b/pidgin.spec index bbdf7df..029fa17 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -17,12 +17,12 @@ %define _name Pidgin +%define sover 0 Name: pidgin Version: 2.14.7 Release: 0 Summary: Multiprotocol Instant Messaging Client License: GPL-2.0-only -Group: Productivity/Networking/Instant Messenger URL: https://pidgin.im/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2.asc @@ -81,6 +81,7 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xscrnsaver) Requires: ca-certificates-mozilla +Requires: libpurple = %{version} Requires: perl-base >= %{perl_version} Recommends: gstreamer-plugins-good %if 0%{?suse_version} >= 1500 && !0%{?is_opensuse} @@ -98,7 +99,6 @@ support many more with plugins. %package devel Summary: Development Headers, Documentation, and Libraries for Pidgin -Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libpurple-devel = %{version} Requires: pkgconfig(glib-2.0) @@ -111,14 +111,13 @@ and plugins. %package -n libpurple Summary: GLib-based Instant Messenger Library -Group: System/Libraries Requires: ca-certificates-mozilla -Requires: libpurple0 = %{version} -Requires: libpurple-client0 = %{version} # Not really required, but standard XMPP accounts require it, if compiled with SASL support. Requires: cyrus-sasl-digestmd5 Requires: cyrus-sasl-plain +Requires: libpurple%{sover} = %{version} Requires: libpurple-branding +Requires: libpurple-client%{sover} = %{version} Requires: perl >= %{perl_version} # Needed for purple-url-handler. Requires: python3-dbus-python @@ -134,21 +133,19 @@ support many more with plugins. %lang_package -n libpurple -%package -n libpurple0 -Summary: GLib-based Instant Messenger Library -- main library -Group: System/Libraries +%package -n libpurple%{sover} +Summary: GLib-based Instant Messenger Library -%description -n libpurple0 +%description -n libpurple%{sover} libpurple is a library intended to be used by programmers seeking to write an IM client that connects to many IM networks. This package provides the core libpurple library. -%package -n libpurple-client0 -Summary: GLib-based Instant Messenger Library -- main library -Group: System/Libraries +%package -n libpurple-client%{sover} +Summary: GLib-based Instant Messenger Library -%description -n libpurple-client0 +%description -n libpurple-client%{sover} libpurple is a library intended to be used by programmers seeking to write an IM client that connects to many IM networks. @@ -156,7 +153,6 @@ This package provides the core libpurple client library. %package -n libpurple-branding-upstream Summary: GLib-based Instant Messenger Library -- Upstream default configuration -Group: System/Libraries Requires: libpurple = %{version} Supplements: (libpurple and branding-upstream) Conflicts: libpurple-branding @@ -178,7 +174,6 @@ This package provides the upstream default configuration for Pidgin. %package -n libpurple-devel Summary: Development Headers, Documentation, and Libraries for libpurple -Group: Development/Libraries/C and C++ Requires: libpurple = %{version} Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libxml-2.0) @@ -191,7 +186,6 @@ client. %package -n libpurple-tcl Summary: TCL Plugin Support for Pidgin -Group: Productivity/Networking/Instant Messenger Requires: libpurple = %{version} Supplements: (libpurple and tcl) @@ -201,7 +195,6 @@ or use Pidgin plugins written in the TCL programming language. %package -n libpurple-plugin-sametime Summary: Sametime Plugin for Pidgin using the Meanwhile Library -Group: Productivity/Networking/Instant Messenger Requires: libpurple = %{version} # libpurple-meanwhile was last used in openSUSE Leap 42.2. Provides: libpurple-meanwhile = %{version} @@ -212,7 +205,6 @@ IBM Sametime plugin for Pidgin using the Meanwhile library. %package -n finch Summary: Text-Based User Interface for Pidgin Instant Messaging Client -Group: Productivity/Networking/Instant Messenger Requires: libpurple = %{version} %description -n finch @@ -223,7 +215,6 @@ and text. %package -n finch-devel Summary: Headers etc. for finch Stuffs -Group: Development/Libraries/C and C++ Requires: finch = %{version} Requires: glibc-devel Requires: libpurple-devel = %{version} @@ -295,12 +286,19 @@ find %{buildroot} -type f -name "*.la" -delete -print %find_lang %{name} %{?no_lang_C} %post -n libpurple -p /sbin/ldconfig + %postun -n libpurple -p /sbin/ldconfig -%post -n libpurple0 -p /sbin/ldconfig -%postun -n libpurple0 -p /sbin/ldconfig -%post -n libpurple-client0 -p /sbin/ldconfig -%postun -n libpurple-client0 -p /sbin/ldconfig + +%post -n libpurple%{sover} -p /sbin/ldconfig + +%postun -n libpurple%{sover} -p /sbin/ldconfig + +%post -n libpurple-client%{sover} -p /sbin/ldconfig + +%postun -n libpurple-client%{sover} -p /sbin/ldconfig + %post -n finch -p /sbin/ldconfig + %postun -n finch -p /sbin/ldconfig %files