RPM: merge redhat directory with master branch

1 files changed, 50 insertions, 140 deletions

diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
index a01117ef5..4ddcde0b9 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package tdewebdev (version R14.0.0)
+# spec file for package tdewebdev (version R14)
 #
 # Copyright (c) 2014 Trinity Desktop Environment
 #
@@ -12,7 +12,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 #
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
 # BUILD WARNING:
@@ -21,7 +21,9 @@
 
 # TDE variables
 %define tde_epoch 2
+%if "%{?tde_version}" == ""
 %define tde_version 14.0.0
+%endif
 %define tde_pkg tdewebdev
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
@@ -34,17 +36,12 @@
 %define tde_tdeincludedir %{tde_includedir}/tde
 %define tde_tdelibdir %{tde_libdir}/trinity
 
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
 
 Name:		trinity-%{tde_pkg}
-Summary:	Web development applications 
+Summary:	Web development applications
 Group:		Applications/Editors
 Version:	%{tde_version}
-Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release:	%{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
 URL:		http://www.trinitydesktop.org/
 
 %if 0%{?suse_version}
@@ -65,6 +62,8 @@ Source2:	http://download.sourceforge.net/quanta/html.tar.bz2
 Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
 
+Source10:		%{name}-rpmlintrc
+
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdesdk-devel >= %{tde_version}
 
@@ -97,6 +96,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}
@@ -105,7 +107,6 @@ Provides:	trinity-kdewebdev = %{version}-%{release}
 
 Requires: trinity-quanta = %{version}-%{release}
 Requires: trinity-quanta-data = %{version}-%{release}
-Requires: trinity-tdefilereplace = %{version}-%{release}
 Requires: trinity-kimagemapeditor = %{version}-%{release}
 Requires: trinity-klinkstatus = %{version}-%{release}
 Requires: trinity-kommander = %{version}-%{release}
@@ -113,7 +114,6 @@ Requires: trinity-kommander = %{version}-%{release}
 
 %description
 Web development applications, including:
-* tdefilereplace: batch search and replace tool
 * kimagemapeditor: HTML image map editor
 * klinkstatus: link checker
 * kommander: visual dialog building tool
@@ -128,7 +128,7 @@ Web development applications, including:
 %package -n trinity-quanta
 Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
-Requires:	trinity-tdefilereplace = %{version}-%{release}
+Requires:	trinity-tdefilereplace
 Requires:	trinity-klinkstatus = %{version}-%{release}
 Requires:	trinity-kommander = %{version}-%{release}
 Requires:	trinity-quanta-data = %{version}-%{release}
@@ -169,21 +169,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/servicetypes/quantadebugger.desktop
 %{tde_tdedocdir}/HTML/en/quanta/
 
-%post -n trinity-quanta
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-quanta
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-
 ##########
 
 %package -n trinity-quanta-data
@@ -205,52 +190,6 @@ This package is part of TDE, as a component of the TDE web development module.
 
 ##########
 
-%package -n trinity-tdefilereplace
-Summary:	batch search-and-replace component for TDE [Trinity]
-Group:		Applications/Development
-
-Obsoletes:	trinity-kfilereplace < %{version}-%{release}
-Provides:	trinity-kfilereplace = %{version}-%{release}
-
-%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. An example of an application that uses the tdefileReplace
-component is Quanta Plus (found in the package quanta).
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-tdefilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefilereplace
-%{tde_tdelibdir}/libtdefilereplacepart.la
-%{tde_tdelibdir}/libtdefilereplacepart.so
-%{tde_tdeappdir}/tdefilereplace.desktop
-%{tde_datadir}/apps/tdefilereplace/
-%{tde_datadir}/apps/tdefilereplacepart
-%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
-%{tde_datadir}/services/tdefilereplacepart.desktop
-%{tde_tdedocdir}/HTML/en/tdefilereplace/
-
-%post -n trinity-tdefilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdefilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
 %package -n trinity-kimagemapeditor
 Summary:	HTML image map editor for TDE
 Group:		Applications/Development
@@ -274,20 +213,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/services/kimagemapeditorpart.desktop
 %{tde_tdedocdir}/HTML/en/kimagemapeditor/
 
-%post -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kimagemapeditor
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-klinkstatus
@@ -318,20 +243,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/services/klinkstatus_part.desktop
 %{tde_tdedocdir}/HTML/en/klinkstatus/
 
-%post -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-klinkstatus
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kommander
@@ -384,22 +295,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/apps/tdevappwizard/
 %{tde_datadir}/services/kommander_part.desktop
 
-%post -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-kommander
-/sbin/ldconfig || :
-for f in crystalsvg hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
 ##########
 
 %package -n trinity-kommander-devel
@@ -429,12 +324,6 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_tdeincludedir}/kommander*
 %{tde_tdeincludedir}/specials.h
 
-%post -n trinity-kommander-devel
-/sbin/ldconfig || :
-
-%postun -n trinity-kommander-devel
-/sbin/ldconfig || :
-
 ##########
 
 %if 0%{?build_kxsldbg}
@@ -479,19 +368,40 @@ This package is part of TDE, as a component of the TDE web development module.
 %{tde_datadir}/icons/locolor/*/apps/kxsldbg.png
 %{tde_datadir}/services/kxsldbg_part.desktop
 
-%post -n trinity-kxsldbg
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+%endif
 
-%postun -n trinity-kxsldbg
-for f in hicolor locolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
+##########
+
+%if 0%{?build_tdefilereplace}
+
+%package -n trinity-tdefilereplace
+Summary:	Batch search-and-replace component for TDE
+Group:		Applications/Utilities
+
+Obsoletes:	trinity-kfilereplace < %{version}-%{release}
+Provides:	trinity-kfilereplace = %{version}-%{release}
+
+%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
+%defattr(-,root,root,-)
+%{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
 
@@ -529,7 +439,7 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 %endif
 
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
+%__cp -f "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
 %__make -f "admin/Makefile.common"
 
 
@@ -561,7 +471,7 @@ fi
   \
   --enable-editors \
   --with-extra-includes=%{_includedir}/tqt
-  
+
 
 # WTF hack for RHEL4
 %if 0%{?rhel} == 4
@@ -597,10 +507,12 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
 %suse_update_desktop_file -r kxsldbg          Office WebDevelopment
 %endif
 %suse_update_desktop_file -r kimagemapeditor  Office WebDevelopment
-%suse_update_desktop_file -r tdefilereplace   System      FileManager
 %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
@@ -615,5 +527,3 @@ popd
 
 
 %changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0