[kdenetwork] - omit FTBFS kopete for now (#724846)
Rex Dieter
rdieter at fedoraproject.org
Sun Jul 31 16:50:37 UTC 2011
commit 3cb07972700b2a5de25f0ce776ab72a07e596b09
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jul 31 11:55:59 2011 -0500
- omit FTBFS kopete for now (#724846)
kdenetwork.spec | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
---
diff --git a/kdenetwork.spec b/kdenetwork.spec
index 421f1e2..1a1f09f 100644
--- a/kdenetwork.spec
+++ b/kdenetwork.spec
@@ -1,3 +1,4 @@
+
Summary: KDE Network Applications
Name: kdenetwork
Epoch: 7
@@ -19,6 +20,12 @@ Patch1: kdenetwork-4.2.98-kdrc-icon.patch
# rhbz#540433 - KPPP is unable to add DNS entries to /etc/resolv.conf
Patch2: kdenetwork-4.3.3-resolv-conf-path.patch
+# HACK to omit FTBFS kopete for now
+# test against _qt48 macro when available -- rex
+%if 0%{?fedora} < 16
+%define kopete 1
+%endif
+
## upstream patches
## security patches
@@ -79,7 +86,9 @@ Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: %{name}-fileshare-samba = %{epoch}:%{version}-%{release}
Requires: %{name}-kdnssd = %{epoch}:%{version}-%{release}
Requires: %{name}-kget = %{epoch}:%{version}-%{release}
+%if 0%{?kopete}
Requires: %{name}-kopete = %{epoch}:%{version}-%{release}
+%endif
Requires: %{name}-kppp = %{epoch}:%{version}-%{release}
Requires: %{name}-krdc = %{epoch}:%{version}-%{release}
Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
@@ -87,7 +96,9 @@ Requires: %{name}-krfb = %{epoch}:%{version}-%{release}
%description
Networking applications, including:
* kget: downloader manager
+%if 0%{?kopete}
* kopete: chat client
+%endif
* kppp: dialer and front end for pppd
* krdc: a client for Desktop Sharing and other VNC servers
* krfb: Desktop Sharing server, allow others to access your desktop via VNC
@@ -97,13 +108,19 @@ Summary: Common files for %{name}
BuildArch: noarch
# when split occurred
Conflicts: kdenetwork < 7:4.6.95-10
+%if ! 0%{?kopete}
+Obsoletes: %{name}-kopete < %{epoch}:%{version}-%{release}
+Obsoletes: %{name}-kopete-devel < %{epoch}:%{version}-%{release}
+%endif
%description common
%{summary}.
%package devel
Summary: Development files for %{name}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+%if 0%{?kopete}
Requires: %{name}-kopete-devel = %{epoch}:%{version}-%{release}
+%endif
Requires: %{name}-krdc-devel = %{epoch}:%{version}-%{release}
BuildArch: noarch
%description devel
@@ -217,6 +234,7 @@ pushd %{_target_platform}
%{cmake_kde4} \
-DWITH_JINGLE=TRUE \
-DMOZPLUGIN_INSTALL_DIR=%{_libdir}/mozilla/plugins \
+ %{!?kopete: -DBUILD_kopete:BOOL=OFF} \
..
popd
@@ -240,7 +258,9 @@ install -m 644 %{SOURCE2} %{buildroot}%{_sysconfdir}/security/console.apps/kppp
install -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kppp
%find_lang kget --with-kde --without-mo
+%if 0%{?kopete}
%find_lang kopete --with-kde --without-mo
+%endif
%find_lang kppp --with-kde --without-mo
%find_lang krdc --with-kde --without-mo
%find_lang krfb --with-kde --without-mo
@@ -326,6 +346,7 @@ fi
%files kget-libs
%{_kde4_libdir}/libkgetcore.so.4*
+%if 0%{?kopete}
%post kopete
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||:
@@ -392,6 +413,7 @@ fi
%files kopete-devel
%{_kde4_includedir}/kopete/
%{_kde4_libdir}/libkopete*.so
+%endif
%post kppp
touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||:
@@ -470,6 +492,7 @@ fi
%changelog
* Tue Jul 26 2011 Jaroslav Reznik <jreznik at redhat.com> 7:4.7.0-1
- 4.7.0
+- omit FTBFS kopete for now (#724846)
* Thu Jul 21 2011 Rex Dieter <rdieter at fedoraproject.org> 7:4.6.95-10
- kdenetwork split packaging (#724053)
More information about the scm-commits
mailing list