From 14856e3d2cc14f8c578eb2dca1b21f0d5f5979e6 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Sun, 22 Oct 2017 17:59:01 +0300 Subject: [PATCH] contrib: remove support for obsolete platforms - Ubuntu 12.04 has reached EOL - clean up flagging in SPEC files --- contrib/opensuse-build-service/generate_debian.sh | 1 - contrib/opensuse-build-service/pidgin-sipe.spec | 65 ++--------------------- contrib/rpm/pidgin-sipe.spec | 28 +++------- 3 files changed, 12 insertions(+), 82 deletions(-) diff --git a/contrib/opensuse-build-service/generate_debian.sh b/contrib/opensuse-build-service/generate_debian.sh index b4b471de..4eb3551a 100755 --- a/contrib/opensuse-build-service/generate_debian.sh +++ b/contrib/opensuse-build-service/generate_debian.sh @@ -61,7 +61,6 @@ cp pidgin-sipe-gstreamer1.dsc pidgin-sipe.dsc for os in \ Debian_7.0 \ Debian_8.0 \ - xUbuntu_12.04 \ xUbuntu_14.04; \ do \ cp pidgin-sipe-telepathy.dsc pidgin-sipe-${os}.dsc; \ diff --git a/contrib/opensuse-build-service/pidgin-sipe.spec b/contrib/opensuse-build-service/pidgin-sipe.spec index b13d3c87..f9998d61 100644 --- a/contrib/opensuse-build-service/pidgin-sipe.spec +++ b/contrib/opensuse-build-service/pidgin-sipe.spec @@ -78,7 +78,6 @@ %define ktp_files ktp-accounts-kcm-sipe -%define has_make_install 1 %define has_pidgin 1 %if 0%{?mageia} @@ -89,21 +88,9 @@ %if 0%{?suse_version} %define dbus_devel dbus-1-devel %define nss_develname mozilla-nss-devel -# SLES11 defines suse_version = 1110 -%if 0%{?suse_version} > 1110 %define has_appdata 1 -%define has_libnice 1 %define has_gstreamer 1 %define build_telepathy 1 -%define nice_gstreamer gstreamer-0_10-libnice -# Leap 42.1 or SLES12 -%if 0%{?suse_version} >= 1315 -%define has_gstreamer1 1 -%define has_farstream 1 -%undefine has_gstreamer -%undefine nice_gstreamer -%endif -%endif %else %define nss_develname nss-devel %endif @@ -124,40 +111,21 @@ %if 0%{?fedora} %define dbus_devel dbus-devel -%define has_libnice 1 +%define has_appdata 1 +%define has_gssntlmssp 1 %define has_gstreamer 1 %define build_telepathy 1 %define build_ktp 1 -%if 0%{?fedora} >= 20 -%define has_farstream 1 -%define nice_gstreamer libnice-gstreamer -%if 0%{?fedora} >= 21 -%define has_appdata 1 -%define has_gssntlmssp 1 -%if 0%{?fedora} >= 22 -%define has_gstreamer1 1 -%undefine has_gstreamer -%undefine nice_gstreamer -%endif -%endif -%endif %endif %if 0%{?centos_version} || 0%{?scientificlinux_version} %define dbus_devel dbus-devel %define rhel_base_version %{?centos_version}%{?scientificlinux_version} -%if %{rhel_base_version} < 600 -%define has_make_install 0 -%endif -%if %{rhel_base_version} >= 600 -%define has_gstreamer 1 -%define has_libnice 1 %if %{rhel_base_version} >= 700 # pidgin has been removed, but libpurple still exists %define has_pidgin 0 %endif %endif -%endif %if 0%{?purple_sipe_mingw32} Name: mingw32-pidgin-sipe @@ -208,7 +176,6 @@ BuildRequires: %{mingw_prefix}pidgin # # Special case handling for Mageia %if 0%{?mageia} -BuildRequires: intltool BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gio-2.0) @@ -230,24 +197,11 @@ BuildRequires: %{dbus_devel} BuildRequires: libxml2-devel BuildRequires: %{nss_develname} BuildRequires: gettext-devel -# The following two are required to enable Voice & Video features -%if 0%{?has_libnice:1} -BuildRequires: libnice-devel -%if 0%{?nice_gstreamer:1} -# Dependency required when gstreamer support is split into two packages -Requires: %{nice_gstreamer} -%endif -%endif -%if 0%{?has_gstreamer1:1} -BuildRequires: pkgconfig(gstreamer-1.0) -%else %if 0%{?has_gstreamer:1} -BuildRequires: pkgconfig(gstreamer-0.10) -%endif -%endif -%if 0%{?has_farstream:1} BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gstreamer-1.0) +BuildRequires: libnice-devel %endif # Requirements for telepathy backend %if 0%{?build_telepathy:1} @@ -519,20 +473,12 @@ rm -f %{buildroot}/pidgin-sipe.nsi # # Standard Linux install # -%if 0%{?has_make_install} %make_install -%else -%makeinstall -%endif # End Windows cross-compilation/Linux build setup %endif 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 # Pidgin doesn't have 24 or 32 pixel icons rm -f \ %{buildroot}%{_datadir}/pixmaps/pidgin/protocols/24/sipe.png \ @@ -614,12 +560,9 @@ rm -rf %{buildroot} %{_datadir}/appdata/%{name}.metainfo.xml %endif %{_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 %endif -%endif %if 0%{?mingw_prefix:1} diff --git a/contrib/rpm/pidgin-sipe.spec b/contrib/rpm/pidgin-sipe.spec index b6db7af7..7d38d980 100644 --- a/contrib/rpm/pidgin-sipe.spec +++ b/contrib/rpm/pidgin-sipe.spec @@ -10,7 +10,7 @@ # # Run "./git-snapshot.sh ." in your local repository. # Then update the following line from the generated archive name -%define git 20160405git4fedafa +%define git 20171022gitfe34eaec # Increment when you generate several RPMs on the same day... %define gitcount 0 #------------------------------- BUILD FROM GIT ------------------------------- @@ -57,16 +57,8 @@ BuildRequires: libtool BuildRequires: pkgconfig(purple) >= 2.8.0 BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gio-2.0) -BuildRequires: pkgconfig(nice) >= 0.1.0 -%if 0%{?fedora} >= 22 BuildRequires: pkgconfig(gstreamer-1.0) -%else -%if 0%{?fedora} >= 20 -# Dependency required when gstreamer support is split into two packages -%define requires_libnice_gstreamer 1 -%endif -BuildRequires: pkgconfig(gstreamer-0.10) -%endif +BuildRequires: pkgconfig(nice) >= 0.1.0 %endif # Use "--without telepathy" to disable telepathy %if !0%{?_without_telepathy:1} @@ -82,7 +74,7 @@ BuildRequires: gmime-devel # Use "--without kerberos" to disable krb5 %if !0%{?_without_kerberos:1} BuildRequires: krb5-devel -%if 0%{?fedora} >= 21 +%if 0%{?fedora} || 0%{?rhel} >= 7 BuildRequires: gssntlmssp-devel >= 0.5.0 %define requires_gssntlmssp 1 %endif @@ -114,9 +106,6 @@ Group: %{pkg_group} License: GPLv2+ Requires: %{common_files} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?requires_libnice_gstreamer} -Requires: libnice-gstreamer -%endif %if 0%{?requires_gssntlmssp} Requires: gssntlmssp >= 0.5.0 %endif @@ -182,10 +171,6 @@ Group: %{pkg_group} License: GPLv2+ Requires: %{common_files} = %{?epoch:%{epoch}:}%{version}-%{release} -%if 0%{?requires_libnice_gstreamer} -# @TODO: remove comment when telepathy plugin supports Voice & Video features -#Requires: libnice-gstreamer -%endif %if 0%{?requires_gssntlmssp} Requires: gssntlmssp >= 0.5.0 %endif @@ -243,11 +228,10 @@ This package provides common files for the SIPE protocol plugins: --disable-telepathy %endif make %{?_smp_mflags} -make %{?_smp_mflags} check %install -%makeinstall +%make_install find %{buildroot} -type f -name "*.la" -delete -print # Pidgin doesn't have 24 or 32 pixel icons rm -f \ @@ -256,6 +240,10 @@ rm -f \ %find_lang %{name} +%check +make %{?_smp_mflags} check + + %clean rm -rf %{buildroot} -- 2.11.4.GIT