Accepting request 444862 from network

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

pidgin-NLD-smiley-theme.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9b4f9e92f0e8ebc473e72a3cf8d8ae488fde177088ba61c1569f86093c9d5c6e
-size 20019

pidgin-Tango-smiley-theme.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3204686fdc32b330aedac3c7e5cd8ac45deedc4128f01cc1878c2ea93e47f4b8
-size 13938

pidgin.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Thu Dec  8 12:14:13 UTC 2016 - sor.alexei@meowr.ru
+
+- Make libpurple require libpurple-branding.
+- Correctly remove *.so files for plugins
+  (fixes devel-file-in-non-devel-package).
+- Rename libpurple-meanwhile to libpurple-plugin-sametime.
+- Remove generation of a plugin list to package, simply add it all
+  in %files with exclusions.
+
+-------------------------------------------------------------------
+Wed Dec  7 16:36:52 UTC 2016 - sor.alexei@meowr.ru
+
+- Build with GStreamer 1.x on SLE 12 SP2.
+- Apply pidgin-use-default-alsa.patch for SLE 12+ only properly.
+- Provide libpurple-branding-upstream for SLE 11 as well.
+
 -------------------------------------------------------------------
 Fri Jul 22 19:13:38 UTC 2016 - jengelh@inai.de
 

pidgin.spec

@@ -28,8 +28,6 @@ Source:         http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2
 Source1:        http://downloads.sf.net/%{name}/%{name}-%{version}.tar.bz2.asc
 Source2:        pidgin.keyring
 Source3:        pidgin-prefs.xml
-Source4:        pidgin-NLD-smiley-theme.tar.bz2
-Source5:        pidgin-Tango-smiley-theme.tar.bz2
 # PATCH-FIX-OPENSUSE pidgin-nonblock-common.patch
 Patch0:         pidgin-nonblock-common.patch
 # PATCH-FIX-OPENSUSE pidgin-nonblock-gwim.patch
@@ -42,10 +40,10 @@ Patch3:         pidgin-gnome-keyring.patch
 Patch4:         pidgin-fix-perl-build.patch
 # PATCH-FIX-UPSTREAM pidgin-crash-missing-gst-registry.patch boo#866455 pidgin.im#16224 cxiong@suse.com -- Fix crash when GST registry cache file is missing.
 Patch5:         pidgin-crash-missing-gst-registry.patch
-# PATCH-FIX-UPSTREAM pidgin-ncurses-6.0-accessors.patch pidgin.im#16764 dimstar@opensuse.org -- Fix build with NCurses 6.0 with WINDOW_OPAQUE set to 1
+# PATCH-FIX-UPSTREAM pidgin-ncurses-6.0-accessors.patch pidgin.im#16764 dimstar@opensuse.org -- Fix build with NCurses 6.0 with WINDOW_OPAQUE set to 1.
 Patch6:         pidgin-ncurses-6.0-accessors.patch
-# PATCH-FIX-SLE pidgin-use-default-alsa.patch bnc#886670 tiwai@suse.de -- use ALSA as default for avoiding broken volume control
+# PATCH-FIX-SLE pidgin-use-default-alsa.patch bsc#886670 tiwai@suse.de -- Use ALSA as a default for avoiding broken volume control.
-Patch8:         pidgin-use-default-alsa.patch
+Patch7:         pidgin-use-default-alsa.patch
 BuildRequires:  NetworkManager-devel
 # Can use external libzephyr.
 BuildRequires:  cyrus-sasl-devel
@@ -69,15 +67,14 @@ BuildRequires:  libxslt
 BuildRequires:  meanwhile-devel
 BuildRequires:  mozilla-nspr-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  pkg-config
+BuildRequires:  pkgconfig
 BuildRequires:  python-devel
 BuildRequires:  silc-toolkit-devel
 BuildRequires:  startup-notification-devel
 BuildRequires:  tk-devel
 BuildRequires:  update-desktop-files
 Requires:       perl-base >= %{perl_version}
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
-%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
 BuildRequires:  farstream-devel >= 0.2.7
 BuildRequires:  gstreamer-devel
 BuildRequires:  gstreamer-plugins-base-devel
@@ -90,6 +87,7 @@ Recommends:     gstreamer-0_10-plugins-good
 %if 0%{?suse_version} < 1120
 Recommends:     %{name}-emoticons-nld
 Recommends:     %{name}-emoticons-tango
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %endif
 # gnome-keyring support summary (boo#566286):
 # 11.1 & SLE11: patch present and active (boo#569025)
