RPM Packaging: update R14 packages

7 files changed, 35 insertions, 98 deletions

diff --git a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
index b3eed810c..3f5499513 100644
--- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
+++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec
@@ -80,9 +80,6 @@ Requires:		%{name}-backends = %{version}-%{release}
 # POWERMANAGER support (requires HAL)
 #define with_powermanager 1
 
-# DISPLAYCONFIG support (deprecated)
-#define with_displayconfig 1
-
 Obsoletes:		trinity-guidance < %{version}-%{release}
 Provides:		trinity-guidance = %{version}-%{release}
 
@@ -100,10 +97,6 @@ or can be run as standalone applications.
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog COPYING README TODO
-%if 0%{?with_displayconfig}
-%{tde_bindir}/displayconfig
-%{tde_bindir}/displayconfig-restore
-%endif
 %{tde_bindir}/grubconfig
 %{tde_bindir}/mountconfig
 %{tde_bindir}/serviceconfig
@@ -120,9 +113,7 @@ or can be run as standalone applications.
 %{python_sitearch}/%{name}/fuser.py*
 %{python_sitearch}/%{name}/fuser_ui.py*
 %{python_sitearch}/%{name}/grubconfig.py*
-%{python_sitearch}/%{name}/ktimerdialog.py*
 %{python_sitearch}/%{name}/mountconfig.py*
-%{python_sitearch}/%{name}/servertestdialog.py*
 %{python_sitearch}/%{name}/serviceconfig.py*
 %{python_sitearch}/%{name}/sizeview.py*
 %{python_sitearch}/%{name}/unixauthdb.py*
@@ -130,13 +121,6 @@ or can be run as standalone applications.
 %{python_sitearch}/%{name}/wineconfig.py*
 %{tde_tdedocdir}/HTML/en/guidance/
 
-# Files from backends
-%exclude %{tde_datadir}/apps/guidance/vesamodes
-%exclude %{tde_datadir}/apps/guidance/extramodes
-%exclude %{tde_datadir}/apps/guidance/widescreenmodes
-%exclude %{tde_datadir}/apps/guidance/Cards+
-%exclude %{tde_datadir}/apps/guidance/pcitable
-%exclude %{tde_datadir}/apps/guidance/MonitorsDB
 
 # Files from powermanager
 %if 0%{?with_powermanager}
@@ -176,26 +160,11 @@ Guidance configuration tools.
 %files backends
 %defattr(-,root,root,-)
 %{python_sitearch}/%{name}/MicroHAL.py*
-%{python_sitearch}/%{name}/ScanPCI.py*
-%{python_sitearch}/%{name}/infimport.py*
-%if 0%{?with_displayconfig}
-%{python_sitearch}/%{name}/displayconfigabstraction.py*
-%{python_sitearch}/%{name}/displayconfig-hwprobe.py*
-%{python_sitearch}/%{name}/displayconfig-restore.py*
-%endif
 %{python_sitearch}/%{name}/drivedetect.py*
-%{python_sitearch}/%{name}/execwithcapture.py*
 %{python_sitearch}/%{name}/wineread.py*
 %{python_sitearch}/%{name}/winewrite.py*
 %{python_sitearch}/%{name}/xf86misc.py*
-%{python_sitearch}/%{name}/xorgconfig.py*
 %{python_sitearch}/ixf86misc.so
-%{tde_datadir}/apps/guidance/vesamodes
-%{tde_datadir}/apps/guidance/extramodes
-%{tde_datadir}/apps/guidance/widescreenmodes
-%{tde_datadir}/apps/guidance/Cards+
-%{tde_datadir}/apps/guidance/pcitable
-%{tde_datadir}/apps/guidance/MonitorsDB
 
 ##########
 
