TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update R14 packages

Browse Source
pull/3/head
François Andriot 10 years ago
parent 561c07abb2
commit fdaab31bf1
6 changed files with 87 additions and 99 deletions
Show Stats Download Patch File Download Diff File

2
redhat/dependencies/avahi-tqt/avahi-tqt-14.0.0.spec
Unescape View File

@ -145,7 +145,7 @@ Group: Development/Libraries/C and C++
Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release} Provides: libavahi-tqt-devel = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{libavahi}-tqt1 = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: libtqt4-devel >= 2:4.2.0 Requires: libtqt4-devel >= %{tde_epoch}:4.2.0
%{?avahi_devel:Requires: %{avahi_devel}} %{?avahi_devel:Requires: %{avahi_devel}}
Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release} Obsoletes: trinity-avahi-tqt-devel < %{?epoch:%{epoch}:}%{version}-%{release}

0
redhat/extras/trinity-filesystem/trinity-filesystem.spec → redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
Unescape View File

9
redhat/tdebase/plasma-desktop
Unescape View File

@ -1,9 +0,0 @@
#!/bin/sh
# This stupid scripts prevent the launch of 'plasma-desktop'
# (from KDE4) alongside with TDE.
case "${DESKTOP_SESSION}" in
"kde3"|"trinity"|"TDE") ;;
*) exec /usr/bin/plasma-desktop;;
esac

163
redhat/tdebase/tdebase-14.0.0.spec
Unescape View File