@@ -122,13 +120,13 @@ BuildRequires:  pam-devel
 %endif
 
 %description
-Pidgin is a chat program which lets you log in to accounts on multiple
+Pidgin is a messaging application which lets you log in to accounts
-chat networks simultaneously.
+on multiple chat networks simultaneously.
 
-Pidgin is compatible with the following chat networks out of the box:
+Pidgin is compatible with the following chat networks out of the
-Jabber/XMPP, AIM, ICQ, Yahoo!, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
+box: Jabber/XMPP, AIM, ICQ, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
-Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM,
+Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM, and
-and Zephyr. It can support many more with plugins.
+Zephyr. It can support many more with plugins.
 
 %package devel
 Summary:        Development Headers, Documentation, and Libraries for Pidgin
@@ -145,12 +143,13 @@ and plugins.
 
 %package -n libpurple
 Summary:        GLib-based Instant Messenger Library
-Group:          System/Libraries
 # Not really required, but standard XMPP accounts require it, if compiled with SASL support.
+Group:          System/Libraries
 Requires:       cyrus-sasl-digestmd5
 Requires:       cyrus-sasl-plain
 # Needed for purple-url-handler.
 Requires:       dbus-1-python
+Requires:       libpurple-branding
 Requires:       perl >= %{perl_version}
 Recommends:     libpurple-lang
 %if 0%{?suse_version} >= 1230
@@ -163,14 +162,13 @@ Requires:       openssl-certs
 libpurple is a library intended to be used by programmers seeking
 to write an IM client that connects to many IM networks.
 
-libpurple is compatible with the following chat networks out of the box:
+libpurple is compatible with the following chat networks out of the
-Jabber/XMPP, AIM, ICQ, Yahoo!, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
+box: Jabber/XMPP, AIM, ICQ, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
-Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM,
+Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM, and
-and Zephyr. It can support many more with plugins.
+Zephyr. It can support many more with plugins.
 
 %lang_package -n libpurple
 
-%if 0%{?suse_version} > 1140
 %package -n libpurple-branding-upstream
 Summary:        GLib-based Instant Messenger Library -- Upstream default configuration
 Group:          System/Libraries
@@ -178,7 +176,9 @@ Requires:       libpurple = %{version}
 Supplements:    packageand(libpurple:branding-upstream)
 Conflicts:      otherproviders(libpurple-branding)
 Provides:       libpurple-branding = %{version}
+%if 0%{?suse_version} >= 1210
 BuildArch:      noarch
+%endif
 #BRAND: Provides /etc/purple/prefs.xml, the default configuration for
 #BRAND: libpurple, and libpurple-based clients.
 
@@ -186,13 +186,12 @@ BuildArch:      noarch
 libpurple is a library intended to be used by programmers seeking
 to write an IM client that connects to many IM networks.
 
-libpurple is compatible with the following chat networks out of the box:
+libpurple is compatible with the following chat networks out of the
-Jabber/XMPP, AIM, ICQ, Yahoo!, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
+box: Jabber/XMPP, AIM, ICQ, Bonjour, Gadu-Gadu, IRC, SILC, SIMPLE,
-Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM,
+Novell GroupWise Messenger, Lotus Sametime, MXit, MySpaceIM, and
-and Zephyr. It can support many more with plugins.
+Zephyr. It can support many more with plugins.
 
-This package provides the openSUSE default configuration for Pidgin.
+This package provides the upstream default configuration for Pidgin.
-%endif
 
 %package -n libpurple-devel
 Summary:        Development Headers, Documentation, and Libraries for libpurple
@@ -209,14 +208,6 @@ documentation, and libraries required for development of libpurple
 based instant messaging clients or plugins for any libpurple based
 client.
 
-%package -n libpurple-meanwhile
-Summary:        Sametime Plugin for Pidgin using the Meanwhile Library
-Group:          Productivity/Networking/Instant Messenger
-Requires:       libpurple = %{version}
-
-%description -n libpurple-meanwhile
-Lotus Sametime plugin for Pidgin using the Meanwhile library.
-
 %package -n libpurple-tcl
 Summary:        TCL Plugin Support for Pidgin
 Group:          Productivity/Networking/Instant Messenger
@@ -224,8 +215,19 @@ Requires:       libpurple = %{version}
 Supplements:    packageand(libpurple:tcl)
 
 %description -n libpurple-tcl
