RPM Packaging: update some packages

10 files changed, 18 insertions, 33 deletions

diff --git a/redhat/applications/krusader/krusader-3.5.13.2.spec b/redhat/applications/krusader/krusader-3.5.13.2.spec
index a5e2f7623..22728025c 100644
--- a/redhat/applications/krusader/krusader-3.5.13.2.spec
+++ b/redhat/applications/krusader/krusader-3.5.13.2.spec
@@ -87,7 +87,8 @@ great on your desktop.
 
 
 %build
-unset QTDIR; . /etc/profile.d/qt3.sh
+unset QTDIR QTINC QTLIB
+. /etc/profile.d/qt3.sh
 export PATH="%{tde_bindir}:${PATH}"
 
 # Warning: --enable-final causes FTBFS
diff --git a/redhat/applications/tork/tork-14.0.0.spec b/redhat/applications/tork/tork-14.0.0.spec
index 35595c05c..a750ee4e4 100644
--- a/redhat/applications/tork/tork-14.0.0.spec
+++ b/redhat/applications/tork/tork-14.0.0.spec
@@ -114,6 +114,7 @@ done
 %doc AUTHORS COPYING README TODO ChangeLog USINGTORK
 %{tde_bindir}/tork
 %{tde_bindir}/torkarkollon
+%{tde_bindir}/usewithtor
 %{tde_tdeappdir}/tork.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithfirefox.desktop
 %{tde_datadir}/apps/konqueror/servicemenus/tork_downloadwithkonqueror.desktop
diff --git a/redhat/dependencies/arts/arts-14.0.0.spec b/redhat/dependencies/arts/arts-14.0.0.spec
index 0afd17efd..1f7408f49 100644
--- a/redhat/dependencies/arts/arts-14.0.0.spec
+++ b/redhat/dependencies/arts/arts-14.0.0.spec
@@ -15,11 +15,6 @@
 # Please submit bugfixes or comments via http:/www.trinitydesktop.org/
 #
 
-# 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
-
 # TDE variables
 %define tde_version 14.0.0
 %define tde_prefix /opt/trinity
@@ -27,13 +22,17 @@
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
 %define tde_datadir %{tde_prefix}/share
-
 %define tde_tdeincludedir %{tde_includedir}/tde
-
 %define _docdir %{tde_datadir}/doc
 
+# 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-arts
-Epoch:		1
+Epoch:		2
 Version:	1.5.10
 Release:	%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant}
 Summary:	ARTS (analog realtime synthesizer) - the TDE sound system
diff --git a/redhat/tde-i18n/tde-i18n-14.0.0.spec b/redhat/tde-i18n/tde-i18n-14.0.0.spec
index ed153b693..47129a3c7 100644
--- a/redhat/tde-i18n/tde-i18n-14.0.0.spec
+++ b/redhat/tde-i18n/tde-i18n-14.0.0.spec
@@ -47,14 +47,11 @@ AutoReq: no
 
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
 
-# Main patch: lots of updates for TDE R14.0.0
-Patch1:		tde-i18n-14.0.0-extra_translations.patch
-Patch2:		tde-i18n-14.0.0-updates.patch
+BuildRequires:	trinity-arts-devel >= 1:1.5.10
+BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 BuildRequires:	findutils
 BuildRequires:	gettext
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 
 %description
 %{summary}.
@@ -684,10 +681,6 @@ Provides:	 trinity-kde-i18n-Chinese-Big5 = %{version}-%{release}
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-# Patches for French translations
-%patch1 -p1
-%patch2 -p1
-
 
 %build
 unset QTDIR QTINC QTLIB
diff --git a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
index 4aa8bd35a..db8052381 100644
--- a/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
+++ b/redhat/tdebase/tdebase-14.0.0-default_menu_icon.patch
@@ -5,10 +5,10 @@
  fi
  
 +# Default Start Button icon for TDE
-+if [ ! -e  $tdehome/share/config/kickerrc ]; then
++if [ ! -e "$tdehome/share/config/kickerrc" ]; then
 +  if [ -r "%{tde_starticon}" ]; then
 +    [ -d "$tdehome/share/config" ] || mkdir -p "$tdehome/share/config"
-+    cat <<EOF >$tdehome/share/config/kickerrc
++    cat <<EOF >"$tdehome/share/config/kickerrc"
 +[KMenu]
 +CustomIcon=%{tde_starticon}
 +EOF
diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec
index ecc1090ac..a32f8d1aa 100644
--- a/redhat/tdebindings/tdebindings-14.0.0.spec
+++ b/redhat/tdebindings/tdebindings-14.0.0.spec
@@ -1010,7 +1010,6 @@ exit 1
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 unset JAVA_HOME ||:
 %{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
diff --git a/redhat/tdeedu/tdeedu-14.0.0.spec b/redhat/tdeedu/tdeedu-14.0.0.spec
index 43686086d..bcb387ef5 100644
--- a/redhat/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/tdeedu/tdeedu-14.0.0.spec
@@ -1321,7 +1321,6 @@ Provides:	trinity-kdeedu-devel = %{version}-%{release}
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index c99664674..4f3efc16b 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -1107,7 +1107,7 @@ update-desktop-database 2> /dev/null || :
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec
index b68866c50..e7298311e 100644
--- a/redhat/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/tdeutils/tdeutils-14.0.0.spec
@@ -968,7 +968,7 @@ Development files for %{name}.
 
 ##########
 
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos}
 %debug_package
 %endif
 
@@ -1025,7 +1025,7 @@ fi
   -DWITH_SNMP=ON \
   -DWITH_SENSORS=ON \
   -DWITH_XMMS=ON \
-  -DWITH_KNEWSTUFF=ON \
+  -DWITH_TDENEWSTUFF=ON \
   -DBUILD_ALL=ON \
   %{?!build_klaptopdaemon:-DBUILD_KLAPTOPDAEMON=OFF} \
   ..
diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec
index cc00be441..6da94dfe9 100644
--- a/redhat/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec
@@ -41,9 +41,6 @@ Source3:	http://download.sourceforge.net/quanta/php_manual_en_20030401.tar.bz2
 Source4:	http://download.sourceforge.net/quanta/javascript.tar.bz2
 Source5:	hi48-app-kxsldbg.png
 
-Patch0:		tdewebdev-14.0.0-ftbfs.patch
-Patch1:		kdewebdev-3.5.4-kxsldbg-icons.patch
-
 BuildRequires:	autoconf automake libtool m4
 BuildRequires:	desktop-file-utils
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -491,9 +488,6 @@ Requires:	trinity-kommander-devel = %{version}-%{release}
 
 %prep
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -a 1 -a 2 -a 3 -a 4
-%patch0 -p1 -b .ftbfs
-%patch1 -p1 -b .kxsldbg-icons
-rm -rf lib/compatibility
 
 %__install -m644 -p %{SOURCE5} kxsldbg/
 %if 0%{?build_kxsldbg} == 0
@@ -508,11 +502,10 @@ rm -rf lib/compatibility
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
 
 # 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
 
 # Warning: GCC visibility causes FTBFS [Bug #1285]