Hello community,
here is the log from the commit of package skype4pidgin for openSUSE:Factory
checked in at 2016-03-29 10:00:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skype4pidgin (Old)
and /work/SRC/openSUSE:Factory/.skype4pidgin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skype4pidgin"
Changes:
--------
--- /work/SRC/openSUSE:Factory/skype4pidgin/skype4pidgin.changes
2015-02-06 10:22:43.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.skype4pidgin.new/skype4pidgin.changes
2016-03-29 10:39:21.000000000 +0200
@@ -1,0 +2,19 @@
+Thu Jan 14 23:57:30 UTC 2016 - sor.ale...@meowr.ru
+
+- Update to 1.1 (changes since 0.0.1.rev708):
+ * Add option to disable display of video capability status.
+ * Add option to disable updates of skype status message.
+ * Add skypeweb plugin sources.
+- Add libpurple-plugin-skypeweb, pidgin-plugin-skypeweb packages
+ with skypeweb plugin.
+- Add following build dependencies for skypeweb:
+ pkgconfig(json-glib-1.0), pkgconfig(zlib).
+- Add skype4pidgin-icon-conflict.patch: resolve icon naming
+ conflict between pidgin-plugin-skype and pidgin-plugin-skypeweb.
+- Require current version of Pidgin via macro for
+ pidgin-plugin-skype{,web}: Pidgin does not always provide forward
+ ABI compatibility.
+- libpurple-plugin-skype now recommends skype itself.
+- Some spec cleanup.
+
+-------------------------------------------------------------------
Old:
----
_service
skype4pidgin-0.0.1.rev708.tar.xz
New:
----
skype4pidgin-1.1.tar.gz
skype4pidgin-icon-conflict.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skype4pidgin.spec ++++++
--- /var/tmp/diff_new_pack.v6lehW/_old 2016-03-29 10:39:22.000000000 +0200
+++ /var/tmp/diff_new_pack.v6lehW/_new 2016-03-29 10:39:22.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package skype4pidgin
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,100 +17,124 @@
Name: skype4pidgin
-Version: 0.0.1.rev708
+Version: 1.1
Release: 0
-# FIXME: on new upstream version, change <= Obsoletes to < (last checked:
0.0.1.rev624)
Summary: Libpurple plugin for Skype API
License: GPL-3.0+
Group: Productivity/Networking/Instant Messenger
Url: http://eion.robbmob.com/
-Source0: %{name}-%{version}.tar.xz
-# PATCH-FIX-OPENSUSE skype4pidgin-libdir.patch vu...@opensuse.org -- Do not
hardcode /usr/lib
+Source:
https://github.com/EionRobb/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE skype4pidgin-libdir.patch vu...@opensuse.org -- Do not
hardcode /usr/lib/.
Patch0: skype4pidgin-libdir.patch
+# PATCH-FIX-OPENSUSE skype4pidgin-icon-conflict.patch sor.ale...@meowr.ru --
Resolve icon naming conflict between plugins.
+Patch1: skype4pidgin-icon-conflict.patch
BuildRequires: dbus-1-devel
BuildRequires: glib2-devel
+BuildRequires: json-glib-devel
BuildRequires: libpurple-devel
-# For directory ownership
+# For directory ownership.
BuildRequires: pidgin
BuildRequires: xorg-x11-libX11-devel
+BuildRequires: zlib-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
-This is a Skype Plugin for Pidgin/libpurple/Adium. It lets you view and
-chat with all your Skype buddies from within Pidgin/Adium.
-
-You still need Skype to be running to be able to use it, but it lets you
-keep a consistent user interface and use all the other nifty
-Pidgin/Adium plugins with it, like spell-checking or OTR encryption.
+This is a Skype 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
-Requires: libpurple
-Recommends: libpurple-plugin-skype-lang
+Recommends: skype
Enhances: libpurple
%description -n libpurple-plugin-skype
-This is a Skype Plugin for Pidgin/libpurple/Adium. It lets you view and
-chat with all your Skype buddies from within Pidgin/Adium.
-
-You still need Skype to be running to be able to use it, but it lets you
-keep a consistent user interface and use all the other nifty
-Pidgin/Adium plugins with it, like spell-checking or OTR encryption.
+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}
-Requires: pidgin
-Supplements: packageand(libpurple-plugin-skype:pidgin}
Enhances: pidgin
-# Provide upstream name
+Supplements: packageand(libpurple-plugin-skype:pidgin}
+# skype4pidgin was last used in openSUSE 12.1.
Provides: %{name} = %{version}
-# Also obsolete upstream name, as it was packaged this way before.
-# FIXME: change <= to < when we have a new upstream version (last checked:
0.0.1.rev624)
-Obsoletes: %{name} <= %{version}
+Obsoletes: %{name} < %{version}
+%requires_ge pidgin
%description -n pidgin-plugin-skype
-This is a Skype Plugin for Pidgin/libpurple/Adium. It lets you view and
-chat with all your Skype buddies from within Pidgin/Adium.
-
-You still need Skype to be running to be able to use it, but it lets you
-keep a consistent user interface and use all the other nifty
-Pidgin/Adium plugins with it, like spell-checking or OTR encryption.
+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
+
+%description -n libpurple-plugin-skypeweb
+This is a SkypeWeb Plugin for libpurple. It lets you view and chat
+with all your Skype buddies from within Pidgin.
+
+%package -n pidgin-plugin-skypeweb
+Summary: Pidgin plugin for SkypeWeb API
+Group: Productivity/Networking/Instant Messenger
+Requires: libpurple-plugin-skypeweb = %{version}
+Enhances: pidgin
+Supplements: packageand(libpurple-plugin-skypeweb:pidgin}
+%requires_ge pidgin
+
+%description -n pidgin-plugin-skypeweb
+This is a SkypeWeb Plugin for Pidgin. It lets you view and chat
+with all your Skype buddies from within Pidgin.
+
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
-make all
+make all %{?_smp_mflags}
+make %{?_smp_mflags} -C skypeweb
%install
%make_install LIB=%{_lib}
-# Manually install translations
-test ! -d %{buildroot}%{_datadir}/locale
-mkdir -p %{buildroot}%{_datadir}/locale
-for MOFILE in po/*.mo; do
- LOCALE=`basename ${MOFILE} | sed 's:\.mo$::g'`
- install -D -m 0644 ${MOFILE}
%{buildroot}%{_datadir}/locale/${LOCALE}/LC_MESSAGES/%{name}.mo
+%make_install -C skypeweb
+
+# Manually install translations for libpurple-plugin-skype.
+mkdir -p %{buildroot}%{_datadir}/locale/
+ls po/ | while read file; do
+ install -Dm 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 README.txt
+%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
+%{_libdir}/purple-2/libskypeweb.so
+
%files -n pidgin-plugin-skype
-%defattr(-,root,root,-)
-%doc CHANGELOG.txt COPYING.txt README.txt
+%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
-%files -n libpurple-plugin-skype-lang -f %{name}.lang
-
%changelog
++++++ skype4pidgin-icon-conflict.patch ++++++
--- 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
