Accepting request 408440 from GNOME:Apps

1

OBS-URL: https://build.opensuse.org/request/show/408440
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pidgin-sipe?expand=0&rev=55

pidgin-sipe-1.20.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2f7c31e23d6dbf33ed7b156a7a296c310b4347842ccca0ce898c7509c7c64e02
-size 708984

pidgin-sipe-1.21.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:651af55d65cbdf5bdbee0366bd5151bec4152c910743aa432204d015893fe444
+size 738036

pidgin-sipe.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jul  8 11:27:28 UTC 2016 - tchvatal@suse.com
+
+- Version update to 1.21.1:
+  * various bug fixes in media support
+  * configure no longer ignores CFLAGS/LDFLAGS/LIBS
+- Drop telepathy conditionals as we don't build on sle11 anyway
+- Move the docs from library to main package to allow multiple versions
+  at once as SLP wants
+
 -------------------------------------------------------------------
 Fri Feb 12 09:26:02 UTC 2016 - dimstar@opensuse.org
 

pidgin-sipe.spec

@@ -16,16 +16,14 @@
 #
 
 
-%define build_telepathy 1
-
 Name:           pidgin-sipe
-Version:        1.20.1
+Version:        1.21.1
 Release:        0
 Summary:        Pidgin protocol plugin to connect to MS Office Communicator
 License:        GPL-2.0+
 Group:          Productivity/Networking/Instant Messenger
 Url:            http://sipe.sourceforge.net/
-Source:         http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-1.20.1/%{name}-%{version}.tar.xz
+Source:         http://downloads.sourceforge.net/project/sipe/sipe/%{name}-%{version}/%{name}-%{version}.tar.xz
 # PATCH-FEATURE-UPSTREAM pidgin-sipe-gstreamer-1.0.patch dimstar@opensuse.org -- Read the GStreamer branch to be used from purple.pc; taken from https://pidgin.im/pipermail/devel/2015-March/023647.html
 Patch0:         pidgin-sipe-gstreamer-1.0.patch
 BuildRequires:  gettext-devel
@@ -37,16 +35,12 @@ BuildRequires:  libpurple-devel >= 2.4.0
 BuildRequires:  libtool
 # For directory ownership
 BuildRequires:  pidgin
+BuildRequires:  pkgconfig
 BuildRequires:  translation-update-upstream
-%if 0%{?suse_version} > 1140
-# Put gstreamer in the %%if too, since it's only checked if we have libnice
 BuildRequires:  pkgconfig(gstreamer-1.0)
 BuildRequires:  pkgconfig(nice) >= 0.1.0
-%endif
 BuildRequires:  pkgconfig(nss)
-%if %{build_telepathy}
 BuildRequires:  pkgconfig(telepathy-glib) >= 0.18.0
-%endif
 Requires:       libpurple-plugin-sipe = %{version}
 Requires:       pidgin
 Supplements:    packageand(libpurple-plugin-sipe:pidgin}
@@ -78,10 +72,7 @@ It implements the extended version of SIP/SIMPLE used by various products:
     * Microsoft Live Communications Server (LCS 2003/2005)
     * Reuters Messaging
 
-%if %{build_telepathy}
-
 %package -n telepathy-plugin-sipe
-
 Summary:        Microsoft LCS/OCS connection manager for Telepathy
 Group:          Productivity/Networking/Instant Messenger
 
@@ -93,7 +84,6 @@ various products:
     * Microsoft Office Communications Server (OCS 2007/2007 R2 and newer)
     * Microsoft Live Communications Server (LCS 2003/2005)
     * Reuters Messaging
-%endif
 
 %prep
 %setup -q
@@ -101,52 +91,35 @@ various products:
 translation-update-upstream
 
 %build
-%{?env_options}
 autoreconf -fiv
 %configure \
         --disable-quality-check \
         --with-krb5 \
         --enable-purple \
         --with-vv \
-%if %{build_telepathy}
         --enable-telepathy
-%else
+make %{?_smp_mflags}
-        --disable-telepathy
-%endif
-make %{_smp_mflags}
 
 %install
-%makeinstall
+make %{?_smp_mflags} DESTDIR=%{buildroot} install
 find %{buildroot} -type f -name "*.la" -delete -print
-# SLES11 defines suse_version = 1110
-%if 0%{?suse_version} && 0%{?suse_version} < 1120
-rm -r %{buildroot}/%{_datadir}/pixmaps/pidgin/protocols/scalable
-%endif
 %find_lang %{name}
 
 %check
-make check
+make %{?_smp_mflags} check
-
-%clean
-rm -rf %{buildroot}
 
 %files -n libpurple-plugin-sipe -f %{name}.lang
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %{_libdir}/purple-2/libsipe.so
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
 %dir %{_datadir}/pixmaps/pidgin/protocols/24
 %dir %{_datadir}/pixmaps/pidgin/protocols/32
 %{_datadir}/pixmaps/pidgin/protocols/*/sipe.png
-# SLES11 defines suse_version = 1110
-%if !0%{?suse_version} || 0%{?suse_version} >= 1120
 %{_datadir}/pixmaps/pidgin/protocols/*/sipe.svg
-%endif
+%{_datadir}/appdata/pidgin-sipe.metainfo.xml
-
-%if %{build_telepathy}
 
 %files -n telepathy-plugin-sipe
 %defattr(-, root, root)
@@ -154,6 +127,5 @@ rm -rf %{buildroot}
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.ConnectionManager.sipe.service
 %{_datadir}/empathy/
 %{_datadir}/telepathy/
-%endif}
 
 %changelog