diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 3804e7c..75a9683 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -56,6 +56,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
+Source1: trinity-tdebase-rpmlintrc
# Pam configuration files for RHEL / Fedora
%if 0%{?suse_version} == 0
@@ -250,7 +251,7 @@
%define tde_starticon /usr/share/icons/hicolor/scalable/apps/distributor.svg
%endif
-BuildRequires: trinity-arts-devel >= 2:1.5.10
+BuildRequires: trinity-arts-devel >= %{tde_epoch}:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: cmake >= 2.8
@@ -329,18 +330,12 @@
BuildRequires: libsensors4-devel
%endif
-# UDEV support (requires libudev)
+# TSAK support (requires libudev-devel)
# On RHEL5, udev is built statically, so TSAK cannot build.
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 || 0%{?suse_version}
BuildRequires: libudev-devel
%define with_tsak 1
%define with_tdehwlib 1
-%endif
-
-# HAL support
-%if 0%{?rhel} == 5
-BuildRequires: hal-devel >= 0.5
-%define with_hal 1
%endif
# XRANDR support
@@ -355,6 +350,13 @@
%define with_xtest 1
%endif
+# HAL support
+# Only for RHEL5
+%if 0%{?rhel} == 5
+%define with_hal 1
+BuildRequires: hal-devel >= 0.5
+%endif
+
# OPENEXR support
# Disabled on RHEL4
%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
@@ -364,7 +366,7 @@
# XSCREENSAVER support
# Disabled on RHEL4, RHEL >= 7
-%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version}
+%if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?suse_version} || 0%{?with_xscreensaver}
%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
%define with_xscreensaver 1
%if 0%{?rhel} == 5
@@ -722,7 +724,7 @@
##########
%package -n trinity-kappfinder
-Summary: non-TDE application finder for TDE
+Summary: Non-TDE application finder for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
@@ -774,7 +776,7 @@
##########
%package -n trinity-kate
-Summary: advanced text editor for TDE
+Summary: Advanced text editor for TDE
Group: Applications/Text
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-kwrite = %{version}-%{release}
@@ -859,7 +861,7 @@
##########
%package -n trinity-kwrite
-Summary: advanced text editor for TDE
+Summary: Advanced text editor for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
Requires: trinity-libkateinterfaces = %{version}-%{release}
@@ -898,7 +900,7 @@
##########
%package -n trinity-kcontrol
-Summary: control center for TDE
+Summary: Control center for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
@@ -1221,7 +1223,7 @@
##########
%package bin
-Summary: core binaries for the TDE base module
+Summary: Core binaries for the TDE base module
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
Requires: pam
@@ -1237,7 +1239,6 @@
%defattr(-,root,root,-)
%{tde_bindir}/krootbacking
%if 0%{?with_tsak}
-%attr(4511,root,root) %{tde_bindir}/tdmtsak
%{tde_bindir}/tsak
%endif
%{tde_bindir}/compton-tde
@@ -1250,11 +1251,9 @@
%{tde_bindir}/crashtest
%{tde_bindir}/kapplymousetheme
%{tde_bindir}/kblankscrn.kss
-%attr(4755,root,root) %{tde_bindir}/kcheckpass
%{tde_bindir}/kcminit
%{tde_bindir}/kcminit_startup
%{tde_bindir}/kdcop
-%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
%{tde_bindir}/tdesu
%attr(0755,root,root) %{tde_bindir}/tdesud
%{tde_bindir}/kdialog
@@ -1319,6 +1318,22 @@
%{tde_tdedocdir}/HTML/en/knetattach/
%{tde_tdedocdir}/HTML/en/kxkb/
+# SETUID binaries
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%if %{?with_tsak}
+%verify(not mode) %{tde_bindir}/tdmtsak
+%endif
+%verify(not mode) %{tde_bindir}/kcheckpass
+%verify(not mode) %{tde_bindir}/tdekbdledsync
+%else
+%if %{?with_tsak}
+%attr(4511,root,root) %{tde_bindir}/tdmtsak
+%endif
+%attr(4755,root,root) %{tde_bindir}/kcheckpass
+%attr(4755,root,root) %{tde_bindir}/tdekbdledsync
+%endif
+
%post bin
/sbin/ldconfig || :
update-desktop-database %{tde_appdir} 2> /dev/null || :
@@ -1354,7 +1369,7 @@
##########
%package data
-Summary: shared data files for the TDE base module
+Summary: Shared data files for the TDE base module
Group: Environment/Libraries
Requires: %{name}-runtime-data-common = %{version}-%{release}
@@ -1630,7 +1645,6 @@
%{tde_tdedocdir}/HTML/en/kcontrol/
%exclude %{tde_tdedocdir}/HTML/en/kcontrol/kcmkonsole/
-#%{tde_tdedocdir}/HTML/en/kinfocenter/
%post data
for f in crystalsvg ; do
@@ -1663,7 +1677,7 @@
##########
%package tdeio-plugins
-Summary: core I/O slaves for TDE
+Summary: Core I/O slaves for TDE
Group: Applications/Utilities
Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl
@@ -1833,7 +1847,7 @@
##########
%package -n trinity-tdepasswd
-Summary: password changer for TDE
+Summary: Password changer for TDE
Group: Applications/Utilities
Obsoletes: trinity-kdepasswd < %{version}-%{release}
@@ -1891,7 +1905,7 @@
##########
%package -n trinity-tdeprint
-Summary: print system for TDE
+Summary: Print system for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
Requires: psutils
@@ -1968,7 +1982,7 @@
##########
%package -n trinity-kdesktop
-Summary: miscellaneous binaries and files for the TDE desktop
+Summary: Miscellaneous binaries and files for the TDE desktop
Group: Applications/Utilities
Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release}
@@ -2042,6 +2056,7 @@
Requires: %{name}-bin = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release}
Requires: pam
+Requires: logrotate
# Provides the global Xsession script (/etc/X11/xinit/Xsession or /etc/X11/Xsession)
%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} == 4
@@ -2147,7 +2162,7 @@
%endif
# Logrotate configuration
-%{_sysconfdir}/logrotate.d/tdm
+%config %{_sysconfdir}/logrotate.d/tdm
%pre -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm'
@@ -2229,7 +2244,7 @@
##########
%package -n trinity-kfind
-Summary: file-find utility for TDE
+Summary: File-find utility for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
@@ -2266,7 +2281,7 @@
##########
%package -n trinity-khelpcenter
-Summary: help center for TDE
+Summary: Help center for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
Requires: htdig
@@ -2315,7 +2330,7 @@
##########
%package -n trinity-kicker
-Summary: desktop panel for TDE
+Summary: Desktop panel for TDE
Group: Applications/Utilities
Requires: %{name}-data = %{version}-%{release}
@@ -2479,7 +2494,7 @@
** Diff limit reached (max: 250 lines) **
|