@@ -333,16 +302,12 @@ chrpath -r %{tde_libdir} %{buildroot}%{tde_tdelibdir}/kcm_*.so
 
 # Generates the startup scripts
 %__rm -f %{buildroot}%{tde_bindir}/*
-#%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
 %__ln_s -f %{python_sitearch}/%{name}/mountconfig.py %{buildroot}%{tde_bindir}/mountconfig
 %__ln_s -f %{python_sitearch}/%{name}/serviceconfig.py %{buildroot}%{tde_bindir}/serviceconfig
 %__ln_s -f %{python_sitearch}/%{name}/userconfig.py %{buildroot}%{tde_bindir}/userconfig
 %__ln_s -f %{python_sitearch}/%{name}/wineconfig.py %{buildroot}%{tde_bindir}/wineconfig
 %__ln_s -f %{python_sitearch}/%{name}/grubconfig.py %{buildroot}%{tde_bindir}/grubconfig
 
-# (obsolete)  put this here since gnome people probably don't want it by default
-#%__ln_s -f %{_python_sitearch}/%{name}/displayconfig-restore.py %{buildroot}%{tde_bindir}/displayconfig-restore
-
 # fix script-not-executable
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/fuser.py
 %__chmod 0755 %{buildroot}%{python_sitearch}/%{name}/grubconfig.py
@@ -397,30 +362,6 @@ chmod 0755 %{buildroot}%{python_sitearch}/%{name}/gpmhelper.py
 
 %endif
 
-# DISPLAYCONFIG (obsolete)
-%if 0%{?with_displayconfig}
-%__cp -f %{buildroot}%{tde_datadir}/apps/guidance/pics/hi32-display.png \
-	%{buildroot}%{tde_datadir}/icons/crystalsvg/32x32/apps/displayconfig.png
-%__ln_s -f %{python_sitearch}/%{name}/displayconfig.py %{buildroot}%{tde_bindir}/displayconfig
-%__mv -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop %{buildroot}%{tde_tdeappdir}/guidance-displayconfig.desktop
-
-# install displayconfig-hwprobe.py script
-%__install -D -p -m0755 displayconfig/displayconfig-hwprobe.py \
-	%{buildroot}%{python_sitearch}/%{name}/displayconfig-hwprobe.py
-
-%else
-# Removes obsolete display config manager
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig*
-%__rm -f %{?buildroot}/etc/X11/Xsession.d/40guidance-displayconfig_restore
-%__rm -f %{?buildroot}%{tde_tdelibdir}/kcm_displayconfig.*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfig.py*
-%__rm -f %{?buildroot}%{python_sitearch}/%{name}/displayconfigwidgets.py*
-%__rm -f %{buildroot}%{tde_tdeappdir}/displayconfig.desktop
-%__rm -f %{buildroot}%{tde_datadir}/icons/*/*/apps/displayconfig.png
-%__rm -fr %{buildroot}%{tde_datadir}/apps/guidance/pics/displayconfig
-%endif
-
-
 # Replace all '#!' calls to python with /usr/bin/python
 # and make them executable
 for i in `find %{buildroot} -type f`; do
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
index f87bedf88..5b6485d34 100644
--- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec
+++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec
@@ -1,3 +1,9 @@
+# Note for RHEL6 / Fedora:
+#  Do *NOT* use 'byacc' to build sip4-tqt.
+#  Instead, use 'bison' with a wrapper shell script.
+#  e.g. /usr/local/bin/yacc
+#   contains 'bison --yacc $@'
+
 # Default version for this component
 %define tde_pkg sip4-tqt
 %define tde_version 14.0.0
@@ -104,19 +110,14 @@ python ../configure.py \
 	-d %{python_sitearch}/sip4_tqt \
 	-e %{tde_includedir} \
 	-u STRIP="" \
-	CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \
-	CFLAGS_RELEASE="" \
-	CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \
-	CXXFLAGS_RELEASE=""
+	CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" \
+	CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE"
 
 
 %install
 %__rm -rf %{?buildroot}
 %__make install DESTDIR=%{?buildroot} -C build
 
-# Dummy file to allow loading as a module
-touch %{?buildroot}%{python_sitearch}/sip4_tqt/__init__.py
-
 
 %clean
 %__rm -rf %{?buildroot}
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 2cceff38c..3b1b8a34d 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -154,6 +154,9 @@ BuildRequires: libxmu-devel
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
 BuildRequires: libXi-devel
 %endif
+%if 0%{?mgaversion}
+BuildRequires: %{_lib}xi-devel
+%endif
 
 # Xorg support
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
diff --git a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
index 9595c3654..aef25b196 100644
--- a/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
+++ b/redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
@@ -473,11 +473,6 @@ unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
 
-# Specific path for RHEL4
-if [ -d /usr/X11R6 ]; then
-  export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
-fi
-
 %configure \
   --prefix=%{tde_prefix} \
   --exec-prefix=%{tde_prefix} \
@@ -510,11 +505,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
 
 
-if [ -x /usr/bin/optimizegraphics ]; then
-  (cd %{?buildroot} && /usr/bin/optimizegraphics)
-fi
-
-
 %clean
 %__rm -rf %{buildroot}
 
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index d7c3ac41e..c242ff438 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -56,7 +56,7 @@ Source5:	pamd.kscreensaver-trinity%{?dist}
 Source6:	suse-displaymanagers-tdm
 
 # Fedora 18: use SYSTEMD for TDM startup
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 Source7:	tdm.service%{?dist}
 %endif
 
