From b09c0b092ffab34a51eaaa8c8ea32740974a909b Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Thu, 30 Aug 2012 22:00:03 +0300 Subject: [PATCH] contrib: add telepathy stuff to all packaging files Sync RPM SPEC changes to the other files. For Debian/Ubuntu we build the new stuff but the build description files should be updated to generate multiple binary packages too. --- contrib/debian/rules | 10 +- contrib/opensuse-build-service/debian.rules | 10 +- .../pidgin-sipe-xUbuntu_11.10.dsc | 2 +- .../pidgin-sipe-xUbuntu_12.04.dsc | 2 +- contrib/opensuse-build-service/pidgin-sipe.spec | 143 +++++++++++++++++---- contrib/rpm/pidgin-sipe.spec | 12 +- 6 files changed, 146 insertions(+), 33 deletions(-) diff --git a/contrib/debian/rules b/contrib/debian/rules index d6e529a2..59e2370c 100755 --- a/contrib/debian/rules +++ b/contrib/debian/rules @@ -3,7 +3,13 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_EXTRA_FLAGS := --enable-purple --disable-telepathy +DEB_CONFIGURE_EXTRA_FLAGS := --enable-purple +# detect if package telepathy-glib is available +ifneq ($(shell pkg-config --exists telepathy-glib && echo FOUND),) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-telepathy +else +DEB_CONFIGURE_EXTRA_FLAGS += --disable-telepathy +endif # run tests DEB_MAKE_CHECK_TARGET := check @@ -23,6 +29,8 @@ $(DEB_CONFIGURE_SCRIPT): binary-post-install/pidgin-sipe:: rm -f debian/pidgin-sipe/usr/share/doc/pidgin-sipe/README + rm -r debian/pidgin-sipe/usr/share/pixmaps/pidgin/protocols/24 + rm -r debian/pidgin-sipe/usr/share/pixmaps/pidgin/protocols/32 rm debian/pidgin-sipe/usr/lib/purple-2/libsipe.la .PHONY: update-debian-control diff --git a/contrib/opensuse-build-service/debian.rules b/contrib/opensuse-build-service/debian.rules index d6e529a2..59e2370c 100644 --- a/contrib/opensuse-build-service/debian.rules +++ b/contrib/opensuse-build-service/debian.rules @@ -3,7 +3,13 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/debhelper.mk -DEB_CONFIGURE_EXTRA_FLAGS := --enable-purple --disable-telepathy +DEB_CONFIGURE_EXTRA_FLAGS := --enable-purple +# detect if package telepathy-glib is available +ifneq ($(shell pkg-config --exists telepathy-glib && echo FOUND),) +DEB_CONFIGURE_EXTRA_FLAGS += --enable-telepathy +else +DEB_CONFIGURE_EXTRA_FLAGS += --disable-telepathy +endif # run tests DEB_MAKE_CHECK_TARGET := check @@ -23,6 +29,8 @@ $(DEB_CONFIGURE_SCRIPT): binary-post-install/pidgin-sipe:: rm -f debian/pidgin-sipe/usr/share/doc/pidgin-sipe/README + rm -r debian/pidgin-sipe/usr/share/pixmaps/pidgin/protocols/24 + rm -r debian/pidgin-sipe/usr/share/pixmaps/pidgin/protocols/32 rm debian/pidgin-sipe/usr/lib/purple-2/libsipe.la .PHONY: update-debian-control diff --git a/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_11.10.dsc b/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_11.10.dsc index e8c72993..a1179e8e 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_11.10.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_11.10.dsc @@ -5,7 +5,7 @@ Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.4-dev Homepage: http://sipe.sourceforge.net/ Files: 2a05700b1f105d7bbc630b92a1de5ecf 513579 pidgin-sipe_1.13.3.orig.tar.gz diff --git a/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_12.04.dsc b/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_12.04.dsc index e8c72993..e6ca731a 100644 --- a/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_12.04.dsc +++ b/contrib/opensuse-build-service/pidgin-sipe-xUbuntu_12.04.dsc @@ -5,7 +5,7 @@ Binary: pidgin-sipe Maintainer: pidgin-sipe Architecture: any Standards-Version: 3.9.1 -Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev +Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 5), pkg-config, libglib2.0-dev (>= 2.28.0), libxml2-dev, libnss3-dev, pidgin-dev, libpurple-dev (>= 2.8.0), libtool, intltool, libkrb5-dev, libzephyr-dev, libnice-dev (>= 0.1.0), libgstreamer0.10-dev, libtelepathy-glib-dev, libgmime-2.6-dev Homepage: http://sipe.sourceforge.net/ Files: 2a05700b1f105d7bbc630b92a1de5ecf 513579 pidgin-sipe_1.13.3.orig.tar.gz diff --git a/contrib/opensuse-build-service/pidgin-sipe.spec b/contrib/opensuse-build-service/pidgin-sipe.spec index f0ae4f57..a0ff8689 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.spec +++ b/contrib/opensuse-build-service/pidgin-sipe.spec @@ -9,9 +9,6 @@ # Windows (mingw32, mingw64) # -# Build options -%define build_telepathy 0 - # Check for mingw32 cross compilation build # # Manually add this repository to your private OBS project: @@ -73,6 +70,9 @@ %define purple_plugin %{?mingw_prefix:%{mingw_prefix}}libpurple-plugin-sipe %define telepathy_plugin %{?mingw_prefix:%{mingw_prefix}}telepathy-plugin-sipe %define nsis_package %{?mingw_prefix:%{mingw_prefix}}pidgin-sipe-nsis +%define common_files sipe-common +%define empathy_files empathy-sipe +%define ktp_files ktp-accounts-kcm-sipe %define purple_develname libpurple-devel @@ -94,6 +94,7 @@ %define has_libnice 1 %if 0%{?suse_version} > 1140 %define has_gstreamer 1 +%define build_telepathy 1 %endif %endif %else @@ -105,11 +106,12 @@ %endif %if 0%{?fedora} %define pkg_group Applications/Internet -%define has_gmime 1 %if 0%{?fedora} >= 11 %define has_libnice 1 %if 0%{?fedora} >= 15 %define has_gstreamer 1 +%define build_telepathy 1 +%define build_ktp 1 %endif %endif %endif @@ -167,9 +169,6 @@ BuildRequires: %{purple_develname} >= 2.4.0 BuildRequires: libxml2-devel BuildRequires: %{nss_develname} BuildRequires: gettext-devel -%if 0%{?has_gmime:1} -BuildRequires: gmime-devel -%endif # The following two are required to enable Voice & Video features %if 0%{?has_libnice:1} BuildRequires: libnice-devel @@ -177,6 +176,12 @@ BuildRequires: libnice-devel %if 0%{?has_gstreamer:1} BuildRequires: gstreamer-devel %endif +# Requirements for telepathy backend +%if 0%{?build_telepathy:1} +BuildRequires: telepathy-glib-devel +BuildRequires: gmime-devel +BuildRequires: glib2-devel >= 2.28.0 +%endif # Configurable components %if !0%{?_without_kerberos:1} @@ -185,7 +190,8 @@ BuildRequires: krb5-devel # For directory ownership BuildRequires: pidgin -%if %{build_telepathy} +%if 0%{?build_telepathy:1} +BuildRequires: empathy BuildRequires: pkgconfig(telepathy-glib) %endif Requires: pidgin @@ -239,6 +245,9 @@ Summary: Libpurple protocol plugin to connect to MS Office Communicator Group: %{pkg_group} License: GPL-2.0+ Obsoletes: purple-sipe +%if 0%{?build_telepathy:1} +Requires: %{common_files} = %{?epoch:%{epoch}:}%{version}-%{release} +%endif %description -n %{purple_plugin} A third-party plugin for the Pidgin multi-protocol instant messenger. @@ -252,23 +261,74 @@ It implements the extended version of SIP/SIMPLE used by various products: This package provides the protocol plugin for libpurple clients. -%if %{build_telepathy} +%if 0%{?build_telepathy:1} +%package -n %{empathy_files} +Summary: Telepathy connection manager to connect to MS Office Communicator +Group: %{pkg_group} +License: GPL-2.0+ +Requires: empathy +Requires: %{telepathy_plugin} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{empathy_files} +A Telepathy connection manager that implements the extended version of +SIP/SIMPLE used by various products: + + * Microsoft Lync Server 2010 + * Microsoft Office Communications Server (OCS 2007/2007 R2) + * Microsoft Live Communications Server (LCS 2003/2005) + * Reuters Messaging + +This package provides the icon set for Empathy. + + +%if 0%{?build_ktp:1} +%package -n %{ktp_files} +Summary: Telepathy connection manager to connect to MS Office Communicator +Group: %{pkg_group} +License: GPL-2.0+ +Requires: %{telepathy_plugin} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description -n %{ktp_files} +A Telepathy connection manager that implements the extended version of +SIP/SIMPLE used by various products: + + * Microsoft Lync Server 2010 + * Microsoft Office Communications Server (OCS 2007/2007 R2) + * Microsoft Live Communications Server (LCS 2003/2005) + * Reuters Messaging + +This package provides the profile for KTP account manager. +%endif + + %package -n %{telepathy_plugin} -Summary: Telepathy connection manager for MS Office Communicator +Summary: Telepathy connection manager to connect to MS Office Communicator Group: %{pkg_group} License: GPL-2.0+ +Requires: %{common_files} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{telepathy_plugin} -A third-party plugin for the Pidgin multi-protocol instant messenger. -It implements the extended version of SIP/SIMPLE used by various products: +A Telepathy connection manager that implements the extended version of +SIP/SIMPLE used by various products: * Microsoft Lync Server 2010 * Microsoft Office Communications Server (OCS 2007/2007 R2) * Microsoft Live Communications Server (LCS 2003/2005) * Reuters Messaging -This package provides the connection manager for the telepathy multi-protocol -instant messaging core. +This package provides the protocol support for Telepathy clients. + + +%package -n %{common_files} +Summary: Common files for SIPE protocol plugins +Group: %{pkg_group} +License: GPL-2.0+ +BuildArch: noarch + +%description -n %{common_files} +This package provides common files for the SIPE protocol plugins: + + * Localisation %endif @@ -309,7 +369,7 @@ autoreconf --verbose --install --force %{mingw_ldflags}="-Wl,--exclude-libs=libintl.a -Wl,--exclude-libs=libiconv.a -lws2_32" %{mingw_configure} \ --enable-purple \ -%if %{build_telepathy} +%if 0%{?build_telepathy:1} --enable-telepathy %else --disable-telepathy @@ -328,7 +388,7 @@ autoreconf --verbose --install --force %endif %configure \ --enable-purple \ -%if %{build_telepathy} +%if 0%{?build_telepathy:1} --enable-telepathy %else --disable-telepathy @@ -377,6 +437,15 @@ find %{buildroot} -type f -name "*.la" -delete -print %if 0%{?suse_version} && 0%{?suse_version} < 1120 rm -r %{buildroot}/%{_datadir}/pixmaps/pidgin/protocols/scalable %endif +# Pidgin doesn't have 24 or 32 pixel icons +rm -f \ + %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/24/sipe.png \ + %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/32/sipe.png +%if 0%{?build_telepathy:1} +%if !0%{?build_ktp:1} +rm -r %{buildroot}%{_datadir}/telepathy +%endif +%endif %find_lang pidgin-sipe @@ -384,7 +453,11 @@ rm -r %{buildroot}/%{_datadir}/pixmaps/pidgin/protocols/scalable rm -rf %{buildroot} +%if 0%{?build_telepathy:1} +%files -n %{purple_plugin} +%else %files -n %{purple_plugin} -f pidgin-sipe.lang +%endif %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %if 0%{?mingw_prefix:1} @@ -394,6 +467,34 @@ rm -rf %{buildroot} %endif +%if 0%{?build_telepathy:1} +%files -n %{empathy_files} +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_datadir}/empathy/icons/hicolor/*/apps/im-sipe.png +%{_datadir}/empathy/icons/hicolor/*/apps/im-sipe.svg + + +%if 0%{?build_ktp:1} +%files -n %{ktp_files} +%defattr(-,root,root,-) +%doc AUTHORS COPYING +%{_datadir}/telepathy/profiles/sipe.profile +%endif + + +%files -n %{telepathy_plugin} +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{_datadir}/dbus-1/services/*.sipe.service +%{_libexecdir}/telepathy-sipe + + +%files -n %{common_files} -f pidgin-sipe.lang +%defattr(-,root,root,-) +%endif + + %files %defattr(-,root,root,-) %doc AUTHORS COPYING @@ -409,13 +510,6 @@ rm -rf %{buildroot} %endif -%if %{build_telepathy} -%files -n %{telepathy_plugin} -%defattr(-, root, root) -%{_libexecdir}/telepathy-sipe -%endif - - %if 0%{?mingw_prefix:1} %files -n %{nsis_package} %defattr(-, root, root) @@ -424,6 +518,9 @@ rm -rf %{buildroot} %changelog +* Thu Aug 30 2012 J. D. User 1.13.3-*git* +- updates to enable telepathy build + * Sun Aug 19 2012 J. D. User 1.13.3 - update to 1.13.3 diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index e803d47d..491737d1 100644 --- a/contrib/rpm/pidgin-sipe.spec +++ b/contrib/rpm/pidgin-sipe.spec @@ -106,13 +106,13 @@ This package provides the protocol plugin for libpurple clients. %if !0%{?_without_telepathy:1} %package -n %{empathy_files} -Summary: Telepathy communication manager to connect to MS Office Communicator +Summary: Telepathy connection manager to connect to MS Office Communicator Group: %{pkg_group} License: GPL-2.0+ Requires: %{telepathy_plugin} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{empathy_files} -A Telepathy communication manager that implements the extended version of +A Telepathy connection manager that implements the extended version of SIP/SIMPLE used by various products: * Microsoft Lync Server 2010 @@ -124,13 +124,13 @@ This package provides the icon set for Empathy. %package -n %{ktp_files} -Summary: Telepathy communication manager to connect to MS Office Communicator +Summary: Telepathy connection manager to connect to MS Office Communicator Group: %{pkg_group} License: GPL-2.0+ Requires: %{telepathy_plugin} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{ktp_files} -A Telepathy communication manager that implements the extended version of +A Telepathy connection manager that implements the extended version of SIP/SIMPLE used by various products: * Microsoft Lync Server 2010 @@ -142,13 +142,13 @@ This package provides the profile for KTP account manager. %package -n %{telepathy_plugin} -Summary: Telepathy communication manager to connect to MS Office Communicator +Summary: Telepathy connection manager to connect to MS Office Communicator Group: %{pkg_group} License: GPL-2.0+ Requires: %{common_files} = %{?epoch:%{epoch}:}%{version}-%{release} %description -n %{telepathy_plugin} -A Telepathy communication manager that implements the extended version of +A Telepathy connection manager that implements the extended version of SIP/SIMPLE used by various products: * Microsoft Lync Server 2010 -- 2.11.4.GIT