From d27118499ec63eb6a9c68374b38ab11fe9c7f5f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Fri, 24 Jan 2014 20:49:40 +0100
Subject: RPM Packaging: update R14 packages

---
 redhat/tdeadmin/tdeadmin-14.0.0.spec | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

(limited to 'redhat/tdeadmin/tdeadmin-14.0.0.spec')

diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec
index e5d2e8d17..f1f7b6764 100644
--- a/redhat/tdeadmin/tdeadmin-14.0.0.spec
+++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec
@@ -52,7 +52,12 @@ BuildRequires: trinity-arts-devel >= 1:1.5.10
 BuildRequires: trinity-tdelibs-devel >= %{tde_version}
 BuildRequires: rpm-devel
 BuildRequires: pam-devel
+
 %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+#define with_lilo 1
+%endif
+
+%if 0%{?with_lilo}
 BuildRequires:	lilo
 %endif
 
@@ -64,8 +69,10 @@ Requires: trinity-knetworkconf = %{version}-%{release}
 Requires: trinity-kpackage = %{version}-%{release}
 Requires: trinity-ksysv = %{version}-%{release}
 Requires: trinity-kuser = %{version}-%{release}
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_lilo}
 Requires: trinity-lilo-config = %{version}-%{release}
+%else
+Obsoletes: trinity-lilo-config
 %endif
 
 # CONSOLEHELPER (usermode) support
@@ -83,10 +90,6 @@ kcron, kdat, knetworkconf, kpackage, ksysv, kuser.
 
 %files
 %defattr(-,root,root,-)
-# LILO is not provided in RHEL or Fedora
-%if 0%{?rhel} || 0%{?fedora}
-%exclude %{tde_tdedocdir}/HTML/en/lilo-config/
-%endif
 
 ##########
 
@@ -340,7 +343,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
 
 ##########
 
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
+%if 0%{?with_lilo}
 %package -n trinity-lilo-config
 Summary:	Trinity frontend for lilo configuration
 Group:		Applications/Utilities
@@ -388,7 +391,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Specific path for RHEL4
 if [ -d /usr/X11R6 ]; then
-  export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
+  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
 fi
 
 %configure \
@@ -461,6 +464,14 @@ done
 #  * Removed useless program secpolicy. (Closes: #399426)
 %__rm -f %{?buildroot}%{tde_bindir}/secpolicy
 
+# Remove lilo related files, if unwanted.
+%if 0%{?with_lilo} == 0
+%__rm -rf %{?buildroot}%{tde_tdedocdir}/HTML/en/lilo-config/
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.la
+%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_lilo.so
+%__rm -f %{?buildroot}%{tde_tdeappdir}/lilo.desktop
+%endif
+
 
 %clean
 %__rm -rf %{buildroot}
-- 
cgit v1.2.3