diff options
23 files changed, 273 insertions, 175 deletions
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec index 79c275e09..a4dc45479 100644 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0.spec @@ -44,8 +44,6 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -Patch0: gtk-qt-engine-14.0.0-debug.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -72,7 +70,6 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .debug %build diff --git a/redhat/applications/kbiff/kbiff-14.0.0.spec b/redhat/applications/kbiff/kbiff-14.0.0.spec index d5d4a59ea..742a0a5aa 100644 --- a/redhat/applications/kbiff/kbiff-14.0.0.spec +++ b/redhat/applications/kbiff/kbiff-14.0.0.spec @@ -30,7 +30,7 @@ Summary: TDE mail notification utility Group: Applications/Internet License: GPLv2+ -URL: http://sourceforge.net/projects/knmap/ +URL: http://www.trinitydesktop.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz @@ -65,7 +65,6 @@ NNTP mailboxes. %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ diff --git a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec index 7436ffa4b..4ad605065 100644 --- a/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec +++ b/redhat/applications/kchmviewer/kchmviewer-14.0.0.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: CHM viewer for Trinity Version: 3.1.2 -Release: %{?!preversion:5}%{?preversion:4_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec index 807c4c5a7..435434a7a 100644 --- a/redhat/applications/kpilot/kpilot-14.0.0.spec +++ b/redhat/applications/kpilot/kpilot-14.0.0.spec @@ -49,7 +49,7 @@ BuildRequires: trinity-tdebase-devel >= %{tde_version} BuildRequires: desktop-file-utils BuildRequires: gettext -BuildRequires: pilot-link-devel +BuildRequires: pilot-link-devel >= 0.12 BuildRequires: trinity-tdepim-devel >= %{tde_version} %description diff --git a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec index b72ffee4e..00baa6312 100644 --- a/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec +++ b/redhat/applications/tdeio-ftps/tdeio-ftps-14.0.0.spec @@ -29,7 +29,7 @@ Summary: An ftps TDEIO slave for Trinity Group: Productivity/Networking/Ftp/Clients License: GPLv2+ -URL: http://kasablanca.berlios.de/kio-ftps/ +URL: http://www.trinitydesktop.org/ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec index 7d39a0368..33cc0f193 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-14.0.0.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:8}%{?preversion:7_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -57,7 +57,6 @@ Wrapper around tdeio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. - %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -134,5 +133,5 @@ fi %changelog -* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.2-7 +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.2-8 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec index 8697ce046..f83a7fffa 100644 --- a/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec +++ b/redhat/applications/tdeio-umountwrapper/tdeio-umountwrapper-3.5.13.2.spec @@ -27,7 +27,7 @@ Name: trinity-%{tde_pkg} Summary: progress dialog for safely removing devices in Trinity. Version: 0.2 -Release: %{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant} License: GPLv2+ Group: Applications/Utilities @@ -40,7 +40,7 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: media_safelyremove.desktop_tdeio +Source1: media_safelyremove.desktop BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -53,11 +53,10 @@ Obsoletes: trinity-kio-umountwrapper < %{version}-%{release} Provides: trinity-kio-umountwrapper = %{version}-%{release} %description -Wrapper around tdeio_media_mountwrapper. +Wrapper around kio_media_mountwrapper. Provides a progress dialog for Safely Removing of devices in Trinity. - %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif @@ -72,7 +71,8 @@ Provides a progress dialog for Safely Removing of devices in Trinity. %build -unset QTDIR; . /etc/profile.d/qt3.sh +unset QTDIR QTINC QTLIB +. /etc/profile.d/qt3.sh export PATH="%{tde_bindir}:${PATH}" %configure \ @@ -131,8 +131,12 @@ fi %{tde_datadir}/apps/konqueror/servicemenus/media_safelyremove.desktop_kio-umountwrapper %{tde_datadir}/apps/d3lphin/servicemenus/media_safelyremove.desktop_kio-umountwrapper + %changelog -* Fri Aug 16 2013 Francois Andriot <[email protected]> - 0.2.5-6 +* Sat Sep 28 2013 Francois Andriot <[email protected]> - 0.2-7 +- Fix inadvertent 'kio' renaming + +* Fri Aug 16 2013 Francois Andriot <[email protected]> - 0.2-6 - Build for Fedora 19 * Mon Jun 03 2013 Francois Andriot <[email protected]> - 0.2-5 diff --git a/redhat/applications/tderadio/tderadio-14.0.0.spec b/redhat/applications/tderadio/tderadio-14.0.0.spec index 8c7d8fff0..6265f14d6 100644 --- a/redhat/applications/tderadio/tderadio-14.0.0.spec +++ b/redhat/applications/tderadio/tderadio-14.0.0.spec @@ -108,6 +108,7 @@ of new plugins (e.g. Internet Radio Streams, new cool GUIs) are welcome. unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" +# Warning: --enable-visibility causes applications fails to start ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ @@ -123,7 +124,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ + --disable-gcc-hidden-visibility \ \ %{?with_lirc:--enable-lirc} %{?!with_lirc:--disable-lirc} \ --enable-v4l2 \ @@ -142,6 +143,7 @@ export PATH="%{tde_bindir}:${PATH}" %find_lang %{tde_pkg} + %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec index ac84db4a3..2161deede 100644 --- a/redhat/applications/tellico/tellico-14.0.0.spec +++ b/redhat/applications/tellico/tellico-14.0.0.spec @@ -146,9 +146,8 @@ fi %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -# Warning, --enable-final causes FTBFS § +# Warning, --enable-final causes FTBFS ! %configure \ --prefix=%{tde_prefix} \ --exec-prefix=%{tde_prefix} \ diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 8e77efba1..86cb48784 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -295,6 +295,7 @@ fi grpiui applications/krecipes grpiui applications/krename grpiui applications/krusader +grpiui applications/kscope grpiui applications/ksensors grpiui applications/kshowmail grpiui applications/kshutdown diff --git a/redhat/buildall-sru.sh b/redhat/buildall-sru.sh index ce114202b..88cd4a13d 100755 --- a/redhat/buildall-sru.sh +++ b/redhat/buildall-sru.sh @@ -106,7 +106,13 @@ fi # Extra dependencies grpiud extras/akode -if [ "${DIST:0:6}" = ".oss12" ] || [ "${DIST:0:4}" = ".mga" ] || [ "${DIST:0:3}" = ".fc" ]; then +# HAL already exists in: +# Mageia <= 2 +# RHEL <= 6 +# openSUSE <= 11.4 +# Fedora <= 15 +if [ "${DIST:0:6}" = ".oss12" ] || [ "${DIST}" = ".mga3" ] \ +|| [ "${DIST}" = ".fc16" ]|| [ "${DIST}" = ".fc17" ] || [ "${DIST}" = ".fc18" ] || [ "${DIST}" = ".fc19" ]; then if ! is_installed trinity-hal-devel; then grpiu 3rdparty/hal grpiu 3rdparty/hal-info @@ -123,18 +129,28 @@ if [ "${DIST:0:4}" = ".mga" ]; then eval ${PKGINST} htdig || exit 1 fi fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/poppler +fi +if [ "${DIST}" = ".el4" ] || [ "${DIST}" = ".el5" ]; then + grpiud 3rdparty/sip +fi # TDE dependencies grpiud dependencies/tqtinterface grpiud dependencies/arts -grpiud dependencies/avahi-tqt -grpiud dependencies/dbus-1-tqt -grpiud dependencies/dbus-tqt grpiud dependencies/libcaldav grpiud dependencies/libcarddav grpiud dependencies/tqca -grpiui dependencies/tqca-tls +if [ "${DIST}" != ".el4" ]; then + grpiud dependencies/avahi-tqt + grpiud dependencies/dbus-1-tqt + grpiud dependencies/dbus-tqt + grpiui dependencies/tqca-tls +fi +# Extra dependencies +grpiud extras/akode # TDE main # basic packages @@ -192,6 +208,15 @@ if [ "${DIST:0:4}" != ".mga" ]; then fi fi +## LIBOTR3: required for kopete-otr +if [ "${DIST:0:5}" = ".mga3" ]; then + if ! is_installed libotr3; then + grpiu 3rdparty/libotr3 + eval ${PKGINST} libotr3 || exit 1 + eval ${PKGINST} libotr3-devel || exit 1 + fi +fi + ## PYTHON-QT3: for Python-stuff if ! is_installed python-qt3; then if [ "${DIST:0:3}" = ".el" ] || [ "${DIST:0:3}" = ".fc" ]; then @@ -255,15 +280,21 @@ grpiui applications/kbookreader grpiui applications/kchmviewer grpiui applications/kcmautostart grpiui applications/kcpuload -grpiui applications/kdbusnotification +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kdbusnotification +fi grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep #grpiui applications/kerry grpiui applications/kile -grpiui applications/kima +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kima +fi grpiui applications/kiosktool -grpiui applications/kmplayer +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kmplayer +fi grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo @@ -282,7 +313,9 @@ fi grpiui applications/konversation grpiui applications/kopete-otr grpiui applications/kpicosim -grpiui applications/kpilot +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kpilot +fi if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then grpiui applications/kpowersave fi @@ -313,7 +346,9 @@ grpiui applications/tderadio grpiui applications/tde-style-lipstik grpiui applications/tde-style-qtcurve grpiui applications/tdesudo -grpiui applications/tdesvn +if [ "${DIST}" != ".el4" ]; then + grpiui applications/tdesvn +fi grpiui applications/tde-systemsettings grpiui applications/tdmtheme grpiui applications/tellico diff --git a/redhat/buildenv.sh b/redhat/buildenv.sh index a1a03f8c0..f7aef2a08 100644 --- a/redhat/buildenv.sh +++ b/redhat/buildenv.sh @@ -74,3 +74,11 @@ alias crz='(cdrpm; createrepo $(uname -i); createrepo noarch; sudo zypper refres # Build local repository (PCLOS) alias cra='(cdrpm; genpkglist $PWD noarch; genpkglist $PWD i586; genpkglist $PWD x86_64; genbasedir $PWD i586 x86_64 noarch; sudo apt-get update)' alias crac='(cdrpm; for i in i586 noarch x86_64; do cd $i; tdesortrpm.sh; cd -; done; rpmsign --addsign */RPMS.*/*.rpm; for i in i586 noarch x86_64; do for j in 3rdparty applications dependencies extras libraries main; do genpkglist $PWD/$i $j; done; done; for i in i586 noarch x86_64; do genbasedir $PWD/$i 3rdparty applications dependencies extras libraries main; done; sudo apt-get update)' + +# Reinstall packages (Mageia) +getrpmfromsrpm() { + rpm -qa --qf "%{name} %{sourcerpm}\n"|grep "$1"|awk '{print $1}' +} +reinst() { + sudo urpmi --replacepkgs --allow-force $(getrpmfromsrpm $1) +} diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 4abafed20..ce2890a07 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -305,24 +305,24 @@ toolkit. %files devel %defattr(-,root,root,-) -%{tde_bindir}/conv2ui -%{tde_bindir}/qvfb +%{tde_bindir}/tqtconv2ui +%{tde_bindir}/tqvfb %{tde_bindir}/tqmoc %{tde_bindir}/tquic -%{tde_bindir}/findtr -%{tde_bindir}/qt20fix -%{tde_bindir}/qtrename140 +%{tde_bindir}/tqtfindtr +%{tde_bindir}/tqt20fix +%{tde_bindir}/tqtrename140 %{tde_bindir}/tqassistant -%{tde_bindir}/qm2ts +%{tde_bindir}/tqm2ts %{tde_bindir}/tqmake %{tde_bindir}/tqembed %{tde_bindir}/tqlinguist %{tde_bindir}/tqlupdate %{tde_bindir}/tqlrelease -%{tde_bindir}/createcw -%{tde_bindir}/makeqpf -%{tde_bindir}/mergetr -%{tde_bindir}/msg2qm +%{tde_bindir}/tqtcreatecw +%{tde_bindir}/maketqpf +%{tde_bindir}/tqtmergetr +%{tde_bindir}/msg2tqm %{tde_datadir}/tqt3/mkspecs/ %{tde_datadir}/tqt3/phrasebooks/ %{tde_includedir}/tqt3/ @@ -452,6 +452,12 @@ for the TQt 3 toolkit. ########## +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +########## + %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -473,6 +479,7 @@ for the TQt 3 toolkit. -e "s|^QMAKE_INCDIR_QT =.*|QMAKE_INCDIR_QT = %{_includedir}/tqt3|" \ -e "s|^QMAKE_LIBDIR_QT =.*|QMAKE_LIBDIR_QT = %{_libdir}|" \ + %build unset QTDIR QTINC QTLIB export QTDIR=$(pwd) @@ -513,31 +520,31 @@ echo yes | ./configure \ ${INCDIRS} \ ${LIBDIRS} \ -L%{_libdir} \ - -prefix "%{tde_prefix}" \ + -prefix "%{tde_prefix}" \ -libdir "%{tde_libdir}" \ - -sysconfdir "%{_sysconfdir}/tqt3" \ - -datadir "%{tde_datadir}/tqt3" \ - -headerdir "%{tde_includedir}/tqt3" \ - -docdir "%{tde_datadir}/tqt3/doc" \ - -plugindir "%{tde_libdir}/tqt3/plugins" \ - -translationdir "%{tde_datadir}/tqt3/translations" \ - \ - -thread \ - -shared \ - -fast \ - -no-exceptions \ + -sysconfdir "%{_sysconfdir}/tqt3" \ + -datadir "%{tde_datadir}/tqt3" \ + -headerdir "%{tde_includedir}/tqt3" \ + -docdir "%{tde_datadir}/tqt3/doc" \ + -plugindir "%{tde_libdir}/tqt3/plugins" \ + -translationdir "%{tde_datadir}/tqt3/translations" \ + \ + -thread \ + -shared \ + -fast \ + -no-exceptions \ %if "%{_lib}" == "lib64" -platform linux-g++-64 \ %else -platform linux-g++ \ %endif - \ + \ -nis \ -no-pch \ -cups \ -stl \ -ipv6 \ - \ + \ -sm \ -xshape \ -xinerama \ @@ -547,27 +554,27 @@ echo yes | ./configure \ -xft \ -tablet \ -xkb \ - \ + \ -system-zlib \ -system-libpng \ -system-libmng \ -system-libjpeg \ %{?with_nas:-system-nas-sound} %{?!with_nas:-no-nas-sound} \ - \ + \ -enable-opengl \ -dlopen-opengl \ - \ + \ -qt-gif \ -qt-imgfmt-png \ -qt-imgfmt-jpeg \ -plugin-imgfmt-mng \ - \ + \ -plugin-sql-odbc \ -plugin-sql-psql \ -plugin-sql-mysql \ %{?with_ibase:-plugin-sql-ibase} \ -plugin-sql-sqlite \ - \ + \ -lfontconfig \ -inputmethod \ %{?with_glibmainloop:-glibmainloop} \ @@ -577,11 +584,11 @@ echo yes | ./configure \ # proceed %__make %{?_smp_mflags} sub-src sub-plugins sub-tools -# build conv2ui -%__make -C tools/designer/tools/conv2ui +# build tqtconv2ui +%__make -C tools/designer/tools/tqtconv2ui -# build qvfb -%__make -C tools/qvfb +# build tqvfb +%__make -C tools/tqvfb # fix .prl files %__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g" @@ -599,15 +606,15 @@ export PATH=${QTDIR}/bin:$PATH %__make INSTALL_ROOT=%{?buildroot} install %__make INSTALL_ROOT=%{?buildroot} plugins-install -%__install -m755 bin/qtrename140 %{?buildroot}%{_bindir} -%__install -m755 bin/qt20fix %{?buildroot}%{_bindir} -%__install -m755 bin/findtr %{?buildroot}%{_bindir} +%__install -m755 bin/tqtrename140 %{?buildroot}%{_bindir} +%__install -m755 bin/tqt20fix %{?buildroot}%{_bindir} +%__install -m755 bin/tqtfindtr %{?buildroot}%{_bindir} -# install conv2ui -%__install -m755 bin/conv2ui %{?buildroot}%{_bindir}/conv2ui +# install tqtconv2ui +%__install -m755 bin/tqtconv2ui %{?buildroot}%{_bindir}/tqtconv2ui -# install qvfb -%__install -m755 tools/qvfb/qvfb %{?buildroot}%{_bindir}/qvfb +# install tqvfb +%__install -m755 tools/tqvfb/tqvfb %{?buildroot}%{_bindir}/tqvfb %clean diff --git a/redhat/packages.fedora b/redhat/packages.fedora index 4b26cb60d..93f9bad28 100644 --- a/redhat/packages.fedora +++ b/redhat/packages.fedora @@ -184,3 +184,13 @@ librsvg2-tools libXv-devel net-tools libcap-devel +libmng-devel +libXcomposite-devel +libXdamage-devel +libXxf86vm-devel +java-1.4.2-gcj-compat-devel +libgcj-devel +gcc-java + +ocaml +pcsc-lite-devel diff --git a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch index 835aed72d..943a77eb0 100644 --- a/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch +++ b/redhat/tde-i18n/tde-i18n-14.0.0-fr-updates.patch @@ -11,9 +11,9 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmbackground.po tde-i18n-fr/message + +msgid "Enables a smooth fading effect when changing background image." +msgstr "Activer un effet de fondu lors du changement de fond d'écran." -diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po ---- tde-i18n-fr.ORI/messages/tdebase/tdecmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100 -+++ tde-i18n-fr/messages/tdebase/tdecmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200 +diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po +--- tde-i18n-fr.ORI/messages/tdebase/kcmdisplayconfig.po 1970-01-01 01:00:00.000000000 +0100 ++++ tde-i18n-fr/messages/tdebase/kcmdisplayconfig.po 2013-07-26 20:00:46.303178565 +0200 @@ -0,0 +1,188 @@ +msgid "<b>The global display configuration is a system wide setting, and requires administrator access</b><br>To alter the system's global display configuration, click on the \"Administrator Mode\" button below." +msgstr "<b>La configuration d'affichage globale est un réglage système, et nécessite les droits administrateur.</b><br>Pour modifier la configuration système globale, cliquer sur le bouton \"Mode superutilisateur\"." @@ -217,9 +217,9 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmenergy.po tde-i18n-fr/messages/td +msgid "Configure KPowersave..." +msgstr "Configurer KPowersave..." + -diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po tde-i18n-fr/messages/tdebase/tdecmiccconfig.po ---- tde-i18n-fr.ORI/messages/tdebase/tdecmiccconfig.po 1970-01-01 01:00:00.000000000 +0100 -+++ tde-i18n-fr/messages/tdebase/tdecmiccconfig.po 2013-07-26 19:48:22.142618069 +0200 +diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po tde-i18n-fr/messages/tdebase/kcmiccconfig.po +--- tde-i18n-fr.ORI/messages/tdebase/kcmiccconfig.po 1970-01-01 01:00:00.000000000 +0100 ++++ tde-i18n-fr/messages/tdebase/kcmiccconfig.po 2013-07-26 19:48:22.142618069 +0200 @@ -0,0 +1,80 @@ +# TDE 3.5.13 'iccconfig.cpp' translation + @@ -918,7 +918,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde #. i18n: file minicli_ui.ui line 199 #: rc.cpp:14 #, no-c-format -@@ -1144,3 +1174,29 @@ +@@ -1144,3 +1174,39 @@ "Cependant, certains écrans de veille\n" " effectuent des calculs utiles, dans ces cas, il est souhaitable de ne " "pas les désactiver." @@ -948,6 +948,16 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kdesktop.po tde-i18n-fr/messages/tde + +msgid "'%1' is currently logged on" +msgstr "'%1' est actuellement connecté" ++ ++# SAK dialog (sakdlg.cpp) ++msgid "Press Ctrl+Alt+Del to begin." ++msgstr "Appuyez sur Ctrl+Alt+Suppr pour commencer." ++ ++msgid "This process helps keep your password secure." ++msgstr "Ce processus permet de protéger votre mot de passe." ++ ++msgid "It prevents unauthorized users from emulating the login screen." ++msgstr "Il empêche l'usurpation du panneau de connexion par d'autres processus." diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kicker.po tde-i18n-fr/messages/tdebase/kicker.po --- tde-i18n-fr.ORI/messages/tdebase/kicker.po 2013-07-26 17:53:39.996658761 +0200 +++ tde-i18n-fr/messages/tdebase/kicker.po 2013-07-26 17:53:59.000152412 +0200 @@ -1489,7 +1499,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/kpersonalizer.po tde-i18n-fr/message diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/tdebase/ksmserver.po --- tde-i18n-fr.ORI/messages/tdebase/ksmserver.po 2013-07-26 17:53:39.995658788 +0200 +++ tde-i18n-fr/messages/tdebase/ksmserver.po 2013-07-29 11:12:48.861837356 +0200 -@@ -92,3 +92,82 @@ +@@ -92,3 +92,91 @@ "_: current option in boot loader\n" " (current)" msgstr " (courant)" @@ -1572,6 +1582,15 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksmserver.po tde-i18n-fr/messages/td + +msgid "Terminating services..." +msgstr "Arrêt des services..." ++ ++msgid "&Freeze Computer" ++msgstr "Mettre en veille (&Freeze)" ++ ++msgid "&Hibernate Computer" ++msgstr "Mettre en veille (sur &disque)" ++ ++msgid "&Suspend Computer" ++msgstr "Mettre en veille (en R&AM)" diff -Nuar tde-i18n-fr.ORI/messages/tdebase/ksplash.po tde-i18n-fr/messages/tdebase/ksplash.po --- tde-i18n-fr.ORI/messages/tdebase/ksplash.po 2013-07-26 17:53:39.998658707 +0200 +++ tde-i18n-fr/messages/tdebase/ksplash.po 2013-07-26 17:53:51.201360190 +0200 @@ -1620,7 +1639,10 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tderandr.po tde-i18n-fr/messages/tde + +#: tderandrtray.cpp:477 +msgid "Configure Display Color Profiles" -+msgstr "Configuration des profils de couleurs" ++msgstr "Configurer les profils de couleurs" ++ ++msgid "Configure Displays..." ++msgstr "Configurer l'affichage" + +#: tderandrbindings.cpp:29 +msgid "Display Control" diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 222d41f73..e52919c50 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -416,7 +416,7 @@ graphical disk usage viewer and image conversions and transformations. %files -n trinity-konq-plugins %defattr(-,root,root,-) %doc konq-plugins/README -%{tde_datadir}/config/translaterc +%{_sysconfdir}/trinity/translaterc %{tde_bindir}/fsview %{tde_bindir}/jpegorient %{tde_bindir}/tdeio_media_realfolder @@ -504,44 +504,25 @@ graphical disk usage viewer and image conversions and transformations. %{tde_datadir}/apps/metabar/themes/default/layout.html %{tde_datadir}/apps/microformat/pics/microformat.png %{tde_datadir}/config.kcfg/konq_sidebarnews.kcfg -%{tde_datadir}/icons/locolor/16x16/apps/autorefresh.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/babelfish.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/cssvalidator.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/domtreeviewer.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/htmlvalidator.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/imagegallery.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesync.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/remotesyncconfig.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/validators.png -%{tde_datadir}/icons/crystalsvg/16x16/actions/webarchiver.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_delicious.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/16x16/apps/konqsidebar_news.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/babelfish.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/cssvalidator.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/domtreeviewer.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/htmlvalidator.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/imagegallery.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesync.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/remotesyncconfig.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/validators.png -%{tde_datadir}/icons/crystalsvg/22x22/actions/webarchiver.png -%{tde_datadir}/icons/crystalsvg/22x22/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/32x32/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/32x32/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/crystalsvg/48x48/actions/minitools.png -%{tde_datadir}/icons/crystalsvg/48x48/apps/konqsidebar_mediaplayer.png -%{tde_datadir}/icons/hicolor/16x16/apps/metabar.png -%{tde_datadir}/icons/hicolor/22x22/apps/fsview.png -%{tde_datadir}/icons/hicolor/32x32/apps/fsview.png -%{tde_datadir}/icons/hicolor/32x32/apps/metabar.png -%{tde_datadir}/icons/hicolor/48x48/apps/metabar.png -%{tde_datadir}/icons/hicolor/64x64/apps/metabar.png +%{tde_datadir}/icons/crystalsvg/*/actions/babelfish.png +%{tde_datadir}/icons/crystalsvg/*/actions/cssvalidator.png +%{tde_datadir}/icons/crystalsvg/*/actions/domtreeviewer.png +%{tde_datadir}/icons/crystalsvg/*/actions/htmlvalidator.png +%{tde_datadir}/icons/crystalsvg/*/actions/imagegallery.png +%{tde_datadir}/icons/crystalsvg/*/actions/remotesync.png +%{tde_datadir}/icons/crystalsvg/*/actions/remotesyncconfig.png +%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png +%{tde_datadir}/icons/crystalsvg/*/actions/validators.png +%{tde_datadir}/icons/crystalsvg/*/actions/webarchiver.png +%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_delicious.png +%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_mediaplayer.png +%{tde_datadir}/icons/crystalsvg/*/apps/konqsidebar_news.png +%{tde_datadir}/icons/crystalsvg/*/actions/minitools.png +%{tde_datadir}/icons/hicolor/*/apps/metabar.png +%{tde_datadir}/icons/hicolor/*/apps/fsview.png %{tde_datadir}/icons/hicolor/scalable/apps/metabar.svgz -%{tde_datadir}/icons/hicolor/128x128/apps/metabar.png -%{tde_datadir}/icons/locolor/32x32/apps/konqsidebar_mediaplayer.png +%{tde_datadir}/icons/locolor/*/apps/autorefresh.png +%{tde_datadir}/icons/locolor/*/apps/konqsidebar_mediaplayer.png %{tde_datadir}/services/akregator_konqplugin.desktop %{tde_datadir}/services/ark_plugin.desktop %{tde_datadir}/services/fsview_part.desktop @@ -611,7 +592,7 @@ Requires: trinity-noatun %description -n trinity-noatun-plugins This package contains a variety of useful plugins for Noatun, the audio and -video media player for TDE. These plugins can be loaded through the plugin +video media player for TDE. These plugins can be loaded through the plugin manager in Noatun settings. Highlights include an alarm clock, guessing tags from filenames, adjustable @@ -683,51 +664,67 @@ done %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" -# Note about DB4: -# Fedora 18: /usr/include/libdb4/db_cxx.h , /usr/lib64/libdb_cxx-4.so +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%__mkdir_p build +cd build +%endif -%configure \ - --prefix=%{tde_prefix} \ - --exec-prefix=%{tde_prefix} \ - --bindir=%{tde_bindir} \ - --libdir=%{tde_libdir} \ - --datadir=%{tde_datadir} \ - --includedir=%{tde_tdeincludedir} \ +if [ -d "/usr/include/db53" ]; then + export CMAKE_INCLUDE_PATH="/usr/include/db53" +fi + +%cmake \ + -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ + -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \ + -DCMAKE_SKIP_RPATH=OFF \ + -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DWITH_GCC_VISIBILITY=ON \ \ - --disable-dependency-tracking \ - --disable-debug \ - --enable-new-ldflags \ - --enable-final \ - --enable-closure \ - --enable-rpath \ - --enable-gcc-hidden-visibility \ + -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \ + -DBIN_INSTALL_DIR="%{tde_bindir}" \ + -DDOC_INSTALL_DIR="%{tde_docdir}" \ + -DINCLUDE_INSTALL_DIR="%{tde_tdeincludedir}" \ + -DLIB_INSTALL_DIR="%{tde_libdir}" \ + -DPKGCONFIG_INSTALL_DIR="%{tde_libdir}/pkgconfig" \ + -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \ \ - --with-extra-includes=%{_includedir}/db4:%{_includedir}/db53:%{_includedir}/libdb4:%{tde_includedir}/arts \ + -DWITH_ALL_OPTIONS=ON \ + -DWITH_ARTS=ON \ + -DWITH_SDL=ON \ + -DWITH_BERKELEY_DB=ON \ + -DWITH_XMMS=OFF \ + -DWITH_TEST=OFF \ \ - %{?with_xmms:--with-xmms} %{?!with_xmms:--without-xmms} \ - --with-sdl \ -%if 0%{?with_db} - --with-berkeley-db \ -%endif - - -%__make %{?_smp_mflags} + -DBUILD_ALL=ON \ + -DBUILD_ATLANTIKDESIGNER=ON \ + -DBUILD_DOC=ON \ + -DBUILD_KADDRESSBOOK_PLUGINS=ON \ + -DBUILD_KATE_PLUGINS=ON \ + -DBUILD_KICKER_APPLETS=ON \ + -DBUILD_KNEWSTICKER_SCRIPTS=ON \ + -DBUILD_KONQ_PLUGINS=ON \ + -DBUILD_KSIG=ON \ + -DBUILD_NOATUN_PLUGINS=ON \ + -DBUILD_RENAMEDLG_PLUGINS=ON \ + -DBUILD_TDEFILE_PLUGINS=ON \ + .. + +%__make %{?_smp_mflags} || %__make %install export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} +%__make install DESTDIR=%{buildroot} -C build %clean diff --git a/redhat/tdeadmin/tdeadmin-14.0.0.spec b/redhat/tdeadmin/tdeadmin-14.0.0.spec index bb624c058..e5d2e8d17 100644 --- a/redhat/tdeadmin/tdeadmin-14.0.0.spec +++ b/redhat/tdeadmin/tdeadmin-14.0.0.spec @@ -413,7 +413,7 @@ fi --with-shadow \ --with-private-groups -%__make %{?_smp_mflags} +%__make %{?_smp_mflags} || %__make %install diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index c5deaff0e..2a995a7b8 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -90,7 +90,6 @@ Patch4: tdebase-14.0.0-kickoff_default_favs.patch Patch5: tdebase-14.0.0-konsole_wordseps.patch # Permanent patches, this TDE version only -# None ! # Patches from Mandriva Patch101: tdebase-14.0.0-vibrate_dialog.patch @@ -105,6 +104,9 @@ Patch201: tdebase-14.0.0-kcm_xcursor_applytheme.patch ## [tdebase] Fix i18n description loading in 'twin_update_default_rules' Patch202: tdebase-14.0.0-fix_twin_rules_translation.patch +Patch203: tdebase-14.0.0-tdehardwarebackend_fix_iocharset.patch + + ### Distribution-specific settings ### # Fedora 15 Theme: "Lovelock" @@ -164,7 +166,6 @@ Requires: fedora-release-notes %define tde_aboutpage /usr/share/doc/fedora-release-notes-19/index.html %endif - # RHEL 4 Theme %if 0%{?rhel} == 4 Requires: desktop-backgrounds-basic @@ -457,18 +458,24 @@ BuildRequires: libsmbclient-devel BuildRequires: imake %endif +# XKB support +%if 0%{?suse_version} == 1140 +BuildRequires: xorg-x11-libxkbfile-devel +%endif +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1210 +BuildRequires: libxkbfile-devel +%endif + # X11 stuff ... %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif %if 0%{?suse_version} == 1140 -BuildRequires: xorg-x11-libxkbfile-devel BuildRequires: xorg-x11-libfontenc-devel %endif %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} >= 1220 -BuildRequires: libxkbfile-devel BuildRequires: libfontenc-devel %endif @@ -602,7 +609,7 @@ This is a meta-package that installs all tdebase development packages. Header files for developing applications using %{name}. Install tdebase-devel if you want to develop or compile Konqueror, -Kate plugins or KWin styles. +Kate plugins or TWin styles. %files devel %defattr(-,root,root,-) @@ -3263,6 +3270,8 @@ Windows and Samba shares. %patch201 -p1 -b .kcmxcursor %patch202 -p1 -b .twintranslation +%patch203 -p1 -b .iocharset + # Applies an optional distro-specific graphical theme %if "%{?tde_bg}" != "" # TDM Background @@ -3302,6 +3311,21 @@ Windows and Samba shares. %__sed -i "tdm/kfrontend/gentdmconf.c" -e "s|/etc/X11/Xsession|/etc/X11/xdm/Xsession|" %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 unset QTDIR QTINC QTLIB diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 13f02f0af..16e82a54a 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -1037,7 +1037,7 @@ fi pushd dcopperl CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor -# Ugly hack to modify the man pages directory +# [Bug #348] Ugly hack to modify the man pages directory sed -i Makefile \ -e "s|/usr/share/man|%{tde_mandir}|g" diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 583784d91..edf0782bf 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -125,7 +125,7 @@ Requires: udisks %endif # PMOUNT support -Requires: pmount +#Requires: pmount # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} @@ -501,6 +501,7 @@ cd build -DWITH_KDE4_MENU_SUFFIX=OFF \ -DWITH_ASPELL=ON \ %{?!with_hspell:-DWITH_HSPELL=OFF} \ + -DWITH_TDEICONLOADER_DEBUG=OFF \ .. %__make %{?_smp_mflags} || %__make diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 5701a1e14..ada8480f6 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -52,12 +52,13 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: kppp.pamd Source2: ktalk -# RedHat/Fedora legacy patches -Patch4: kdenetwork-3.2.3-resolv.patch # [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 @@ -79,7 +80,7 @@ BuildRequires: sqlite-devel # GADU support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gadu 1 +%define with_gadu 1tdenetwork-14.0.0-fix_kget.patch BuildRequires: libgadu-devel %endif diff --git a/redhat/tdesdk/tdesdk-14.0.0.spec b/redhat/tdesdk/tdesdk-14.0.0.spec index d6bd348a9..e5d9bd962 100644 --- a/redhat/tdesdk/tdesdk-14.0.0.spec +++ b/redhat/tdesdk/tdesdk-14.0.0.spec @@ -974,11 +974,6 @@ This package is part of Trinity, and a component of the TDE SDK module. %{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_merge.png %{tde_datadir}/icons/crystalsvg/*/actions/svn_branch.png @@ -1148,13 +1143,6 @@ export PATH="%{tde_bindir}:${PATH}" %__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 # Removes useless stuff diff --git a/redhat/tdewebdev/tdewebdev-14.0.0.spec b/redhat/tdewebdev/tdewebdev-14.0.0.spec index 0e4446a39..fcc4119db 100644 --- a/redhat/tdewebdev/tdewebdev-14.0.0.spec +++ b/redhat/tdewebdev/tdewebdev-14.0.0.spec @@ -47,8 +47,8 @@ BuildRequires: autoconf automake libtool m4 BuildRequires: desktop-file-utils BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdesdk-devel >= %{tde_version} + BuildRequires: libxslt-devel -BuildRequires: libxml2-devel %if 0%{?rhel} == 4 # a bogus dep in libexslt.la file from EL-4 (WONTFIX bug http://bugzilla.redhat.com/142241) BuildRequires: libgcrypt-devel @@ -58,6 +58,7 @@ BuildRequires: perl # KXSLDBG requires libxml2 #if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || ( 0%{?fedora} > 0 && %{?fedora} <= 17 ) || 0%{?suse_version} %define build_kxsldbg 1 +BuildRequires: libxml2-devel #endif @@ -426,8 +427,8 @@ This package is part of TDE, as a component of the TDE web development module. %{tde_tdelibdir}/libkxsldbgpart.la %{tde_tdelibdir}/libkxsldbgpart.so %{tde_tdeappdir}/kxsldbg.desktop -%{tde_datadir}/apps/kxsldbg -%{tde_datadir}/apps/kxsldbgpart +%{tde_datadir}/apps/kxsldbg/ +%{tde_datadir}/apps/kxsldbgpart/ %{tde_tdedocdir}/HTML/en/kxsldbg/ %{tde_tdedocdir}/HTML/en/xsldbg/ %{tde_datadir}/icons/hicolor/*/actions/1downarrow.png @@ -524,7 +525,10 @@ fi --enable-final \ --enable-closure \ --enable-rpath \ - --disable-gcc-hidden-visibility + --disable-gcc-hidden-visibility \ + \ + --enable-editors + # WTF hack for RHEL4 %if 0%{?rhel} == 4 |