diff options
Diffstat (limited to 'redhat')
17 files changed, 107 insertions, 284 deletions
diff --git a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch deleted file mode 100644 index 73021cb11..000000000 --- a/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- gtk-qt-engine/kcm_gtk/kcmgtk.cpp.ORI 2013-07-23 23:35:16.614406882 +0200 -+++ gtk-qt-engine/kcm_gtk/kcmgtk.cpp 2013-07-23 23:56:39.121594541 +0200 -@@ -261,13 +261,21 @@ - } - } - -+ bool gtk3installed = false; - widget->styleBox3->clear(); - TQStringList otherGtk3Styles = gtk3Themes.keys(); -- otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -- widget->styleBox3->insertStringList(otherGtk3Styles); -- -- bool gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ if(!otherGtk3Styles.empty()) { -+ otherGtk3Styles.remove(otherGtk3Styles.find("tdegtk")); -+ if(!otherGtk3Styles.empty()) { -+ gtk3installed = (gtk3Themes.find("tdegtk") != gtk3Themes.end()); -+ } -+ } -+ if(gtk3installed) { -+ widget->styleBox3->insertStringList(otherGtk3Styles); -+ } - widget->styleKde3->setEnabled(gtk3installed); -+ widget->styleBox3->setEnabled(gtk3installed); -+ widget->styleOther3->setEnabled(gtk3installed); - widget->warning4->setHidden(gtk3installed); - widget->warning5->setHidden(gtk3installed); - widget->warning6->setHidden(gtk3installed); 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 d51ec3f2e..79c275e09 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,7 +44,7 @@ Source1: gtk-qt-engine.rc.sh Source2: gtkrc-2.0-kde4 Source3: gtkrc-2.0-kde-kde4 -Patch1: gtk-qt-engine-14.0.0-fix_gtk3_segv.patch +Patch0: gtk-qt-engine-14.0.0-debug.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -72,7 +72,7 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .segv +%patch0 -p1 -b .debug %build diff --git a/redhat/applications/kbfx/kbfx-14.0.0.spec b/redhat/applications/kbfx/kbfx-14.0.0.spec index b8be0817c..8661e7e81 100644 --- a/redhat/applications/kbfx/kbfx-14.0.0.spec +++ b/redhat/applications/kbfx/kbfx-14.0.0.spec @@ -105,13 +105,13 @@ cd build -DDATA_INSTALL_DIR=%{tde_datadir}/apps \ -DMIME_INSTALL_DIR=%{tde_datadir}/mimelnk \ -DXDG_APPS_INSTALL_DIR=%{tde_tdeappdir} \ + -DSHARE_INSTALL_PREFIX="%{tde_datadir}"\ -DDOC_INSTALL_DIR=%{tde_tdedocdir} \ -DLIB_INSTALL_DIR=%{tde_libdir} \ \ -DUSE_STRIGI=OFF \ -DUSE_MENUDRAKE=OFF \ - -DBUILD_DOC=ON \ - -DBUILD_ALL=OFF \ + -DBUILD_ALL=ON \ .. # Not SMP safe ! @@ -166,12 +166,14 @@ update-desktop-database %{tde_appdir} &> /dev/null %{tde_datadir}/apps/kicker/applets/kbfxspinx.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_install_theme.desktop %{tde_datadir}/apps/konqueror/servicemenus/kbfx_prepare_theme.desktop -#%{tde_tdedocdir}/HTML/en/common/kbfx-*.jpg -#%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ -%{tde_tdedocdir}/kbfx/ +%{tde_tdedocdir}/HTML/en/kbfxconfigapp/ +%{tde_docdir}/kbfx/ %{tde_datadir}/icons/hicolor/*/apps/kbfx.png %{tde_datadir}/icons/hicolor/*/apps/kbfxconfigapp.png -#%{tde_datadir}/locale/*/LC_MESSAGES/kbfxconfigapp.mo +%lang(bg) %{tde_datadir}/locale/bg/LC_MESSAGES/kbfxconfigapp.mo +%lang(hu) %{tde_datadir}/locale/hu/LC_MESSAGES/kbfxconfigapp.mo +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/kbfxconfigapp.mo +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/kbfxconfigapp.mo %{tde_datadir}/mimelnk/application/x-kbfxtheme.desktop diff --git a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec index de2535703..337caedd4 100644 --- a/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec +++ b/redhat/applications/klcddimmer/klcddimmer-14.0.0.spec @@ -99,8 +99,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} @@ -115,7 +113,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -%files -f %{tde_pkg}.lang +%files %defattr(-,root,root,-) %doc AUTHORS COPYING LICENSE NEWS README %{tde_libdir}/klcddimmer_panelapplet.la diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 971e26a8c..14c2f88d8 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -111,9 +111,7 @@ export PATH="%{tde_bindir}:${PATH}" --enable-new-ldflags \ --enable-closure \ --enable-rpath \ - --enable-gcc-hidden-visibility \ - \ - --with-extra-includes=/usr/include/cdda + --enable-gcc-hidden-visibility %__make %{?_smp_mflags} 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 1cd956ab3..65838ef05 100644 --- a/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec +++ b/redhat/applications/tde-guidance/tde-guidance-14.0.0.spec @@ -46,7 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: tde-guidance-14.0.0-tqt3.patch +#Patch1: tde-guidance-14.0.0-tqt3.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -146,7 +146,9 @@ or can be run as standalone applications. %exclude %{tde_datadir}/apps/guidance/MonitorsDB # Files from powermanager +%if 0%{?with_powermanager} %exclude %{tde_datadir}/icons/hicolor/22x22/apps/power-manager.png +%endif %exclude %{tde_datadir}/apps/guidance/pics/ac-adapter.png %exclude %{tde_datadir}/apps/guidance/pics/battery*.png %exclude %{tde_datadir}/apps/guidance/pics/processor.png @@ -259,7 +261,7 @@ gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .tqt3 +#patch1 -p1 -b .tqt3 %if 0%{?rhel} || 0%{?mgaversion} || 0%{?mdkversion} %__sed -i "userconfig/unixauthdb.py" \ diff --git a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec index 2dd719162..121915ed9 100644 --- a/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec +++ b/redhat/applications/tdepowersave/tdepowersave-14.0.0.spec @@ -41,10 +41,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: trinity-cmake-translations.patch -Patch2: tdepowersave-cmake-add-translation-and-documentation.patch -Patch3: tdepowersave-14.0.0-test.patch - BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -91,9 +87,6 @@ settings for: %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .lang -%patch2 -p1 -b .lang -#patch3 -p1 -b .test %build diff --git a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch b/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch deleted file mode 100644 index a30f264a4..000000000 --- a/redhat/applications/tdepowersave/tdepowersave-cmake-add-translation-and-documentation.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt 2013-08-19 06:54:55.000000000 +0200 -+++ trinity-tdepowersave-14.0.0~pre158+340d2058/po/CMakeLists.txt.new 2013-08-19 19:25:41.566465666 +0200 -@@ -9,9 +9,4 @@ - # - ################################################# - --# file( GLOB_RECURSE po_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} tdepowersave.po ) -- --foreach( _po ${po_files} ) -- get_filename_component( _lang ${_po} PATH ) -- tde_create_translation( FILES ${_po} LANG ${_lang} ) --endforeach( ) -+tde_create_translation( LANG auto OUTPUT_NAME tdepowersave ) -diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index c257983..68fca16 100644 ---- a/ConfigureChecks.cmake -+++ b/ConfigureChecks.cmake -@@ -57,6 +57,14 @@ if( NOT DBUS_TQT_FOUND ) - tde_message_fatal( "dbus-tqt is required, but was not found on your system" ) - endif( ) - -+# check for msgfmt -+if( NOT DEFINED MSGFMT_EXECUTABLE ) -+ find_program( MSGFMT_EXECUTABLE msgfmt ) -+ if( NOT MSGFMT_EXECUTABLE ) -+ tde_message_fatal( "msgfmt program is required, but was not found on your system" ) -+ endif( ) -+endif( ) -+ - - # required stuff - find_package( TQt ) diff --git a/redhat/applications/tdepowersave/trinity-cmake-translations.patch b/redhat/applications/tdepowersave/trinity-cmake-translations.patch deleted file mode 100644 index d97302ba3..000000000 --- a/redhat/applications/tdepowersave/trinity-cmake-translations.patch +++ /dev/null @@ -1,98 +0,0 @@ -diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake -index f290e2b..282b765 100644 ---- a/cmake/modules/TDEMacros.cmake -+++ b/cmake/modules/TDEMacros.cmake -@@ -1049,6 +1049,7 @@ macro( tde_create_translation ) - unset( _srcs ) - unset( _lang ) - unset( _dest ) -+ unset( _out_name ) - unset( _directive ) - unset( _var ) - -@@ -1075,6 +1076,13 @@ macro( tde_create_translation ) - set( _directive 1 ) - endif( ) - -+ # found directive "DESTINATION" -+ if( "${_arg}" STREQUAL "OUTPUT_NAME" ) -+ unset( _proj ) -+ set( _var _out_name ) -+ set( _directive 1 ) -+ endif( ) -+ - # collect data - if( _directive ) - unset( _directive ) -@@ -1088,30 +1096,60 @@ macro( tde_create_translation ) - tde_message_fatal( "MSGFMT_EXECUTABLE variable is not defined" ) - elseif( NOT _lang ) - tde_message_fatal( "missing LANG directive" ) -- elseif( NOT _dest ) -- set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) - endif( ) - - # if no file specified, include all *.po files - if( NOT _srcs ) - file( GLOB _srcs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.po ) -- endif() -+ endif( ) - if( NOT _srcs ) - tde_message_fatal( "no source files" ) -- endif() -+ endif( ) -+ -+ if( NOT _lang STREQUAL "auto") -+ set( _real_lang ${_lang} ) -+ -+ if( NOT _dest ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_lang}/LC_MESSAGES" ) -+ endif( ) -+ -+ # OUTPUT_NAME can only be used if we have only one file -+ list( LENGTH _srcs _srcs_num) -+ if( _out_name AND _srcs_num GREATER 1 ) -+ tde_message_fatal( "OUTPUT_NAME can be supplied only with single file or LANG=auto" ) -+ endif( ) -+ -+ elseif( NOT _out_name ) -+ tde_message_fatal( "LANG=auto reqires OUTPUT_NAME directive to be set" ) -+ elseif( _dest ) -+ tde_message_fatal( "DESTINATION cannot be used with LANG=auto" ) -+ endif( ) - - # generate *.mo files - foreach( _src ${_srcs} ) -+ - get_filename_component( _src ${_src} ABSOLUTE ) -- get_filename_component( _out ${_src} NAME_WE ) -- set( _out_name "${_out}-${_lang}.mo" ) -- set( _out_real_name "${_out}.mo" ) -+ -+ if( _out_name ) -+ set( _out ${_out_name} ) -+ if( _lang STREQUAL "auto" ) -+ get_filename_component( _real_lang ${_src} NAME_WE ) -+ set( _dest "${LOCALE_INSTALL_DIR}/${_real_lang}/LC_MESSAGES" ) -+ endif( ) -+ else( ) -+ get_filename_component( _out ${_src} NAME_WE ) -+ endif( ) -+ -+ set( _out_filename "${_out}-${_real_lang}.mo" ) -+ set( _install_filename "${_out}.mo" ) -+ - add_custom_command( -- OUTPUT ${_out_name} -- COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_name} -+ OUTPUT ${_out_filename} -+ COMMAND ${MSGFMT_EXECUTABLE} ${_src} -o ${_out_filename} - DEPENDS ${_src} ) -- add_custom_target( "${_out}-${_lang}-translation" ALL DEPENDS ${_out_name} ) -- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_name} RENAME ${_out_real_name} DESTINATION ${_dest} ) -+ add_custom_target( "${_out}-${_real_lang}-translation" ALL DEPENDS ${_out_filename} ) -+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/${_out_filename} RENAME ${_install_filename} DESTINATION ${_dest} ) -+ - endforeach( ) - - endmacro( ) diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 72a98a317..8e77efba1 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -8,6 +8,7 @@ grp='./genrpm.sh -v 14.0.0 -a' BUILDDIR="/dev/shm/BUILD${DIST}.$(uname -i)" BUILDROOTDIR="/dev/shm/BUILDROOT${DIST}.$(uname -i)" DIST="$(rpm -E %{dist})" +LIB="$(rpm -E %_lib)" if [ -x /usr/sbin/urpmi ]; then PKGMGR="urpmi" @@ -91,17 +92,26 @@ grpiud() { # TQT3 grpiud dependencies/tqt3 +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/libart-lgpl 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 @@ -135,10 +145,10 @@ grpiui tdeutils if ! is_installed trinity-desktop; then grpiu extras/trinity-desktop eval ${PKGINST} trinity-desktop || exit 1 - # Disable trinity repository from here !!! - if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then - sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" - fi +fi +# Disable trinity repository from here !!! +if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then + sudo sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" fi # devel packages @@ -149,10 +159,10 @@ if ! is_installed trinity-desktop-devel; then eval ${PKGINST} trinity-desktop-devel || exit 1 fi -# Extra libraries +# 3rd party libraries ## IMLIB1: required for kuickshow -if ! is_installed imlib1-devel; then +if ! is_installed imlib1-devel && ! is_installed imlib-devel; then grpiu 3rdparty/imlib1 eval ${PKGINST} imlib1-devel || exit 1 fi @@ -165,18 +175,42 @@ if [ "${DIST:0:4}" != ".mga" ]; then eval ${PKGINST} wv2-devel || exit 1 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 + ## TORSOCKS: required for tork if ! is_installed torsocks; then grpiu 3rdparty/torsocks eval ${PKGINST} torsocks || exit 1 fi -if [ "${DIST:0:4}" = ".oss" ]; then + +## PCSC-PERL: for smartcardauth +if [ "${DIST:0:4}" = ".oss" ] || [ "${DIST:0:3}" = ".el" ]; then if ! is_installed pcsc-perl; then grpiu 3rdparty/pcsc-perl eval ${PKGINST} pcsc-perl || exit 1 fi fi +## Lilypond: needed for rosegarden +if [ "${DIST}" = ".el6" ]; then + if ! is_installed mftrace; then + grpiu 3rdparty/mftrace + eval ${PKGINST} mftrace || exit 1 + fi + if ! is_installed lilypond; then + grpiu 3rdparty/lilypond + eval ${PKGINST} lilypond || exit 1 + fi +fi + # TDE libraries grpiud libraries/libkdcraw grpiud libraries/libkexiv2 @@ -220,7 +254,9 @@ grpiui applications/kcmldapcontroller grpiui applications/kcmldapmanager grpiui applications/kcpuload grpiui applications/kdbg -grpiui applications/kdbusnotification +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kdbusnotification +fi grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep @@ -228,11 +264,15 @@ grpiui applications/kerberostray #grpiui applications/kerry grpiui applications/kftpgrabber grpiui applications/kile -grpiui applications/kima +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kima +fi grpiui applications/kiosktool grpiui applications/kkbswitch grpiui applications/klcddimmer -grpiui applications/kmplayer +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kmplayer +fi grpiui applications/kmyfirewall grpiui applications/kmymoney grpiui applications/knemo @@ -249,7 +289,9 @@ fi grpiui applications/konversation grpiui applications/kopete-otr grpiui applications/kpicosim -grpiui applications/kpilot +if [ "${DIST}" != ".el4" ]; then + grpiui applications/kpilot +fi grpiui applications/krecipes grpiui applications/krename grpiui applications/krusader @@ -269,7 +311,9 @@ grpiui applications/kvpnc grpiui applications/mplayerthumbs grpiui applications/piklab grpiui applications/potracegui -grpiui applications/rosegarden +if [ "${DIST}" != ".el4" ] && [ "${DIST}" != ".el5" ]; then + grpiui applications/rosegarden +fi grpiui applications/smartcardauth grpiui applications/smb4k grpiui applications/soundkonverter @@ -277,6 +321,7 @@ grpiui applications/tde-guidance grpiui applications/tdeio-apt grpiui applications/tdeio-ftps grpiui applications/tdeio-locate +grpiui applications/tdeio-sword grpiui applications/tdeio-umountwrapper grpiui applications/tdenetworkmanager grpiui applications/tdepowersave @@ -284,7 +329,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/dependencies/libcaldav/libcaldav-14.0.0.spec b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec index 67b2d884c..904985358 100644 --- a/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec +++ b/redhat/dependencies/libcaldav/libcaldav-14.0.0.spec @@ -27,7 +27,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: libcaldav-14.0.0-older_libcurl.patch +#Patch1: libcaldav-14.0.0-older_libcurl.patch BuildRequires: libtool %if 0%{?rhel} == 4 @@ -75,7 +75,7 @@ Provides: libcaldav-devel = %{version}-%{release} %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .libcurl +#patch1 -p1 -b .libcurl ./autogen.sh diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch deleted file mode 100644 index 069111d3e..000000000 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip.ORI 2013-07-03 20:23:06.054830311 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/sip/qt/qobject.sip 2013-07-03 20:23:14.833911835 +0200 -@@ -2196,7 +2196,7 @@ - // See if it is a TQt signal. - if (*sig == '2') - { -- pyqt3TQtSignal *tab; -+ pyqt3QtSignal *tab; - - // Search the table. - for (tab = ((pyqt3ClassTypeDef *)((sipWrapperType *)(self->ob_type))->type)->qt3_emit; tab->st_name != NULL; ++tab) ---- trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py.ORI 2013-07-23 18:00:47.017942165 +0200 -+++ trinity-python-tqt-14.0.0~pre36+d3f27c3e/configure.py 2013-07-23 18:01:40.757575552 +0200 -@@ -321,6 +321,9 @@ - makefile.extra_include_dirs.append(qt_dir + "/src/3rdparty/zlib") - makefile.extra_include_dirs.append(os.path.join(src_dir, "pyuic3")) - -+ if not os.access("pyuic3", os.F_OK): -+ os.mkdir("pyuic3") -+ - makefile.generate() - tool_dirs.append("pyuic3") - -@@ -350,6 +353,9 @@ - - makefile.extra_include_dirs.append(os.path.join(src_dir, "pylupdate3")) - -+ if not os.access("pylupdate3", os.F_OK): -+ os.mkdir("pylupdate3") -+ - makefile.generate() - tool_dirs.append("pylupdate3") - elif qt_version >= 0x020000: diff --git a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec index f516327d7..9a564dc75 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -14,6 +14,7 @@ License: GPL Summary: TQt bindings for Python Group: System Environment/Libraries +Obsoletes: PyQt Obsoletes: trinity-PyQt Obsoletes: trinity-python-qt3 @@ -24,10 +25,9 @@ Prefix: %{tde_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: python-tqt-14.0.0-ftbfs.patch BuildRequires: gcc-c++ -BuildRequires: trinity-tqtinterface-devel >= %{version} +BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqscintilla-devel %if 0%{?rhel} || 0%{?fedora} @@ -140,7 +140,6 @@ packages based on them, like PyTDE. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 %build diff --git a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec index f16039020..f45e193a5 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -93,7 +93,6 @@ Requires: trinity-digikam Requires: trinity-dolphin Requires: trinity-filelight Requires: trinity-gwenview -Requires: trinity-gwenview-i18n Requires: trinity-k3b Requires: trinity-k9copy Requires: trinity-kaffeine @@ -168,6 +167,7 @@ Requires: trinity-tde-systemsettings Requires: trinity-tdeio-apt Requires: trinity-tdeio-ftps Requires: trinity-tdeio-locate +Requires: trinity-tdeio-sword Requires: trinity-tdeio-umountwrapper Requires: trinity-tdenetworkmanager Requires: trinity-tdepowersave @@ -204,6 +204,7 @@ Obsoletes: trinity-tde-guidance-powermanager # Debian/Ubuntu specific ... #Requires: trinity-adept +#Requires: trinity-gwenview-i18n # Beagle does not exist anymore, so Kerry is now useless. #Requires: trinity-kerry @@ -309,7 +310,7 @@ Summary: Default wallpaper for Trinity %__sed %{SOURCE0} \ -e 's/\$releasever/%{fedora}/g' \ -e 's/-fedora/-f%{fedora}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif # RHEL configuration for YUM @@ -317,10 +318,11 @@ Summary: Default wallpaper for Trinity %if 0%{?rhel} %__sed %{SOURCE1} \ -e 's/\$releasever/%{rhel}/g' \ - >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity-3.5.13.repo" + >"%{?buildroot}%{_sysconfdir}/yum.repos.d/trinity.repo" %endif %if 0%{?fedora} || 0%{?rhel} +%__sed -i %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo -e "s|3.5.13|r14|g" %__chmod 644 %{?buildroot}%{_sysconfdir}/yum.repos.d/*.repo %endif @@ -336,26 +338,5 @@ Summary: Default wallpaper for Trinity %endif %changelog -* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1 -- Update to version 3.5.13.2 -- Add GPG signing key - -* Mon Oct 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Update to version 3.5.13.1 - -* Mon Aug 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 -- Add 'applications' subpackage - -* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Updates to reflect new packages names -- Add Mageia 2 support -- Removes 'extras' packages - -* Wed Jun 06 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Enable mirrorlist - -* Wed Nov 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Fix repo files name and content - -* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Add 'repo' package +* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1 +- Initial build for TDE R14 diff --git a/redhat/tdeaddons/tdeaddons-14.0.0.spec b/redhat/tdeaddons/tdeaddons-14.0.0.spec index 5fe73356f..222d41f73 100644 --- a/redhat/tdeaddons/tdeaddons-14.0.0.spec +++ b/redhat/tdeaddons/tdeaddons-14.0.0.spec @@ -244,8 +244,8 @@ a tab bar, a Python browser and even more. Summary: Trinity file dialog plugins for text files and folders Group: Applications/Utilities -Obsoletes: trinity-kfile-plugins < %{version}-%{release} -Provides: trinity-kfile-plugins = %{version}-%{release} +Obsoletes: trinity-tdeaddons-kfile-plugins < %{version}-%{release} +Provides: trinity-tdeaddons-kfile-plugins = %{version}-%{release} %description tdefile-plugins This is a collection of plugins for the TDE file dialog. These plugins diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 1aa7230c3..c5deaff0e 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -389,6 +389,7 @@ BuildRequires: gnome-screensaver BuildRequires: %{_lib}xscrnsaver%{?mgaversion:1}-devel %endif %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?suse_version} >= 1220 +BuildRequires: xscreensaver BuildRequires: libXScrnSaver-devel %endif %if 0%{?suse_version} == 1140 @@ -544,9 +545,6 @@ Requires: openssl # RHEL 6 Configuration files are provided in separate packages %if 0%{?rhel} || 0%{?fedora} -%if "%{?tde_prefix}" == "/usr" -Requires: kde-settings-kdm -%endif Requires: redhat-menus %endif @@ -3337,20 +3335,22 @@ cd build -DSYSCONF_INSTALL_DIR="%{_sysconfdir}/trinity" \ -DXDG_MENU_INSTALL_DIR="%{_sysconfdir}/xdg/menus" \ \ + -DWITH_ALL_OPTIONS=ON \ -DWITH_SASL=ON \ -DWITH_LDAP=ON \ -DWITH_SAMBA=ON \ - %{?with_exr:-DWITH_OPENEXR=ON} \ + %{?!with_exr:-DWITH_OPENEXR=OFF} \ -DWITH_XCOMPOSITE=ON \ -DWITH_XCURSOR=ON \ -DWITH_XFIXES=ON \ - %{?with_xrandr:-DWITH_XRANDR=ON} \ + %{?!with_xrandr:-DWITH_XRANDR=OFF} \ -DWITH_XRENDER=ON \ -DWITH_XDAMAGE=ON \ -DWITH_XEXT=ON \ - %{?with_xtest:-DWITH_XTEST=ON} \ - %{?with_xscreensaver:-DWITH_XSCREENSAVER=ON} \ - %{?with_libart:-DWITH_LIBART=ON} \ + %{?!with_xtest:-DWITH_XTEST=OFF} \ + -DWITH_OPENGL=ON \ + %{?!with_xscreensaver:-DWITH_XSCREENSAVER=OFF} \ + %{?!with_libart:-DWITH_LIBART=OFF} \ -DWITH_LIBUSB=ON \ -DWITH_LIBRAW1394=ON \ -DWITH_SUDO_TDESU_BACKEND=OFF \ @@ -3360,11 +3360,12 @@ cd build -DWITH_XINERAMA=ON \ -DWITH_ARTS=ON \ -DWITH_I8K=ON \ - %{?with_hal:-DWITH_HAL=ON} \ + -DWITH_SENSORS=ON \ + -DWITH_HAL=OFF \ -DWITH_TDEHWLIB=ON \ -DWITH_UPOWER=ON \ -DWITH_GCC_VISIBILITY=ON \ - -DWITH_KDESKTOP_LOCK_BACKTRACE=OFF \ + \ -DBUILD_ALL=ON \ %if 0%{?suse_version} -DKCHECKPASS_PAM_SERVICE="xdm" \ @@ -3396,10 +3397,6 @@ cd build %__install -D -m 644 \ "%{?buildroot}%{tde_datadir}/apps/tdm/sessions/tde.desktop" \ "%{?buildroot}%{_datadir}/xsessions/tde.desktop" - -# Force session name to be 'TDE' -%__sed -i "%{?buildroot}%{_datadir}/xsessions/tde.desktop" \ - -e "s,^Name=.*,Name=TDE," %endif # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora @@ -3435,7 +3432,7 @@ EOF # TDM configuration %__sed -i "%{?buildroot}%{_sysconfdir}/trinity/tdm/tdmrc" \ -%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1220 +%if 0%{?fedora} >= 16 || 0%{?suse_version} >= 1210 -e "s/^#*MinShowUID=.*/MinShowUID=1000/" %else -e "s/^#*MinShowUID=.*/MinShowUID=500/" @@ -3455,9 +3452,9 @@ EOF %__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' -%if 0%{?suse_version} +%if 0%{?suse_version} >= 1210 %__install -D -m 644 "%{SOURCE6}" "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" %__sed -i "%{?buildroot}/usr/lib/X11/displaymanagers/tdm" -e "s|/opt/trinity/bin|%{tde_bindir}|g" %endif diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 2d2405e8d..5701a1e14 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -54,8 +54,6 @@ Source2: ktalk # RedHat/Fedora legacy patches Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch # [kdenetwork] Missing LDFLAGS cause FTBFS Patch1: kdenetwork-3.5.13-missing_ldflags.patch @@ -1078,7 +1076,6 @@ update-desktop-database 2> /dev/null || : %patch1 -p1 -b .ldflags %patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd %if 0%{?rhel} == 4 %patch201 -p1 -b .rhel4 |