From a30d722e77ebc1c23768995d04084cc64a7be415 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Fri, 1 Jan 2016 01:10:29 +0100 Subject: [PATCH] RPM packaging: fix knemo build on opensuse tumbleweed --- redhat/applications/knemo/knemo-14.0.0.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/redhat/applications/knemo/knemo-14.0.0.spec b/redhat/applications/knemo/knemo-14.0.0.spec index 68180ac1b..47de607e9 100644 --- a/redhat/applications/knemo/knemo-14.0.0.spec +++ b/redhat/applications/knemo/knemo-14.0.0.spec @@ -78,8 +78,14 @@ BuildRequires: brp-check-trinity BuildRequires: gettext -%if 0%{?fedora} >= 18 +%if 0%{?fedora} >= 18 || 0%{?suse_version} +%if 0%{?suse_version} >= 1330 +BuildRequires: net-tools-deprecated +Requires: net-tools-deprecated +%else BuildRequires: net-tools +Requires: net-tools +%endif %endif @@ -114,6 +120,7 @@ Homepage: http://extragear.kde.org/apps/knemo/ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" + %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -139,6 +146,7 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} + %clean %__rm -rf %{buildroot} @@ -148,6 +156,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/crystalsvg || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : + %postun update-desktop-database %{tde_tdeappdir} > /dev/null touch --no-create %{tde_datadir}/icons/crystalsvg || : @@ -170,5 +179,3 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/crystalsvg || : %changelog -* Fri Jul 05 2013 Francois Andriot - 2:0.4.8-1 -- Initial release for TDE 14.0.0