-TCL plugin loader for Pidgin. This package will allow you to write or
+TCL plugin loader for Pidgin. This package will allow you to write
-use Pidgin plugins written in the TCL programming language.
+or use Pidgin plugins written in the TCL programming language.
+
+%package -n libpurple-plugin-sametime
+Summary:        Sametime Plugin for Pidgin using the Meanwhile Library
+Group:          Productivity/Networking/Instant Messenger
+Requires:       libpurple = %{version}
+# libpurple-meanwhile was last used in openSUSE Leap 42.2.
+Provides:       libpurple-meanwhile = %{version}-%{release}
+Obsoletes:      libpurple-meanwhile < %{version}-%{release}
+
+%description -n libpurple-plugin-sametime
+IBM Sametime plugin for Pidgin using the Meanwhile library.
 
 %package -n finch
 Summary:        Text-Based User Interface for Pidgin Instant Messaging Client
@@ -233,9 +235,10 @@ Group:          Productivity/Networking/Instant Messenger
 Requires:       libpurple = %{version}
 
 %description -n finch
-A text-based user interface for using libpurple.  This can be run from
+A text-based user interface to use with libpurple. This can be run
-a standard text console or from a terminal within X Windows.  It uses
+from a standard text console or from a graphical terminal emulator.
-ncurses and our homegrown gnt library for drawing windows and text.
+It uses ncurses and our homegrown gnt library for drawing windows
+and text.
 
 %package -n finch-devel
 Summary:        Headers etc. for finch Stuffs
@@ -248,11 +251,11 @@ Requires:       ncurses-devel
 
 %description -n finch-devel
 The finch-devel package contains the header files, developer
-documentation, and libraries required for development of Finch scripts
+documentation, and libraries required for development of Finch
-and plugins.
+scripts and plugins.
 
 %prep
-%setup -q -a4 -a5
+%setup -q
 %if 0%{?suse_version} >= 1120
 translation-update-upstream
 %endif
@@ -263,14 +266,14 @@ translation-update-upstream
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%if !0%{?is_opensuse}
+%if 0%{?sle_version} >= 120000 && !0%{?is_opensuse}
-%patch8 -p1
+%patch7 -p1
 %endif
 
 cp -f %{SOURCE3} %{name}-prefs.xml
 
 # Change Myanmar/Myanmar to Myanmar.
-mv -f po/my_MM.po po/my.po
+mv po/my_MM.po po/my.po
 sed -i "/ALL_LINGUAS/s/ my_MM / my /" configure.ac
 
 %build
@@ -285,7 +288,7 @@ autoreconf -fi
   --enable-cyrus-sasl \
   --enable-dbus \
   --enable-gstreamer \
-%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
+%if 0%{?suse_version} > 1320 || 0%{?sle_version} >= 120200 || (0%{?sle_version} >= 120100 && 0%{?is_opensuse})
   --with-gstreamer=1.0 \
   --enable-vv \
 %else
@@ -301,16 +304,16 @@ autoreconf -fi
   --with-tclconfig=%{_libdir} \
   --with-tkconfig=%{_libdir} \
   --with-system-ssl-certs=%{_sysconfdir}/ssl/certs/
-make %{?_smp_mflags}
+make %{?_smp_mflags} V=1
 
 %install
 %make_install
-%if 0%{?suse_version} > 1140
+
-install -Dm 0644 %{name}-prefs.xml %{buildroot}%{_sysconfdir}/purple/prefs.xml
+%if 0%{?suse_version} <= 1140
-%else
 mkdir -p %{buildroot}%{_sysconfdir}/purple/
 rm -f %{buildroot}%{_sysconfdir}/gconf/schemas/purple.schemas
 %endif
+install -Dpm 0644 %{name}-prefs.xml %{buildroot}%{_sysconfdir}/purple/prefs.xml
 %perl_process_packlist
 
 find %{buildroot} -type f -name "perllocal.pod" -delete -print
@@ -318,24 +321,13 @@ find %{buildroot} -type f -name ".packlist" -delete -print
 find %{buildroot} -type f -name "*.bs" -empty -delete -print
 find %{buildroot} -type f -name "*.la" -delete -print
 
