diff --git a/pidgin.changes b/pidgin.changes index eabdd4f..b19404c 100644 --- a/pidgin.changes +++ b/pidgin.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Nov 7 11:10:25 UTC 2017 - sor.alexei@meowr.ru + +- Correct the licence to GPL-2.0. + +------------------------------------------------------------------- +Thu Nov 2 13:25:45 UTC 2017 - mpluskal@suse.com + +- Explicitly require python2 + ------------------------------------------------------------------- Sat Jul 22 06:37:17 UTC 2017 - tchvatal@suse.com diff --git a/pidgin.spec b/pidgin.spec index 69d2e2f..7786544 100644 --- a/pidgin.spec +++ b/pidgin.spec @@ -21,7 +21,7 @@ Name: pidgin Version: 2.12.0 Release: 0 Summary: Multiprotocol Instant Messaging Client -License: GPL-2.0+ +License: GPL-2.0 Group: Productivity/Networking/Instant Messenger Url: https://pidgin.im/ Source: http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2 @@ -68,11 +68,15 @@ BuildRequires: meanwhile-devel BuildRequires: mozilla-nspr-devel BuildRequires: ncurses-devel BuildRequires: pkgconfig -BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: tk-devel BuildRequires: update-desktop-files Requires: perl-base >= %{perl_version} +%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120300 +BuildRequires: python2-devel +%else +BuildRequires: python-devel +%endif %if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse}) BuildRequires: farstream-devel >= 0.2.7 BuildRequires: gstreamer-devel @@ -88,13 +92,13 @@ Recommends: %{name}-emoticons-nld Recommends: %{name}-emoticons-tango BuildRoot: %{_tmppath}/%{name}-%{version}-build %endif +%if 0%{?suse_version} < 1120 # gnome-keyring support summary (boo#566286): # 11.1 & SLE11: patch present and active (boo#569025) # 11.2 and above: patch not applied # For openSUSE, it's better to avoid this patch: # + does not work well outside GNOME # - passwords are stored in readable form -%if 0%{?suse_version} < 1120 BuildRequires: gnome-keyring-devel %endif %if 0%{?suse_version} > 1210 @@ -272,6 +276,9 @@ cp -f %{SOURCE3} %{name}-prefs.xml mv po/my_MM.po po/my.po sed -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac +# Do not use env for python sripts. +sed -i '/^#!/s|env python$|python2|' libpurple/purple-* + %build export CFLAGS="%{optflags} -fstack-protector -fPIC" export CXXFLAGS="%{optflags} -fstack-protector -fPIC" @@ -328,7 +335,7 @@ done %suse_update_desktop_file -N %{_name} -G "Instant Messenger" %{name} %find_lang %{name} %{?no_lang_C} -%if 0%{?suse_version} > 1130 +%if 0%{?suse_version} > 1130 && 0%{?suse_version} <= 1320 %post %desktop_database_post %icon_theme_cache_post