@@ -210,6 +210,17 @@ Requires:	redhat-indexhtml
 %define tde_aboutpage /usr/share/doc/HTML/index.html
 %endif
 
+# RHEL 7 Theme
+%if 0%{?rhel} == 7
+Requires:	redhat-logos
+%define tde_bg /usr/share/backgrounds/day.jpg
+%define tde_starticon /usr/share/icons/hicolor/96x96/apps/system-logo-icon.png
+
+Requires:	redhat-indexhtml
+%define tde_aboutlabel Enterprise Linux 7
+%define tde_aboutpage /usr/share/doc/HTML/index.html
+%endif
+
 # Mageia 2 Theme
 %if 0%{?mgaversion} == 2
 Requires:	mageia-theme-Default
@@ -390,8 +401,9 @@ BuildRequires:	OpenEXR-devel
 %endif
 
 # XSCREENSAVER support
-#  Disabled on RHEL4
+#  Disabled on RHEL4, RHEL >= 7
 %if 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?suse_version}
+%if 0%{?rhel} == 0 || 0%{?rhel} <= 6
 %define with_xscreensaver 1
 %if 0%{?rhel} == 5
 BuildRequires:	xorg-x11-proto-devel
@@ -412,6 +424,7 @@ BuildRequires:	libXScrnSaver-devel
 BuildRequires:	xscreensaver
 %endif
 %endif
+%endif
 
 # AVAHI support
 #  Disabled on RHEL4 and RHEL5
@@ -2110,7 +2123,7 @@ already. Most users won't need this.
 %if 0%{?suse_version} >= 1210
 /usr/lib/X11/displaymanagers/tdm
 %endif
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 /usr/lib/systemd/system/tdm.service
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
@@ -3526,7 +3539,7 @@ EOF
 
 # TDM configuration
 %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \
-%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210
+%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
 	-e "s/^#*MinShowUID=.*/MinShowUID=1000/"
 %else
 	-e "s/^#*MinShowUID=.*/MinShowUID=500/"
@@ -3551,7 +3564,7 @@ EOF
 %endif
 
 # Fedora 18: no more SYSV init script, we have to use systemd.
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 %__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
 %__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
 %endif
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index fa2ada3b3..f2d03d1ca 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -74,13 +74,6 @@ BuildRequires:	glib2-devel
 # LIBART_LGPL support
 BuildRequires:	trinity-libart-lgpl-devel
 
-# ELFICON support
-#  It's an Ubuntu gadget, not useful for us.
-%if 0
-%define with_elficon 1
-BuildRequires:	libr-devel
-%endif
-
 # ASPELL support
 BuildRequires:	aspell
 BuildRequires:	aspell-devel
@@ -122,7 +115,7 @@ BuildRequires:	libudev-devel
 %endif
 
 # UDISKS support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} == 6
 %define with_udisks 1
 BuildRequires:	udisks-devel
 Requires:		udisks
@@ -132,9 +125,9 @@ Requires:		udisks
 #Requires:		pmount
 
 # UDISKS2 support
-%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
+%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
 %define with_udisks2 1
-%if 0%{?fedora} >= 20
+%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7
 BuildRequires:	libudisks2-devel
 %else
 BuildRequires:	udisks2-devel
@@ -143,19 +136,19 @@ Requires:		udisks2
 %endif
 
 # DEVICEKIT POWER support
-%if 0%{?rhel} >= 6
+%if 0%{?rhel} == 6
 %define with_devkitpower 1
 Requires:		DeviceKit-power
 %endif
 
 # UPOWER support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
 %define with_upower 1
 Requires:		upower
 %endif
 
 # SYSTEMD support
-%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
+%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?rhel} >= 7
 %define with_systemd 1
 %endif
 
diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec
index 80a509446..c99664674 100644
--- a/redhat/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec
@@ -56,9 +56,6 @@ Source2:	ktalk
 # [kdenetwork] Missing LDFLAGS cause FTBFS
 Patch1:		kdenetwork-3.5.13-missing_ldflags.patch
 
-# RedHat/Fedora legacy patches
-Patch4: 	kdenetwork-3.2.3-resolv.patch
-
 # RHEL4 specific
 Patch201:	kdenetwork-3.5.13.1-fix_rhel4_libraries.patch
 Patch202:	tdenetwork-3.5.13.2-fix_conflicting_definitions.patch
@@ -1120,7 +1117,6 @@ update-desktop-database 2> /dev/null || :
 %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
 
 %patch1 -p1 -b .ldflags
-%patch4 -p1 -b .resolv
 
 %if 0%{?rhel} == 4
 %patch201 -p1 -b .rhel4