RPM packaging: fix tdeutils, tdewebdev build on r14.0.x

2 files changed, 48 insertions, 1 deletions

diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 5dd981dcd..dfd46f806 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -156,6 +156,9 @@ BuildRequires:	%{_lib}xscrnsaver%{?mgaversion:1}-devel
 %define dont_relink 1
 %endif
 
+%if "%{?tde_version}" == "14.1.0"
+%define build_tdefilereplace 1
+%endif
 
 Requires: trinity-ark = %{version}-%{release}
 Requires: trinity-kcalc = %{version}-%{release}
@@ -176,8 +179,9 @@ Requires: trinity-ksim = %{version}-%{release}
 Requires: trinity-ktimer = %{version}-%{release}
 Requires: trinity-tdewalletmanager = %{version}-%{release}
 Requires: trinity-superkaramba = %{version}-%{release}
+%if 0%{?build_tdefilereplace}
 Requires: trinity-tdefilereplace = %{version}-%{release}
-
+%endif
 
 %description
 Utilities for the Trinity Desktop Environment, including:
@@ -761,6 +765,8 @@ Here are just some examples of the things that can be done:
 
 ##########
 
+%if 0%{?build_tdefilereplace}
+
 %package -n trinity-tdefilereplace
 Summary:	Batch search-and-replace component for TDE
 Group:		Applications/Utilities
@@ -786,6 +792,8 @@ This package is part of Trinity, as a component of the TDE utilities module.
 %{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
 %{tde_datadir}/services/tdefilereplacepart.desktop
 
+%endif
+
 ##########
 
 # afaik, nobody BR's it, and it pulls kdeutils into multilib -- Rex
@@ -957,8 +965,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file thinkpad
 %suse_update_desktop_file kvaio
 %suse_update_desktop_file KFloppy            System  Filesystem
+%if 0%{?build_tdefilereplace}
 %suse_update_desktop_file -r tdefilereplace   System      FileManager
 %endif
+%endif
 
 # Icons from TDE Control Center should only be displayed in TDE
 for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
index 557931db4..3c1339762 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
@@ -94,6 +94,9 @@ BuildRequires:	perl
 BuildRequires:	libxml2-devel
 #endif
 
+%if "%{?tde_version}" != "14.1.0"
+%define build_tdefilereplace 1
+%endif
 
 Obsoletes:	trinity-kdewebdev-libs < %{version}-%{release}
 Provides:	trinity-kdewebdev-libs = %{version}-%{release}
@@ -367,6 +370,37 @@ This package is part of TDE, as a component of the TDE web development module.
 
 ##########
 
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary:	Batch search-and-replace component for TDE
+Group:		Applications/Utilities
+
+%description -n trinity-tdefilereplace
+TDEFileReplace is an embedded component for TDE that acts as a batch
+search-and-replace tool. It allows you to replace one expression with
+another in many files at once.
+
+Note that at the moment TDEFileReplace does not come as a standalone
+application.
+
+This package is part of Trinity, as a component of the TDE utilities module.
+
+%files -n trinity-tdefilereplace
+%{tde_bindir}/tdefilereplace
+%{tde_tdelibdir}/libtdefilereplacepart.la
+%{tde_tdelibdir}/libtdefilereplacepart.so
+%{tde_tdeappdir}/tdefilereplace.desktop
+%{tde_datadir}/apps/tdefilereplace/
+%{tde_datadir}/apps/tdefilereplacepart/
+%{tde_tdedocdir}/HTML/en/tdefilereplace/
+%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
+%{tde_datadir}/services/tdefilereplacepart.desktop
+
+%endif
+
+##########
+
 %package devel
 Group: Development/Libraries
 Summary:	Header files and documentation for %{name} 
@@ -470,6 +504,9 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
 %suse_update_desktop_file    kmdr-editor      Development GUIDesigner
 %suse_update_desktop_file    kmdr-executor    Development GUIDesigner
 %suse_update_desktop_file -r quanta           Office WebDevelopment
+%if 0%{?build_tdefilereplace}
+%suse_update_desktop_file -r tdefilereplace   System      FileManager
+%endif
 %endif
 
 # Adds missing icons in 'hicolor' theme