-# Provide only upstream emotes in openSUSE >= 11.2 and SLE > 11 (see bnc#569271#c1):
+# FIXME: Should be a non-versioned name.
-%if %suse_version < 1120
+ls %{buildroot}%{_libdir}/purple-2/ | grep '\.so$' | while read libim; do
-cp -a NLD $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes
+    if [ -L "%{buildroot}%{_libdir}/purple-2/$libim" ]; then
-cp -a Tango $RPM_BUILD_ROOT%{_prefix}/share/pixmaps/pidgin/emotes
+        rm "%{buildroot}%{_libdir}/purple-2/$libim"
-%endif
-
-# FIXME: Should be nonversioned name.
-ls %{buildroot}%{_libdir}/purple-2/*.so | while read libim; do
-    if [ -L %{buildroot}%{_libdir}/purple-2/$libim ]; then
-        rm -f %{buildroot}%{_libdir}/purple-2/$libim
     fi
 done
 
-find %{buildroot}%{_libdir}/purple-2/ -xtype f -print | \
-  sed -e "s|^%{buildroot}||g;/\libsametime.so/d;/\/tcl.so/d" \
-  > %{name}-%{version}-purpleplugins
-find %{buildroot}%{_libdir}/finch/ -maxdepth 1 -xtype f -print | \
-  sed -e "s|^%{buildroot}||g" > %{name}-%{version}-finchplugins
 %fdupes %{buildroot}
 %suse_update_desktop_file -N %{_name} -G "Instant Messenger" %{name}
 %find_lang %{name} %{?no_lang_C}
@@ -363,21 +355,21 @@ find %{buildroot}%{_libdir}/finch/ -maxdepth 1 -xtype f -print | \
 %doc AUTHORS COPYING COPYRIGHT ChangeLog README doc/the_penguin.txt
 %{_bindir}/%{name}
 %{_libdir}/%{name}/
+%{_datadir}/sounds/purple/
+%{_datadir}/applications/*.desktop
+%{_datadir}/icons/hicolor/*/apps/*
+%{_datadir}/pixmaps/%{name}/
 %dir %{_datadir}/appdata/
 %{_datadir}/appdata/pidgin.appdata.xml
-%{_datadir}/pixmaps/%{name}/
-%{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/applications/*.desktop
-%{_datadir}/sounds/purple/
 %{_mandir}/man1/%{name}.1%{?ext_man}
 
 %files devel
 %defattr(-,root,root)
-%{_includedir}/%{name}
+%{_includedir}/%{name}/
 %{_libdir}/pkgconfig/%{name}.pc
 %{_mandir}/man3/%{_name}.3*%{?ext_man}
 
-%files -n libpurple -f %{name}-%{version}-purpleplugins
+%files -n libpurple
 %defattr(-,root,root)
 %dir %{_sysconfdir}/purple/
 %{_bindir}/purple-client-example
@@ -387,10 +379,9 @@ find %{buildroot}%{_libdir}/finch/ -maxdepth 1 -xtype f -print | \
 %{_bindir}/purple-url-handler
 %{_libdir}/libpurple.so.*
 %{_libdir}/libpurple-client.so.*
-%dir %{_libdir}/purple-2/
+%{_libdir}/purple-2/
-%dir %{_libdir}/purple-2/perl/
+%exclude %{_libdir}/purple-2/libsametime.so
-%dir %{_libdir}/purple-2/perl/*/
+%exclude %{_libdir}/purple-2/tcl.so
-%dir %{_libdir}/purple-2/perl/*/*/
 
 %files -n libpurple-lang -f %{name}.lang
 %defattr(-,root,root)
@@ -409,20 +400,18 @@ find %{buildroot}%{_libdir}/finch/ -maxdepth 1 -xtype f -print | \
 %dir %{_datadir}/locale/sd/LC_MESSAGES/
 %endif
 
-%if 0%{?suse_version} > 1140
 %files -n libpurple-branding-upstream
 %defattr(-,root,root)
 %config %{_sysconfdir}/purple/prefs.xml
-%endif
-
-%files -n libpurple-meanwhile
-%defattr(-,root,root)
-%{_libdir}/purple-2/libsametime.*
 
 %files -n libpurple-tcl
 %defattr(-,root,root)
 %{_libdir}/purple-2/tcl.so
 
+%files -n libpurple-plugin-sametime
+%defattr(-,root,root)
+%{_libdir}/purple-2/libsametime.so
+
 %files -n libpurple-devel
 %defattr(-,root,root)
 %doc ChangeLog.API HACKING PLUGIN_HOWTO
@@ -434,9 +423,10 @@ find %{buildroot}%{_libdir}/finch/ -maxdepth 1 -xtype f -print | \
 %{_libdir}/pkgconfig/purple.pc
 %{_mandir}/man3/Purple.3*
 
-%files -n finch -f %{name}-%{version}-finchplugins
+%files -n finch
 %defattr(-,root,root)
 %{_bindir}/finch
+%{_libdir}/finch/
 %{_libdir}/libgnt.so.*
 %{_libdir}/gnt/
 %dir %{_libdir}/finch/