From 25002a051464477c77f8a81885d89a287eea628f5e2cf124769af001f14316e9 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 30 May 2018 21:55:49 +0000 Subject: [PATCH 1/3] Accepting request 613075 from GNOME:Next - Drop pkgconfig(NetworkManager) BuildRequires and Requires: this legacy symbol is no longer maintained and pidgin is not yet ready to move to libnm. OBS-URL: https://build.opensuse.org/request/show/613075 OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=30 --- pidgin.changes | 9 +++++++++ pidgin.spec | 17 ++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/pidgin.changes b/pidgin.changes index 8bf90d1..2dbc5a7 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Apr 17 12:50:20 UTC 2018 - dimstar@opensuse.org + +- Drop pkgconfig(NetworkManager) BuildRequires and Requires: this + legacy symbol is no longer maintained and pidgin is not yet + ready to move to libnm. As a side-effect, we no longer depend on + NM for all situations, even if the system were to run wicked. +- Replace --enable-nm configure parameter with --disable-nm. + ------------------------------------------------------------------- Thu Apr 12 07:43:51 UTC 2018 - fezhang@suse.com diff --git a/pidgin.spec b/pidgin.spec index 195403a..7a788d4 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -23,7 +23,7 @@ Release: 0 Summary: Multiprotocol Instant Messaging Client License: GPL-2.0-only Group: Productivity/Networking/Instant Messenger -Url: https://pidgin.im/ +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 Source2: pidgin.keyring @@ -53,7 +53,6 @@ BuildRequires: ncurses-devel BuildRequires: pkgconfig BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -BuildRequires: pkgconfig(NetworkManager) BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-glib-1) @@ -149,7 +148,7 @@ Summary: GLib-based Instant Messenger Library -- Upstream default configu Group: System/Libraries Requires: libpurple = %{version} Supplements: packageand(libpurple:branding-upstream) -Conflicts: otherproviders(libpurple-branding) +Conflicts: libpurple-branding Provides: libpurple-branding = %{version} BuildArch: noarch #BRAND: Provides /etc/purple/prefs.xml, the default configuration for @@ -170,7 +169,6 @@ This package provides the upstream default configuration for Pidgin. Summary: Development Headers, Documentation, and Libraries for libpurple Group: Development/Libraries/C and C++ Requires: libpurple = %{version} -Requires: pkgconfig(NetworkManager) Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libxml-2.0) @@ -267,7 +265,7 @@ autoreconf -fi --with-gstreamer=0.10 \ --disable-vv \ %endif - --enable-nm \ + --disable-nm \ --enable-dbus \ --enable-devhelp \ --with-tclconfig=%{_libdir} \ @@ -301,18 +299,15 @@ find %{buildroot} -type f -name "*.la" -delete -print %endif %post -n libpurple -p /sbin/ldconfig - %postun -n libpurple -p /sbin/ldconfig - %post -n finch -p /sbin/ldconfig - %postun -n finch -p /sbin/ldconfig %files %if 0%{?suse_version} >= 1500 %license COPYING %else -%doc COPYING +%license COPYING %endif %doc AUTHORS COPYRIGHT ChangeLog README doc/the_penguin.txt %{_bindir}/%{name} @@ -366,7 +361,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/purple-2/libjabber.so %{_libdir}/purple-2/liboscar.so %{_libdir}/pkgconfig/purple.pc -%{_mandir}/man3/Purple.3* +%{_mandir}/man3/Purple.3pm%{?ext_man} %files -n finch %{_bindir}/finch @@ -374,7 +369,7 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/libgnt.so.* %{_libdir}/gnt/ %dir %{_libdir}/finch/ -%{_mandir}/man1/finch.1* +%{_mandir}/man1/finch.1%{?ext_man} %files -n finch-devel %{_includedir}/finch/ From e646695d33cb46e5101eda8f8979809d79fd755e9f11a77940290666ffa1a40d Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Wed, 30 May 2018 21:56:57 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=31 --- pidgin.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/pidgin.spec b/pidgin.spec index 7a788d4..6a94ada 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -148,7 +148,7 @@ Summary: GLib-based Instant Messenger Library -- Upstream default configu Group: System/Libraries Requires: libpurple = %{version} Supplements: packageand(libpurple:branding-upstream) -Conflicts: libpurple-branding +Conflicts: otherproviders(libpurple-branding) Provides: libpurple-branding = %{version} BuildArch: noarch #BRAND: Provides /etc/purple/prefs.xml, the default configuration for @@ -288,6 +288,14 @@ find %{buildroot} -type f -name "*.la" -delete -print %suse_update_desktop_file -N %{_name} -G "Instant Messenger" %{name} %find_lang %{name} %{?no_lang_C} +%post -n libpurple -p /sbin/ldconfig + +%postun -n libpurple -p /sbin/ldconfig + +%post -n finch -p /sbin/ldconfig + +%postun -n finch -p /sbin/ldconfig + %if 0%{?suse_version} < 1500 %post %desktop_database_post @@ -298,14 +306,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %icon_theme_cache_postun %endif -%post -n libpurple -p /sbin/ldconfig -%postun -n libpurple -p /sbin/ldconfig -%post -n finch -p /sbin/ldconfig -%postun -n finch -p /sbin/ldconfig - %files %if 0%{?suse_version} >= 1500 -%license COPYING +%doc COPYING %else %license COPYING %endif From d8bf54bf1f8d49b846abfed3f9b5d604eb5a4b2130a13306a98c03fceed2ffc3 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Thu, 31 May 2018 13:19:37 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/network:pidgin/pidgin?expand=0&rev=32 --- pidgin.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pidgin.spec b/pidgin.spec index 6a94ada..1ecc42f 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -308,9 +308,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %files %if 0%{?suse_version} >= 1500 -%doc COPYING -%else %license COPYING +%else +%doc COPYING %endif %doc AUTHORS COPYRIGHT ChangeLog README doc/the_penguin.txt %{_bindir}/%{name}