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: fix alternatives commands

Browse Source
pull/3/head
François Andriot 11 years ago
parent 5ffeb7a679
commit 43ed3b6077
8 changed files with 56 additions and 88 deletions
Show Stats Download Patch File Download Diff File

8
redhat/applications/dolphin/dolphin-14.0.0.spec
Unescape View File

@ -97,13 +97,10 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
%__ln_s %{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
%__mkdir_p %{?buildroot}%{_sysconfdir}/alternatives
%__ln_s %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin
# Locales
%find_lang d3lphin %find_lang d3lphin
@ -125,7 +122,7 @@ update-alternatives --install \
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
update-alternatives --remove \ update-alternatives --remove \
media_safelyremove.desktop_d3lphin \ media_safelyremove.desktop_d3lphin \
%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
fi fi
%postun %postun
@ -142,7 +139,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/apps/d3lphin/ %{tde_datadir}/apps/d3lphin/
%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin
%changelog %changelog

11
redhat/applications/dolphin/dolphin-3.5.13.2.spec
Unescape View File

@ -69,7 +69,8 @@ interface for the task of file management.
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
%configure \ %configure \
@ -96,13 +97,10 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin %__mv -f %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin
%__ln_s %{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin %{buildroot}%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop
%__mkdir_p %{?buildroot}%{_sysconfdir}/alternatives
%__ln_s %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop %{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin
# Locales
%find_lang d3lphin %find_lang d3lphin
@ -124,7 +122,7 @@ update-alternatives --install \
if [ $1 -eq 0 ]; then if [ $1 -eq 0 ]; then
update-alternatives --remove \ update-alternatives --remove \
media_safelyremove.desktop_d3lphin \ media_safelyremove.desktop_d3lphin \
%{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_d3lphin || :
fi fi
%postun %postun
@ -141,7 +139,6 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
%{tde_datadir}/apps/d3lphin/ %{tde_datadir}/apps/d3lphin/
%{tde_datadir}/icons/hicolor/*/apps/d3lphin.png %{tde_datadir}/icons/hicolor/*/apps/d3lphin.png
%lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/ %lang(en) %{tde_tdedocdir}/HTML/en/d3lphin/
%{_sysconfdir}/alternatives/media_safelyremove.desktop_d3lphin
%changelog %changelog

14
redhat/applications/tdesvn/tdesvn-14.0.0.spec
Unescape View File

@ -158,19 +158,14 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build %__make install DESTDIR=%{buildroot} -C build
# Installs SVN protocols as alternatives # Installs SVN protocols as alternatives
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
# Locales
%find_lang %{tde_pkg} %find_lang %{tde_pkg}
@ -203,7 +198,7 @@ if [ $1 -eq 0 ]; then
for proto in svn+file svn+http svn+https svn+ssh svn; do for proto in svn+file svn+http svn+https svn+ssh svn; do
update-alternatives --remove \ update-alternatives --remove \
${proto}.protocol \ ${proto}.protocol \
%{tde_datadir}/services/${proto}.protocol_tdesvn %{tde_datadir}/services/${proto}.protocol_tdesvn || :
done done
fi fi
@ -264,11 +259,6 @@ fi
%{tde_datadir}/services/ksvn+https.protocol %{tde_datadir}/services/ksvn+https.protocol
%{tde_datadir}/services/ksvn+ssh.protocol %{tde_datadir}/services/ksvn+ssh.protocol
%{tde_datadir}/services/ksvn.protocol %{tde_datadir}/services/ksvn.protocol
%{tde_datadir}/services/svn+file.protocol
%{tde_datadir}/services/svn+http.protocol
%{tde_datadir}/services/svn+https.protocol
%{tde_datadir}/services/svn+ssh.protocol
%{tde_datadir}/services/svn.protocol
%{tde_datadir}/services/svn+file.protocol_tdesvn %{tde_datadir}/services/svn+file.protocol_tdesvn
%{tde_datadir}/services/svn+http.protocol_tdesvn %{tde_datadir}/services/svn+http.protocol_tdesvn
%{tde_datadir}/services/svn+https.protocol_tdesvn %{tde_datadir}/services/svn+https.protocol_tdesvn

15
redhat/applications/tdesvn/tdesvn-3.5.13.2.spec
Unescape View File

@ -118,7 +118,8 @@ find . -name "*.cmake" -exec %__sed -i {} \
%build %build
unset QTDIR; . /etc/profile.d/qt3.sh unset QTDIR QTINC QTLIB
. /etc/profile.d/qt3.sh
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}" export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}" export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
@ -157,19 +158,14 @@ export PATH="%{_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build %__make install DESTDIR=%{buildroot} -C build
# Installs SVN protocols as alternatives # Installs SVN protocols as alternatives
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesvn
%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesvn
%__ln_s /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
%__ln_s /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
%__ln_s /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
%__ln_s /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
# Locales
%find_lang kdesvn %find_lang kdesvn
@ -250,11 +246,6 @@ fi
%{tde_datadir}/services/ksvn+https.protocol %{tde_datadir}/services/ksvn+https.protocol
%{tde_datadir}/services/ksvn+ssh.protocol %{tde_datadir}/services/ksvn+ssh.protocol
%{tde_datadir}/services/ksvn.protocol %{tde_datadir}/services/ksvn.protocol
%{tde_datadir}/services/svn+file.protocol
%{tde_datadir}/services/svn+http.protocol
%{tde_datadir}/services/svn+https.protocol
%{tde_datadir}/services/svn+ssh.protocol
%{tde_datadir}/services/svn.protocol
%{tde_datadir}/services/svn+file.protocol_tdesvn %{tde_datadir}/services/svn+file.protocol_tdesvn
%{tde_datadir}/services/svn+http.protocol_tdesvn %{tde_datadir}/services/svn+http.protocol_tdesvn
%{tde_datadir}/services/svn+https.protocol_tdesvn %{tde_datadir}/services/svn+https.protocol_tdesvn

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

@ -2047,14 +2047,17 @@ already. Most users won't need this.
%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
%endif %endif
%if 0%{?suse_version}
# Distribution specific stuff
%if 0%{?suse_version} == 1140
%{_sysconfdir}/init.d/xdm.tde
%endif
%if 0%{?suse_version} >= 1210
/usr/lib/X11/displaymanagers/tdm /usr/lib/X11/displaymanagers/tdm
%endif %endif
%if 0%{?fedora} >= 18 %if 0%{?fedora} >= 18
/usr/lib/systemd/system/tdm.service /usr/lib/systemd/system/tdm.service
%endif %endif
# Distribution specific stuff
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
%{_datadir}/xsessions/tde.desktop %{_datadir}/xsessions/tde.desktop
%endif %endif
@ -2105,6 +2108,11 @@ if [ "$1" = "1" ]; then
%__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|" %__sed -i "%{_sysconfdir}/trinity/tdm/tdmrc" -e "s|^#*Language=.*|Language=${LANG}|"
fi fi
fi fi
# openSUSE 11.4 tdm's startup script
if [ -r "%{_sysconfdir}/init.d/xdm.tde" ]; then
cat "%{_sysconfdir}/init.d/xdm.tde" >"%{_sysconfdir}/init.d/xdm"
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'
@ -2589,7 +2597,6 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase
%{tde_datadir}/apps/konqueror/tiles/*.png %{tde_datadir}/apps/konqueror/tiles/*.png
%{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/autostart/konqy_preload.desktop
%{tde_datadir}/config.kcfg/keditbookmarks.kcfg %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@ -3481,9 +3488,6 @@ EOF
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop"
%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase"
# SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm' # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
@ -3512,6 +3516,11 @@ EOF
%__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg" %__install -D -m 644 "%{SOURCE9}" "%{?buildroot}%{tde_datadir}/oxygen/scalable/mgabutton.svg"
%endif %endif
# openSUSE 11.4: tdm startup script
%if 0%{?suse_version} == 1140
%__install -D -m 755 "%{SOURCE7}" "%{?buildroot}%{?_sysconfdir}/init.d/xdm.tde"
%endif
%clean %clean
%__rm -rf %{?buildroot} %__rm -rf %{?buildroot}

34
redhat/tdebase/tdebase-3.5.13.2.spec
Unescape View File

@ -75,7 +75,7 @@ Source7: xdm.oss114
%endif %endif
# Fedora 17: special selinux policy required # Fedora 17: special selinux policy required
%if 0%{?fedora} == 17 ||0%{?fedora} == 19 || 0%{?rhel} == 6 %if 0%{?fedora} >= 17 || 0%{?rhel} == 6
%define with_selinux_policy 1 %define with_selinux_policy 1
Source8: tdm%{?dist}.pp Source8: tdm%{?dist}.pp
%endif %endif
@ -349,7 +349,12 @@ BuildRequires: glib2-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
# SASL support # SASL support
%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
BuildRequires: %{_lib}sasl2-devel
%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel BuildRequires: cyrus-sasl-devel
%endif
# LIBUSB support # LIBUSB support
BuildRequires: pam-devel BuildRequires: pam-devel
@ -2035,6 +2040,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
%endif %endif
%description -n trinity-tdm %description -n trinity-tdm
@ -2630,7 +2636,6 @@ ever launching another application.
%exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop %exclude %{tde_datadir}/apps/konqueror/servicemenus/installfont.desktop
%{tde_datadir}/apps/konqueror/servicemenus/*.desktop %{tde_datadir}/apps/konqueror/servicemenus/*.desktop
%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase
%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase
%{tde_datadir}/apps/konqueror/tiles/*.png %{tde_datadir}/apps/konqueror/tiles/*.png
%{tde_datadir}/autostart/konqy_preload.desktop %{tde_datadir}/autostart/konqy_preload.desktop
%{tde_datadir}/config.kcfg/keditbookmarks.kcfg %{tde_datadir}/config.kcfg/keditbookmarks.kcfg
@ -2894,7 +2899,7 @@ TDE will start, but many good defaults will not be set.
%{tde_datadir}/apps/kconf_update/move_session_config.sh %{tde_datadir}/apps/kconf_update/move_session_config.sh
%{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png %{tde_datadir}/apps/ksmserver/pics/shutdownkonq.png
# Remove conflicts with redhat-menus # Remove conflicts with KDE4
%if "%{?tde_prefix}" != "/usr" %if "%{?tde_prefix}" != "/usr"
%{tde_bindir}/plasma-desktop %{tde_bindir}/plasma-desktop
%endif %endif
@ -3372,6 +3377,21 @@ Windows and Samba shares.
%__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %__sed -i "kdm/kfrontend/genkdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|"
%endif %endif
# Reboot command location may vary on some distributions
if [ -x "/usr/bin/reboot" ]; then
POWEROFF="/usr/bin/poweroff"
REBOOT="/usr/bin/reboot"
fi
if [ -n "${REBOOT}" ]; then
%__sed -i \
"doc/tdm/index.docbook" \
"doc/kcontrol/tdm/index.docbook" \
"kcontrol/tdm/tdm-shut.cpp" \
"tdm/config.def" \
-e "s|/sbin/poweroff|${POWEROFF}|g" \
-e "s|/sbin/reboot|${REBOOT}|g"
fi
%build %build
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
@ -3414,6 +3434,7 @@ fi
-DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \
-DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \
\ \
-DWITH_ALL_OPTIONS=ON \
-DWITH_SASL=ON \ -DWITH_SASL=ON \
-DWITH_LDAP=ON \ -DWITH_LDAP=ON \
-DWITH_SAMBA=ON \ -DWITH_SAMBA=ON \
@ -3514,7 +3535,7 @@ EOF
# TDM configuration # TDM configuration
%__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \ %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/kdm/kdmrc" \
%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 %if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210
-e "s/^#*MinShowUID=.*/MinShowUID=1000/" -e "s/^#*MinShowUID=.*/MinShowUID=1000/"
%else %else
-e "s/^#*MinShowUID=.*/MinShowUID=500/" -e "s/^#*MinShowUID=.*/MinShowUID=500/"
@ -3530,11 +3551,8 @@ EOF
# Makes 'media_safelyremove.desktop' an alternative # Makes 'media_safelyremove.desktop' an alternative
%__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" %__mv -f "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase"
%__ln_s "%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase" "%{buildroot}%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop"
%__mkdir_p "%{?buildroot}%{_sysconfdir}/alternatives"
%__ln_s "%{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_tdebase" "%{?buildroot}%{_sysconfdir}/alternatives/media_safelyremove.desktop_tdebase"
# SUSE: creates DM config file, used by '/etc/init.d/xdm' # SUSE >= 12 : creates DM config file, used by '/etc/init.d/xdm'
# You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager' # You must set 'DISPLAYMANAGER=tdm' in '/etc/sysconfig/displaymanager'
%if 0%{?suse_version} >= 1210 %if 0%{?suse_version} >= 1210
%__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm"

14
redhat/tdesdk/tdesdk-14.0.0.spec
Unescape View File

@ -189,6 +189,7 @@ what the code typically looks like.
This package is part of Trinity, and a component of the TDE SDK module. This package is part of Trinity, and a component of the TDE SDK module.
%files -n trinity-kapptemplate %files -n trinity-kapptemplate
%defattr(-,root,root,-)
%{tde_bindir}/kapptemplate %{tde_bindir}/kapptemplate
%{tde_datadir}/apps/kapptemplate/ %{tde_datadir}/apps/kapptemplate/
@ -969,11 +970,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/svn+https.protocol_tdesdk %{tde_datadir}/services/svn+https.protocol_tdesdk
%{tde_datadir}/services/svn+ssh.protocol_tdesdk %{tde_datadir}/services/svn+ssh.protocol_tdesdk
%{tde_datadir}/services/svn.protocol_tdesdk %{tde_datadir}/services/svn.protocol_tdesdk
%{tde_datadir}/services/svn+file.protocol
%{tde_datadir}/services/svn+http.protocol
%{tde_datadir}/services/svn+https.protocol
%{tde_datadir}/services/svn+ssh.protocol
%{tde_datadir}/services/svn.protocol
%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
@ -1012,7 +1008,7 @@ if [ $1 -eq 0 ]; then
for proto in svn+file svn+http svn+https svn+ssh svn; do for proto in svn+file svn+http svn+https svn+ssh svn; do
update-alternatives --remove \ update-alternatives --remove \
${proto}.protocol \ ${proto}.protocol \
%{tde_datadir}/services/${proto}.protocol_tdesdk %{tde_datadir}/services/${proto}.protocol_tdesdk || :
done done
fi fi
@ -1137,12 +1133,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
%__ln_s -f /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
%__ln_s -f /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
%__ln_s -f /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
%__ln_s -f /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s -f /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
%endif %endif
# Removes useless stuff # Removes useless stuff

25
redhat/tdesdk/tdesdk-3.5.13.2.spec
Unescape View File

@ -972,16 +972,6 @@ This package is part of Trinity, and a component of the TDE SDK module.
%{tde_datadir}/services/svn+https.protocol_tdesdk %{tde_datadir}/services/svn+https.protocol_tdesdk
%{tde_datadir}/services/svn+ssh.protocol_tdesdk %{tde_datadir}/services/svn+ssh.protocol_tdesdk
%{tde_datadir}/services/svn.protocol_tdesdk %{tde_datadir}/services/svn.protocol_tdesdk
%{tde_datadir}/services/svn+file.protocol
%{tde_datadir}/services/svn+http.protocol
%{tde_datadir}/services/svn+https.protocol
%{tde_datadir}/services/svn+ssh.protocol
%{tde_datadir}/services/svn.protocol
%{_sysconfdir}/alternatives/svn+file.protocol
%{_sysconfdir}/alternatives/svn+http.protocol
%{_sysconfdir}/alternatives/svn+https.protocol
%{_sysconfdir}/alternatives/svn+ssh.protocol
%{_sysconfdir}/alternatives/svn.protocol
%{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_switch.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_merge.png
%{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png
@ -1020,7 +1010,7 @@ if [ $1 -eq 0 ]; then
for proto in svn+file svn+http svn+https svn+ssh svn; do for proto in svn+file svn+http svn+https svn+ssh svn; do
update-alternatives --remove \ update-alternatives --remove \
${proto}.protocol \ ${proto}.protocol \
%{tde_datadir}/services/${proto}.protocol_tdesdk %{tde_datadir}/services/${proto}.protocol_tdesdk || :
done done
fi fi
@ -1149,19 +1139,6 @@ export PATH="%{tde_bindir}:${PATH}"
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol_tdesdk
%__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk %__mv -f %{?buildroot}%{tde_datadir}/services/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol_tdesdk
%__ln_s -f /etc/alternatives/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol
%__ln_s -f /etc/alternatives/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol
%__ln_s -f /etc/alternatives/svn+https.protocol %{?buildroot}%{tde_datadir}/services/svn+https.protocol
%__ln_s -f /etc/alternatives/svn+ssh.protocol %{?buildroot}%{tde_datadir}/services/svn+ssh.protocol
%__ln_s -f /etc/alternatives/svn.protocol %{?buildroot}%{tde_datadir}/services/svn.protocol
%__mkdir_p %{?buildroot}/etc/alternatives
%__ln_s -f %{tde_datadir}/services/svn+file.protocol %{?buildroot}/etc/alternatives/svn+file.protocol
%__ln_s -f %{tde_datadir}/services/svn+http.protocol %{?buildroot}/etc/alternatives/svn+http.protocol
%__ln_s -f %{tde_datadir}/services/svn+https.protocol %{?buildroot}/etc/alternatives/svn+https.protocol
%__ln_s -f %{tde_datadir}/services/svn+ssh.protocol %{?buildroot}/etc/alternatives/svn+ssh.protocol
%__ln_s -f %{tde_datadir}/services/svn.protocol %{?buildroot}/etc/alternatives/svn.protocol
%endif %endif
# Removes useless stuff # Removes useless stuff

Write Preview
Loading…
Cancel
Save