@ -30,6 +30,10 @@
%define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity %define tde_tdelibdir %{tde_libdir}/trinity
%define tdm tdm
%define tdm_datadir %{tde_datadir}/apps/%{tdm}
%define starttde starttde
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%define _variant .opt %define _variant .opt
@ -425,9 +429,9 @@ BuildRequires: nas-devel
BuildRequires: dbus-devel >= 0.22-12.EL.9p1 BuildRequires: dbus-devel >= 0.22-12.EL.9p1
Requires: dbus-qt >= 0.22-12.EL.9p1 Requires: dbus-qt >= 0.22-12.EL.9p1
%else %else
BuildRequires: libdbus-tqt-1-devel >= 2:0.63 BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= 2:0.9 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
Requires: libdbus-tqt-1-0 >= 2:0.63 Requires: libdbus-tqt-1-0 >= %{tde_epoch}:0.63
%endif %endif
%if 0%{?fedora} >= 17 %if 0%{?fedora} >= 17
@ -529,6 +533,7 @@ BuildRequires: bdftopcf
BuildRequires: drakconf BuildRequires: drakconf
%endif %endif
# LIBCONFIG support
# Needed for "compton" stuff # Needed for "compton" stuff
BuildRequires: libconfig-devel BuildRequires: libconfig-devel
@ -566,9 +571,7 @@ Requires: trinity-libkonq = %{version}-%{release}
Requires: %{name}-libtqt3-integration = %{version}-%{release} Requires: %{name}-libtqt3-integration = %{version}-%{release}
Requires: %{name}-tdeio-smb-plugin = %{version}-%{release} Requires: %{name}-tdeio-smb-plugin = %{version}-%{release}
Requires: libtqt3-mt >= 3.5.0 Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: libtqt4 >= 2:4.2.0
Requires: trinity-arts >= 2:1.5.10
Requires: trinity-tdelibs >= %{tde_version} Requires: trinity-tdelibs >= %{tde_version}
Requires: openssl Requires: openssl
@ -606,8 +609,7 @@ web browser, X terminal emulator, and many other programs and components.
Summary: %{summary} - Development files Summary: %{summary} - Development files
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: libtqt4-devel >= 2:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10
Requires: trinity-arts-devel >= 2:1.5.10
Requires: trinity-tdelibs-devel >= %{tde_version} Requires: trinity-tdelibs-devel >= %{tde_version}
Requires: %{name}-bin-devel = %{version}-%{release} Requires: %{name}-bin-devel = %{version}-%{release}
@ -976,8 +978,8 @@ plugdev group.
%{tde_tdelibdir}/kcm_joystick.so %{tde_tdelibdir}/kcm_joystick.so
%{tde_tdelibdir}/kcm_kded.la %{tde_tdelibdir}/kcm_kded.la
%{tde_tdelibdir}/kcm_kded.so %{tde_tdelibdir}/kcm_kded.so
%{tde_tdelibdir}/kcm_tdm.la %{tde_tdelibdir}/kcm_%{tdm}.la
%{tde_tdelibdir}/kcm_tdm.so %{tde_tdelibdir}/kcm_%{tdm}.so
%{tde_tdelibdir}/kcm_tdednssd.so %{tde_tdelibdir}/kcm_tdednssd.so
%{tde_tdelibdir}/kcm_tdednssd.la %{tde_tdelibdir}/kcm_tdednssd.la
%{tde_tdelibdir}/kcm_keys.la %{tde_tdelibdir}/kcm_keys.la
@ -1084,7 +1086,7 @@ plugdev group.
%{tde_tdeappdir}/kcmusb.desktop %{tde_tdeappdir}/kcmusb.desktop
%{tde_tdeappdir}/kcmview1394.desktop %{tde_tdeappdir}/kcmview1394.desktop
%{tde_tdeappdir}/KControl.desktop %{tde_tdeappdir}/KControl.desktop
%{tde_tdeappdir}/tdm.desktop %{tde_tdeappdir}/%{tdm}.desktop
%{tde_tdeappdir}/keys.desktop %{tde_tdeappdir}/keys.desktop
%{tde_tdeappdir}/tdefontview.desktop %{tde_tdeappdir}/tdefontview.desktop
%{tde_tdeappdir}/tdehtml_behavior.desktop %{tde_tdeappdir}/tdehtml_behavior.desktop
@ -1168,8 +1170,6 @@ plugdev group.
%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png %{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
%{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png %{tde_datadir}/icons/hicolor/*/apps/kcmsmserver.png
%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png %{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
%{tde_datadir}/icons/hicolor/*/apps/kcmkhtml_filter.png
%{tde_datadir}/icons/hicolor/*/apps/kcmspellchecking.png
%{tde_datadir}/apps/usb.ids %{tde_datadir}/apps/usb.ids
%{tde_datadir}/apps/kcmview1394/ %{tde_datadir}/apps/kcmview1394/
@ -1321,14 +1321,14 @@ TDE applications, particularly those in the TDE base module.
# SETUID binaries # SETUID binaries
# Some setuid binaries need special care # Some setuid binaries need special care
%if 0%{?suse_version} %if 0%{?suse_version}
%if %{?with_tsak} %if 0%{?with_tsak}
%verify(not mode) %{tde_bindir}/tdmtsak %verify(not mode) %{tde_bindir}/%{tdm}tsak
%endif %endif
%verify(not mode) %{tde_bindir}/kcheckpass %verify(not mode) %{tde_bindir}/kcheckpass
%verify(not mode) %{tde_bindir}/tdekbdledsync %verify(not mode) %{tde_bindir}/tdekbdledsync
%else %else
%if %{?with_tsak} %if 0%{?with_tsak}
%attr(4511,root,root) %{tde_bindir}/tdmtsak %attr(4511,root,root) %{tde_bindir}/%{tdm}tsak
%endif %endif
%attr(4755,root,root) %{tde_bindir}/kcheckpass %attr(4755,root,root) %{tde_bindir}/kcheckpass
%attr(4755,root,root) %{tde_bindir}/tdekbdledsync %attr(4755,root,root) %{tde_bindir}/tdekbdledsync
@ -1437,7 +1437,7 @@ needed for a basic TDE desktop installation.
%{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png %{tde_datadir}/icons/crystalsvg/*/apps/kcmpartitions.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png %{tde_datadir}/icons/crystalsvg/*/apps/kcmpci.png
%{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png %{tde_datadir}/icons/crystalsvg/*/apps/kcontrol.png
%{tde_datadir}/icons/crystalsvg/*/apps/tdmconfig.png %{tde_datadir}/icons/crystalsvg/*/apps/%{tdm}config.png
%{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png %{tde_datadir}/icons/crystalsvg/*/apps/key_bindings.png
%{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png %{tde_datadir}/icons/crystalsvg/*/apps/kfm_home.png
%{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png %{tde_datadir}/icons/crystalsvg/*/apps/tdescreensaver.png
@ -1682,6 +1682,9 @@ Group: Applications/Utilities
Requires: trinity-kdesktop = %{version}-%{release} Requires: trinity-kdesktop = %{version}-%{release}
Requires: cyrus-sasl Requires: cyrus-sasl
Requires: psmisc Requires: psmisc
%if 0%{?with_hal}
Requires: hal >= 0.5
%endif
%if 0%{?rhel} == 4 || 0%{?suse_version} %if 0%{?rhel} == 4 || 0%{?suse_version}
Requires: cryptsetup Requires: cryptsetup
%else %else
@ -2079,7 +2082,7 @@ Provides: service(graphical-login)
# Required for Mandriva's installer # Required for Mandriva's installer
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
Provides: dm Provides: dm
Provides: tdm Provides: %{tdm}
%endif %endif
%description -n trinity-tdm %description -n trinity-tdm
@ -2102,27 +2105,27 @@ already. Most users won't need this.
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_tdelibdir}/kgreet_pam.la %{tde_tdelibdir}/kgreet_pam.la
%{tde_tdelibdir}/kgreet_pam.so %{tde_tdelibdir}/kgreet_pam.so
%{tde_bindir}/gentdmconf %{tde_bindir}/gen%{tdm}conf
%{tde_bindir}/tdm %{tde_bindir}/%{tdm}
%{tde_bindir}/tdm_config %{tde_bindir}/%{tdm}_config
%{tde_bindir}/tdmctl %{tde_bindir}/%{tdm}ctl
%{tde_bindir}/tdm_greet %{tde_bindir}/%{tdm}_greet
%{tde_bindir}/krootimage %{tde_bindir}/krootimage
%dir %{tde_datadir}/apps/tdm %dir %{tdm_datadir}
%dir %{tde_datadir}/apps/tdm/pics %dir %{tdm_datadir}/pics
%{tde_datadir}/apps/tdm/pics/kdelogo.png %{tdm_datadir}/pics/kdelogo.png
%{tde_datadir}/apps/tdm/pics/shutdown.jpg %{tdm_datadir}/pics/shutdown.jpg
%{tde_datadir}/apps/tdm/pics/users %{tdm_datadir}/pics/users
%dir %{tde_datadir}/apps/tdm/sessions %dir %{tdm_datadir}/sessions
%{tde_datadir}/apps/tdm/sessions/*.desktop %{tdm_datadir}/sessions/*.desktop
%{tde_datadir}/apps/tdm/themes/ %{tdm_datadir}/themes/
%{tde_datadir}/config/tdm %{tde_datadir}/config/%{tdm}
%dir %{_sysconfdir}/trinity/tdm %dir %{_sysconfdir}/trinity/%{tdm}
%if 0%{?with_selinux_policy} %if 0%{?with_selinux_policy}
%exclude %{?_sysconfdir}/trinity/tdm/tdm.pp %exclude %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
%endif %endif
%config(noreplace) %{_sysconfdir}/trinity/tdm/* %config(noreplace) %{_sysconfdir}/trinity/%{tdm}/*
%{tde_tdedocdir}/HTML/en/tdm/ %{tde_tdedocdir}/HTML/en/%{tdm}/
%if 0%{?suse_version} == 0 %if 0%{?suse_version} == 0
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity
%config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np %config(noreplace) %{_sysconfdir}/pam.d/tdm-trinity-np
@ -2158,7 +2161,7 @@ already. Most users won't need this.
# SELINUX policy # SELINUX policy
%if 0%{?with_selinux_policy} %if 0%{?with_selinux_policy}
%{?_sysconfdir}/trinity/tdm/tdm.pp %{?_sysconfdir}/trinity/%{tdm}/tdm.pp
%endif %endif
# Logrotate configuration # Logrotate configuration
@ -2166,26 +2169,26 @@ already. Most users won't need this.
%pre -n trinity-tdm %pre -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm' # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
if [ -d "%{tde_datadir}/config/tdm" ] && [ ! -L "%{tde_datadir}/config/tdm" ]; then if [ -d "%{tde_datadir}/config/%{tdm}" ] && [ ! -L "%{tde_datadir}/config/%{tdm}" ]; then
if [ -d "%{_sysconfdir}/trinity/tdm" ]; then if [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
# If there is already something under '/etc/trinity/tdm', simply delete old configuration # If there is already something under '/etc/trinity/%{tdm}', simply delete old configuration
echo "Deleting TDM configuration under '%{tde_datadir}/config/tdm'" echo "Deleting TDM configuration under '%{tde_datadir}/config/%{tdm}'"
rm -rf "%{tde_datadir}/config/tdm" rm -rf "%{tde_datadir}/config/%{tdm}"
else else
# Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm' # Else, move '/opt/trinity/share/config/tdm' to '/etc/trinity/tdm'
if [ ! -d "%{_sysconfdir}/trinity" ]; then if [ ! -d "%{_sysconfdir}/trinity" ]; then
mkdir -p "%{_sysconfdir}/trinity" mkdir -p "%{_sysconfdir}/trinity"
fi fi
echo "Migrating TDM configuration from '%{tde_datadir}/config/tdm' to '%{_sysconfdir}/trinity/tdm'" echo "Migrating TDM configuration from '%{tde_datadir}/config/%{tdm}' to '%{_sysconfdir}/trinity/%{tdm}'"
mv -f "%{tde_datadir}/config/tdm" "%{_sysconfdir}/trinity/tdm.migr" mv -f "%{tde_datadir}/config/%{tdm}" "%{_sysconfdir}/trinity/%{tdm}.migr"
fi fi
fi fi
# Remove actual directory before creating a symlink # Remove actual directory before creating a symlink
if [ ! -L "%{tde_datadir}/apps/tdm/pics/users" ]; then if [ ! -L "%{tdm_datadir}/pics/users" ]; then
[ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces" [ -d "%{_datadir}/faces" ] || mkdir -p "%{_datadir}/faces"
cp -f "%{tde_datadir}/apps/tdm/pics/users/"* "%{_datadir}/faces" cp -f "%{tdm_datadir}/pics/users/"* "%{_datadir}/faces"
rm -rf "%{tde_datadir}/apps/tdm/pics/users" rm -rf "%{tdm_datadir}/pics/users"
fi fi
%post -n trinity-tdm %post -n trinity-tdm
@ -2193,19 +2196,19 @@ fi
%make_session %make_session
%endif %endif
%if 0%{?with_selinux_policy} %if 0%{?with_selinux_policy}
/usr/sbin/semodule -i "%{?_sysconfdir}/trinity/tdm/tdm.pp" /usr/sbin/semodule -i "%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
%endif %endif
# Sets default user icon in TDM # Sets default user icon in TDM
if [ ! -r "%{tde_datadir}/apps/tdm/faces/.default.face.icon" ]; then if [ ! -r "%{tdm_datadir}/faces/.default.face.icon" ]; then
[ -d "%{tde_datadir}/apps/tdm/faces" ] || mkdir -p "%{tde_datadir}/apps/tdm/faces" [ -d "%{tdm_datadir}/faces" ] || mkdir -p "%{tdm_datadir}/faces"
%__cp -f "%{tde_datadir}/apps/tdm/pics/users/default2.png" "%{tde_datadir}/apps/tdm/faces/.default.face.icon" cp -f "%{tdm_datadir}/pics/users/default2.png" "%{tdm_datadir}/faces/.default.face.icon"
fi fi
# Sets default language for TDM # Sets default language for TDM
if [ "$1" = "1" ]; then if [ "$1" = "1" ]; then
if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then if [ -n "${LANG}" ] && [ "${LANG}" != "C" ]; then
%__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|" sed -i "%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" -e "s|^#*Language=.*|Language=${LANG}|"
fi fi
fi fi
@ -2217,9 +2220,9 @@ fi
%posttrans -n trinity-tdm %posttrans -n trinity-tdm
# Make sure that TDM configuration files are now under '/etc/trinity/tdm' # Make sure that TDM configuration files are now under '/etc/trinity/tdm'
if [ -d "%{_sysconfdir}/trinity/tdm.migr" ] && [ -d "%{_sysconfdir}/trinity/tdm" ]; then if [ -d "%{_sysconfdir}/trinity/%{tdm}.migr" ] && [ -d "%{_sysconfdir}/trinity/%{tdm}" ]; then
%__mv -f "%{_sysconfdir}/trinity/tdm.migr/"* "%{_sysconfdir}/trinity/tdm/" mv -f "%{_sysconfdir}/trinity/%{tdm}.migr/"* "%{_sysconfdir}/trinity/%{tdm}/"
rmdir "%{_sysconfdir}/trinity/tdm.migr/" rmdir "%{_sysconfdir}/trinity/%{tdm}.migr/"
fi fi
%postun -n trinity-tdm %postun -n trinity-tdm
@ -2949,7 +2952,7 @@ TDE will start, but many good defaults will not be set.
%files -n trinity-ksmserver %files -n trinity-ksmserver
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{tde_bindir}/ksmserver %{tde_bindir}/ksmserver
%{tde_bindir}/starttde %{tde_bindir}/%{starttde}
%{tde_bindir}/migratekde3 %{tde_bindir}/migratekde3
%{tde_bindir}/r14-xdg-update %{tde_bindir}/r14-xdg-update
%{tde_bindir}/tdeinit_displayconfig %{tde_bindir}/tdeinit_displayconfig
@ -3374,28 +3377,28 @@ Windows and Samba shares.
# Applies an optional distro-specific graphical theme # Applies an optional distro-specific graphical theme
%if "%{?tde_bg}" != "" %if "%{?tde_bg}" != ""
# TDM Background # TDM Background
%__sed -i "tdm/kfrontend/gentdmconf.c" \ %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" \
-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|' -e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
# TDE user default background # TDE user default background
%__sed -i "kpersonalizer/keyecandypage.cpp" \ %__sed -i "kpersonalizer/keyecandypage.cpp" \
-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|' -e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
%__sed -i "starttde" \ %__sed -i "%{starttde}" \
-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \ -e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|' -e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
%endif %endif
# TDE default directory and icon in startup script # TDE default directory and icon in startup script
%__sed -i "starttde" \ %__sed -i "%{starttde}" \
-e "s|/opt/trinity|%{tde_prefix}|g" \ -e "s|/opt/trinity|%{tde_prefix}|g" \
-e "s|%%{tde_starticon}|%{tde_starticon}|g" -e "s|%%{tde_starticon}|%{tde_starticon}|g"
# Xsession script location may vary on some distro # Xsession script location may vary on some distro
%if 0%{?rhel} || 0%{?fedora} %if 0%{?rhel} || 0%{?fedora}
%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|" %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xinit/Xsession|"
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
%__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %__sed -i "%{tdm}/kfrontend/gen%{tdm}conf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
%endif %endif
# Reboot command location may vary on some distributions # Reboot command location may vary on some distributions
@ -3405,9 +3408,9 @@ if [ -x "/usr/bin/reboot" ]; then
fi fi
if [ -n "${REBOOT}" ]; then if [ -n "${REBOOT}" ]; then
%__sed -i \ %__sed -i \
"doc/tdm/tdmrc-ref.docbook" \ "doc/%{tdm}/%{tdm}rc-ref.docbook" \
"kcontrol/tdm/tdm-shut.cpp" \ "kcontrol/%{tdm}/%{tdm}-shut.cpp" \
"tdm/config.def" \ "%{tdm}/config.def" \
-e "s|/sbin/poweroff|${POWEROFF}|g" \ -e "s|/sbin/poweroff|${POWEROFF}|g" \
-e "s|/sbin/reboot|${REBOOT}|g" -e "s|/sbin/reboot|${REBOOT}|g"
fi fi
@ -3530,21 +3533,21 @@ fi
# Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'. # Under RHEL/Fedora/Suse, static 'xsessions' files go to '/usr/share/xsessions'.
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%__install -D -m 644 \ %__install -D -m 644 \
"%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ "%{?buildroot}%{tdm_datadir}/sessions/tde.desktop" \
"%{?buildroot}%{_datadir}/xsessions/tde.desktop" "%{?buildroot}%{_datadir}/xsessions/tde.desktop"
%endif %endif
# Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
# Generated files for TDM go to '/usr/share/xsessions' # Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE" cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
NAME=TDE NAME=TDE
ICON=kde-wmsession.xpm ICON=kde-wmsession.xpm
DESC=The Trinity Desktop Environment DESC=The Trinity Desktop Environment
EXEC=%{tde_bindir}/starttde EXEC=%{tde_bindir}/%{starttde}
SCRIPT: SCRIPT:
exec %{tde_bindir}/starttde exec %{tde_bindir}/%{starttde}
EOF EOF
%__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d %__install -d -m 755 %{?buildroot}%{_datadir}/X11/dm.d
@ -3552,7 +3555,7 @@ cat <<EOF >"%{?buildroot}%{_datadir}/X11/dm.d/45TDE.conf"
NAME=TDM NAME=TDM
DESCRIPTION=TDM (Trinity Display Manager) DESCRIPTION=TDM (Trinity Display Manager)
PACKAGE=trinity-tdm PACKAGE=trinity-tdm
EXEC=%{tde_bindir}/tdm EXEC=%{tde_bindir}/%{tdm}
%if 0%{?pclinuxos} %if 0%{?pclinuxos}
FNDSESSION_EXEC="/usr/sbin/chksession -k" FNDSESSION_EXEC="/usr/sbin/chksession -k"
%else %else
@ -3570,7 +3573,7 @@ EOF
%endif %endif
# TDM configuration # TDM configuration
%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/%{tdm}/%{tdm}rc" \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 || 0%{?rhel} >= 7
-e "s/^#*MinShowUID=.*/MinShowUID=1000/" -e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else %else
@ -3604,11 +3607,11 @@ EOF
# Symlink TDM configuration # Symlink TDM configuration
%__mkdir_p "%{?buildroot}%{tde_datadir}/config" %__mkdir_p "%{?buildroot}%{tde_datadir}/config"
%__ln_s "%{_sysconfdir}/trinity/tdm" "%{?buildroot}%{tde_datadir}/config/tdm" %__ln_s "%{_sysconfdir}/trinity/%{tdm}" "%{?buildroot}%{tde_datadir}/config/%{tdm}"
# SELINUX policy for RHEL / Fedora # SELINUX policy for RHEL / Fedora
%if 0%{?with_selinux_policy} %if 0%{?with_selinux_policy}
%__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/tdm/tdm.pp" %__install -D -m 644 "%{SOURCE8}" "%{?buildroot}%{?_sysconfdir}/trinity/%{tdm}/tdm.pp"
%endif %endif
# Mageia icon for TDE menu # Mageia icon for TDE menu
@ -3646,10 +3649,10 @@ EOF
# Move faces icon to XDG directory '/usr/share/faces' # Move faces icon to XDG directory '/usr/share/faces'
if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then if [ ! -d "%{?buildroot}%{_datadir}/faces" ]; then
%__mkdir_p "%{?buildroot}%{_datadir}/faces" %__mkdir_p "%{?buildroot}%{_datadir}/faces"
%__mv -f "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users/"* "%{?buildroot}%{_datadir}/faces" %__mv -f "%{?buildroot}%{tdm_datadir}/pics/users/"* "%{?buildroot}%{_datadir}/faces"
rmdir "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users" rmdir "%{?buildroot}%{tdm_datadir}/pics/users"
fi fi
%__ln_s "%{_datadir}/faces" "%{?buildroot}%{tde_datadir}/apps/tdm/pics/users" %__ln_s "%{_datadir}/faces" "%{?buildroot}%{tdm_datadir}/pics/users"
# Adds missing icons in 'hicolor' theme # Adds missing icons in 'hicolor' theme
# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'. # These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
@ -3720,8 +3723,8 @@ for i in ksysguard tde-kcontrol tdefontview showdesktop; do
done done
# Remove setuid bit on some binaries. # Remove setuid bit on some binaries.
%if %{?with_tsak} %if 0%{?with_tsak}
chmod 0511 "%{?buildroot}%{tde_bindir}/tdmtsak" chmod 0511 "%{?buildroot}%{tde_bindir}/%{tdm}tsak"
%endif %endif
chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass" chmod 0755 "%{?buildroot}%{tde_bindir}/kcheckpass"
chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync" chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
@ -3735,8 +3738,8 @@ chmod 0755 "%{?buildroot}%{tde_bindir}/tdekbdledsync"
%if 0%{?suse_version} %if 0%{?suse_version}
# Check permissions on setuid files (openSUSE specific) # Check permissions on setuid files (openSUSE specific)
%verifyscript %verifyscript
%if %{?with_tsak} %if 0%{?with_tsak}
%verify_permissions -e %{tde_bindir}/tdmtsak %verify_permissions -e %{tde_bindir}/%{tdm}tsak
%endif %endif
%verify_permissions -e %{tde_bindir}/kcheckpass %verify_permissions -e %{tde_bindir}/kcheckpass
%verify_permissions -e %{tde_bindir}/tdekbdledsync %verify_permissions -e %{tde_bindir}/tdekbdledsync

4
redhat/tdelibs/tdelibs-14.0.0.spec
Unescape View File

@ -81,7 +81,7 @@ BuildRequires: libdbus-tqt-1-devel >= %{tde_epoch}:0.63
BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9 BuildRequires: libdbus-1-tqt-devel >= %{tde_epoch}:0.9
BuildRequires: trinity-filesystem >= %{tde_version} BuildRequires: trinity-filesystem >= %{tde_version}
Requires: trinity-arts >= 2:1.5.10 Requires: trinity-arts >= %{tde_epoch}:1.5.10
Requires: trinity-filesystem >= %{tde_version} Requires: trinity-filesystem >= %{tde_version}
Requires: fileshareset >= 2.0 Requires: fileshareset >= 2.0
@ -511,7 +511,7 @@ Provides: trinity-kdelibs-devel = %{version}-%{release}
Requires: libtqt3-mt-devel >= 3.5.0 Requires: libtqt3-mt-devel >= 3.5.0
Requires: libtqt4-devel = 2:4.2.0 Requires: libtqt4-devel = 2:4.2.0
Requires: trinity-arts-devel >= 2:1.5.10 Requires: trinity-arts-devel >= 2:1.5.10
Requires: libart_lgpl-devel >= 2.3.22 Requires: libart_lgpl-devel
%{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xcomposite_devel:Requires: %{xcomposite_devel}}
%{?xt_devel:Requires: %{xt_devel}} %{?xt_devel:Requires: %{xt_devel}}

6
redhat/tdemultimedia/tdemultimedia-14.0.0.spec
Unescape View File

@ -1170,12 +1170,6 @@ noatun plugins.
########## ##########
# FIXME 2014/03/15: FTBFS on PCLINUXOS ... Need to remove -fstack-protector
%if 0%{?pclinuxos}
%define _ssp_cflags -fno-stack-protector --param=ssp-buffer-size=4%{?_serverbuild_flags: %_serverbuild_flags}
%endif
%prep %prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}

Write Preview
Loading…
Cancel
Save