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
This commit is contained in:
Alexei Sorokin 2018-05-30 21:55:49 +00:00 committed by Git OBS Bridge
parent 38554453dd
commit 25002a0514
2 changed files with 15 additions and 11 deletions

View File

@ -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 Thu Apr 12 07:43:51 UTC 2018 - fezhang@suse.com

View File

@ -23,7 +23,7 @@ Release: 0
Summary: Multiprotocol Instant Messaging Client Summary: Multiprotocol Instant Messaging Client
License: GPL-2.0-only License: GPL-2.0-only
Group: Productivity/Networking/Instant Messenger Group: Productivity/Networking/Instant Messenger
Url: https://pidgin.im/ URL: https://pidgin.im/
Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2.asc Source1: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2.asc
Source2: pidgin.keyring Source2: pidgin.keyring
@ -53,7 +53,6 @@ BuildRequires: ncurses-devel
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: translation-update-upstream BuildRequires: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(NetworkManager)
BuildRequires: pkgconfig(avahi-glib) BuildRequires: pkgconfig(avahi-glib)
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1) BuildRequires: pkgconfig(dbus-glib-1)
@ -149,7 +148,7 @@ Summary: GLib-based Instant Messenger Library -- Upstream default configu
Group: System/Libraries Group: System/Libraries
Requires: libpurple = %{version} Requires: libpurple = %{version}
Supplements: packageand(libpurple:branding-upstream) Supplements: packageand(libpurple:branding-upstream)
Conflicts: otherproviders(libpurple-branding) Conflicts: libpurple-branding
Provides: libpurple-branding = %{version} Provides: libpurple-branding = %{version}
BuildArch: noarch BuildArch: noarch
#BRAND: Provides /etc/purple/prefs.xml, the default configuration for #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 Summary: Development Headers, Documentation, and Libraries for libpurple
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libpurple = %{version} Requires: libpurple = %{version}
Requires: pkgconfig(NetworkManager)
Requires: pkgconfig(glib-2.0) Requires: pkgconfig(glib-2.0)
Requires: pkgconfig(libxml-2.0) Requires: pkgconfig(libxml-2.0)
@ -267,7 +265,7 @@ autoreconf -fi
--with-gstreamer=0.10 \ --with-gstreamer=0.10 \
--disable-vv \ --disable-vv \
%endif %endif
--enable-nm \ --disable-nm \
--enable-dbus \ --enable-dbus \
--enable-devhelp \ --enable-devhelp \
--with-tclconfig=%{_libdir} \ --with-tclconfig=%{_libdir} \
@ -301,18 +299,15 @@ find %{buildroot} -type f -name "*.la" -delete -print
%endif %endif
%post -n libpurple -p /sbin/ldconfig %post -n libpurple -p /sbin/ldconfig
%postun -n libpurple -p /sbin/ldconfig %postun -n libpurple -p /sbin/ldconfig
%post -n finch -p /sbin/ldconfig %post -n finch -p /sbin/ldconfig
%postun -n finch -p /sbin/ldconfig %postun -n finch -p /sbin/ldconfig
%files %files
%if 0%{?suse_version} >= 1500 %if 0%{?suse_version} >= 1500
%license COPYING %license COPYING
%else %else
%doc COPYING %license COPYING
%endif %endif
%doc AUTHORS COPYRIGHT ChangeLog README doc/the_penguin.txt %doc AUTHORS COPYRIGHT ChangeLog README doc/the_penguin.txt
%{_bindir}/%{name} %{_bindir}/%{name}
@ -366,7 +361,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/purple-2/libjabber.so %{_libdir}/purple-2/libjabber.so
%{_libdir}/purple-2/liboscar.so %{_libdir}/purple-2/liboscar.so
%{_libdir}/pkgconfig/purple.pc %{_libdir}/pkgconfig/purple.pc
%{_mandir}/man3/Purple.3* %{_mandir}/man3/Purple.3pm%{?ext_man}
%files -n finch %files -n finch
%{_bindir}/finch %{_bindir}/finch
@ -374,7 +369,7 @@ find %{buildroot} -type f -name "*.la" -delete -print
%{_libdir}/libgnt.so.* %{_libdir}/libgnt.so.*
%{_libdir}/gnt/ %{_libdir}/gnt/
%dir %{_libdir}/finch/ %dir %{_libdir}/finch/
%{_mandir}/man1/finch.1* %{_mandir}/man1/finch.1%{?ext_man}
%files -n finch-devel %files -n finch-devel
%{_includedir}/finch/ %{_includedir}/finch/