pool/skype4pidgin
SHA256
20
0
Fork 1
Code Issues Pull Requests Activity

- Update to version 1.5.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/network:pidgin/skype4pidgin?expand=0&rev=6
This commit is contained in:
Alexei Sorokin
2018-05-31 13:16:32 +00:00
committed by Git OBS Bridge
parent 6c9467fed8
commit 77c40a1875
6 changed files with 45 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
skype4pidgin.changes
+19
View File
@@ -1,3 +1,22 @@
-------------------------------------------------------------------
Thu May 31 13:14:00 UTC 2018 - sor.alexei@meowr.ru
- Update to version 1.5:
* Remove the old skype4pidgin plugin from existence.
* Add "alternative auth" support.
* Add support for suggested contacts finding.
* Display the number of users in the Tools->Room List window.
* Fix "deny" friend requests.
* Fix memory leaks.
* Fix some rare crashes.
* Remove the empty option from account settings.
- Move the emoticon scheme from pidgin-plugin-skype to
pidgin-plugin-skypeweb.
- Remove the libpurple-plugin-skype, libpurple-plugin-skype-lang,
pidgin-plugin-skype packages.
- Remove skype4pidgin-libdir.patch, skype4pidgin-icon-conflict.patch:
useless now.
-------------------------------------------------------------------
Thu May 31 12:42:43 UTC 2018 - fezhang@suse.com
skype4pidgin.spec
+23 -75
View File
@@ -17,64 +17,34 @@
Name: skype4pidgin
Version: 1.4
Version: 1.5
Release: 0
Summary: Libpurple plugin for Skype API
License: GPL-3.0-or-later
Group: Productivity/Networking/Instant Messenger
Url: http://eion.robbmob.com/
Source: https://github.com/EionRobb/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# PATCH-FIX-OPENSUSE skype4pidgin-libdir.patch vuntz@opensuse.org -- Do not hardcode /usr/lib/.
Patch0: skype4pidgin-libdir.patch
# PATCH-FIX-OPENSUSE skype4pidgin-icon-conflict.patch sor.alexei@meowr.ru -- Resolve icon naming conflict between plugins.
Patch1: skype4pidgin-icon-conflict.patch
BuildRequires: dbus-1-devel
BuildRequires: dbus-1-glib-devel
BuildRequires: glib2-devel
BuildRequires: json-glib-devel
BuildRequires: libpurple-devel
URL: https://eion.robbmob.com/
Source: https://github.com/EionRobb/skype4pidgin/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
# For directory ownership.
BuildRequires: pidgin
BuildRequires: pkgconfig
BuildRequires: xorg-x11-libX11-devel
BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig(dbus-1)
BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(purple)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(zlib)
%description
This is a Skype Plugin for libpurple/Pidgin. It lets you view
This is a SkypeWeb Plugin for libpurple/Pidgin. It lets you view
and chat with all your Skype buddies from within Pidgin.
%package -n libpurple-plugin-skype
Summary: Libpurple plugin for Skype API
Group: Productivity/Networking/Instant Messenger
Recommends: skype
Enhances: libpurple
%description -n libpurple-plugin-skype
This is a Skype Plugin for libpurple. It lets you view and chat
with all your Skype buddies from within Pidgin.
%package -n pidgin-plugin-skype
Summary: Pidgin plugin for Skype API
Group: Productivity/Networking/Instant Messenger
Requires: libpurple-plugin-skype = %{version}
Enhances: pidgin
Supplements: packageand(libpurple-plugin-skype:pidgin}
# skype4pidgin was last used in openSUSE 12.1.
Provides: %{name} = %{version}
Obsoletes: %{name} < %{version}
%requires_ge pidgin
%description -n pidgin-plugin-skype
This is a Skype Plugin for Pidgin. It lets you view and chat
with all your Skype buddies from within Pidgin.
%lang_package -n libpurple-plugin-skype
%package -n libpurple-plugin-skypeweb
Summary: Libpurple plugin for SkypeWeb API
Group: Productivity/Networking/Instant Messenger
Enhances: libpurple
# libpurple-plugin-skype was last used in openSUSE Leap 15.0.
Obsoletes: libpurple-plugin-skype < %{version}
%description -n libpurple-plugin-skypeweb
This is a SkypeWeb Plugin for libpurple. It lets you view and chat
@@ -84,9 +54,11 @@ with all your Skype buddies from within Pidgin.
Summary: Pidgin plugin for SkypeWeb API
Group: Productivity/Networking/Instant Messenger
Requires: libpurple-plugin-skypeweb = %{version}
%requires_ge pidgin
Enhances: pidgin
Supplements: packageand(libpurple-plugin-skypeweb:pidgin}
%requires_ge pidgin
# pidgin-plugin-skype was last used in openSUSE Leap 15.0.
Obsoletes: pidgin-plugin-skype < %{version}
%description -n pidgin-plugin-skypeweb
This is a SkypeWeb Plugin for Pidgin. It lets you view and chat
@@ -94,49 +66,25 @@ with all your Skype buddies from within Pidgin.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
make all %{?_smp_mflags} V=1
make %{?_smp_mflags} V=1 -C skypeweb
%install
%make_install LIB=%{_lib}
%make_install -C skypeweb
# Manually install translations for libpurple-plugin-skype.
mkdir -p %{buildroot}%{_datadir}/locale/
ls po/ | while read file; do
install -Dpm 0644 "po/$file" "%{buildroot}%{_datadir}/locale/${file/.mo}/LC_MESSAGES/%{name}.mo"
done
%find_lang %{name}
%files -n libpurple-plugin-skype
%defattr(-,root,root)
%doc CHANGELOG.txt COPYING.txt
%{_libdir}/purple-2/libskype.so
%{_libdir}/purple-2/libskype_dbus.so
%files -n libpurple-plugin-skype-lang -f %{name}.lang
%defattr(-,root,root)
%files -n libpurple-plugin-skypeweb
%defattr(-,root,root)
%doc COPYING.txt skypeweb/README.md
%if 0%{?suse_version} >= 1500
%license skypeweb/gpl3.txt
%else
%doc skypeweb/gpl3.txt
%endif
%doc skypeweb/README.md
%{_libdir}/purple-2/libskypeweb.so
%files -n pidgin-plugin-skype
%defattr(-,root,root)
%doc CHANGELOG.txt COPYING.txt
%{_datadir}/pixmaps/pidgin/emotes/skype/
%{_datadir}/pixmaps/pidgin/protocols/*/skypelegacy.png
%{_datadir}/pixmaps/pidgin/protocols/*/skypelegacyout.png
%files -n pidgin-plugin-skypeweb
%defattr(-,root,root)
%doc COPYING.txt skypeweb/README.md
%{_datadir}/pixmaps/pidgin/protocols/*/skype.png
%{_datadir}/pixmaps/pidgin/protocols/*/skypeout.png
%{_datadir}/pixmaps/pidgin/emotes/skype/
%changelog
skype4pidgin-1.4.tar.gz
-3
View File
@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:026962ed818df7f2e54409d78e0d6f1fb64c2ef4f4264a489d2c04c2bae0da82
size 436177
skype4pidgin-1.5.tar.gz
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bb5fc550bff8f66f90a9ffacfc6bc2ed50fee86f4f500942aebc315d073f6e9d
size 295956
skype4pidgin-icon-conflict.patch
-55
View File
@@ -1,55 +0,0 @@
--- a/libskype.c
+++ b/libskype.c
@@ -2633,15 +2633,15 @@ skype_list_icon(PurpleAccount *account,
if (last_icon_was_skypeout)
{
last_icon_was_skypeout = FALSE;
- return "skypeout";
+ return "skypelegacyout";
}
if (buddy && buddy->name[0] == '+')
{
last_icon_was_skypeout = TRUE;
- return "skypeout";
+ return "skypelegacyout";
}
- return "skype";
+ return "skypelegacy";
}
int
--- a/Makefile
+++ b/Makefile
@@ -42,19 +42,22 @@ install: locales
mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
mkdir -p $(DESTDIR)/usr/$(LIB)/purple-2
install -m 664 theme $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype/
- install -m 664 icons/16/skypeout.png icons/16/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16
- install -m 664 icons/22/skypeout.png icons/22/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22
- install -m 664 icons/48/skypeout.png icons/48/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
+ install -m 664 icons/16/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skypelegacy.png
+ install -m 664 icons/22/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skypelegacy.png
+ install -m 664 icons/48/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypelegacy.png
+ install -m 664 icons/16/skypeout.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skypelegacyout.png
+ install -m 664 icons/22/skypeout.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skypelegacyout.png
+ install -m 664 icons/48/skypeout.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypelegacyout.png
install -m 664 libskype_dbus.so libskype.so $(DESTDIR)/usr/$(LIB)/purple-2/
uninstall:
rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skypeout.png
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skype.png
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skypeout.png
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skype.png
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypeout.png
- rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skype.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skypelegacyout.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16/skypelegacy.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skypelegacyout.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skypelegacy.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypelegacyout.png
+ rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypelegacy.png
rm -rf $(DESTDIR)/usr/$(LIB)/purple-2/libskype.so
rm -rf $(DESTDIR)/usr/$(LIB)/purple-2/libskype_dbus.so
skype4pidgin-libdir.patch
-30
View File
@@ -1,30 +0,0 @@
Index: skype4pidgin-0.0.1.rev624/Makefile
===================================================================
--- skype4pidgin-0.0.1.rev624.orig/Makefile
+++ skype4pidgin-0.0.1.rev624/Makefile
@@ -39,12 +39,12 @@ install: locales
mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16
mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22
mkdir -p $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
- mkdir -p $(DESTDIR)/usr/lib/purple-2
+ mkdir -p $(DESTDIR)/usr/$(LIB)/purple-2
install -m 664 theme $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype/
install -m 664 icons/16/skypeout.png icons/16/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/16
install -m 664 icons/22/skypeout.png icons/22/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22
install -m 664 icons/48/skypeout.png icons/48/skype.png $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48
- install -m 664 libskype_dbus.so libskype.so $(DESTDIR)/usr/lib/purple-2/
+ install -m 664 libskype_dbus.so libskype.so $(DESTDIR)/usr/$(LIB)/purple-2/
uninstall:
rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/emotes/skype
@@ -54,8 +54,8 @@ uninstall:
rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/22/skype.png
rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skypeout.png
rm -rf $(DESTDIR)/usr/share/pixmaps/pidgin/protocols/48/skype.png
- rm -rf $(DESTDIR)/usr/lib/purple-2/libskype.so
- rm -rf $(DESTDIR)/usr/lib/purple-2/libskype_dbus.so
+ rm -rf $(DESTDIR)/usr/$(LIB)/purple-2/libskype.so
+ rm -rf $(DESTDIR)/usr/$(LIB)/purple-2/libskype_dbus.so
clean:
rm -f libskype.so libskype64.so libskype_dbus.so libskype_dbus64.so libskypearm.so libskype.dll skype4pidgin.deb skype4pidgin-installer.exe po/*.mo