From d44674e47ffbec1a8ffa9126ee923d2dce143c3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Thu, 12 Jun 2014 22:42:13 +0200 Subject: RPM packaging: update packages --- redhat/applications/knoda/trinity-knoda.spec | 486 --------------------- redhat/extras/knoda/trinity-knoda.spec | 486 +++++++++++++++++++++ .../tdebase/tdebase-14.0.0-fix_starttde_trap.patch | 11 - .../tdebase-14.0.0-kcontrol_menu_entry.patch | 20 - .../tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch | 45 -- redhat/tdebase/tdebase-14.0.0.spec | 6 - .../tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch | 150 ------- redhat/tdelibs/tdelibs-14.0.0.spec | 2 - 8 files changed, 486 insertions(+), 720 deletions(-) delete mode 100644 redhat/applications/knoda/trinity-knoda.spec create mode 100644 redhat/extras/knoda/trinity-knoda.spec delete mode 100644 redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch delete mode 100644 redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch delete mode 100644 redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch delete mode 100644 redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch diff --git a/redhat/applications/knoda/trinity-knoda.spec b/redhat/applications/knoda/trinity-knoda.spec deleted file mode 100644 index 9b4ef2c77..000000000 --- a/redhat/applications/knoda/trinity-knoda.spec +++ /dev/null @@ -1,486 +0,0 @@ -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -bakus/abakus-14.0.0.spec -%if "%{?tde_prefix}" != "/usr" -bakus/abakus-14.0.0.spec -%define _variant .opt -bakus/abakus-14.0.0.spec -%endif -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -# TDE 3.5.13 specific building variables -bakus/abakus-14.0.0.spec -%define tde_bindir %{tde_prefix}/bin -bakus/abakus-14.0.0.spec -%define tde_datadir %{tde_prefix}/share -bakus/abakus-14.0.0.spec -%define tde_docdir %{tde_datadir}/doc -bakus/abakus-14.0.0.spec -%define tde_includedir %{tde_prefix}/include -bakus/abakus-14.0.0.spec -%define tde_libdir %{tde_prefix}/%{_lib} -bakus/abakus-14.0.0.spec -%define tde_mandir %{tde_datadir}/man -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%define tde_tdeappdir %{tde_datadir}/applications/kde -bakus/abakus-14.0.0.spec -%define tde_tdedocdir %{tde_docdir}/tde -bakus/abakus-14.0.0.spec -%define tde_tdeincludedir %{tde_includedir}/tde -bakus/abakus-14.0.0.spec -%define tde_tdelibdir %{tde_libdir}/trinity -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%define _docdir %{tde_docdir} -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -Name: trinity-knoda -bakus/abakus-14.0.0.spec -Version: 0.8.3 -bakus/abakus-14.0.0.spec -Release: 1%{?dist}%{?_variant} -bakus/abakus-14.0.0.spec -Summary: A database frontend for TDE. -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -Group: Applications/Productivity -bakus/abakus-14.0.0.spec -License: GPLv2+ -bakus/abakus-14.0.0.spec -URL: http://sourceforge.net/projects/knoda/ -bakus/abakus-14.0.0.spec -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.bz2 -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -Patch1: knoda-0.8.3-trinity.patch -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -BuildRequires: desktop-file-utils -bakus/abakus-14.0.0.spec -BuildRequires: trinity-tdelibs-devel -bakus/abakus-14.0.0.spec -BuildRequires: hk_classes-devel -bakus/abakus-14.0.0.spec -Requires: hk_classes -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%description -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%package devel -bakus/abakus-14.0.0.spec -Summary: Development files for %{name} -bakus/abakus-14.0.0.spec -Group: Development/Libraries -bakus/abakus-14.0.0.spec -Requires: %{name} = %{version}-%{release} -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%description devel -bakus/abakus-14.0.0.spec -%{summary} -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%if 0%{?suse_version} -bakus/abakus-14.0.0.spec -%debug_package -bakus/abakus-14.0.0.spec -%endif -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%prep -bakus/abakus-14.0.0.spec -%setup -q -n knoda-%{version} -bakus/abakus-14.0.0.spec -%patch1 -p1 -b .trinity -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -# Ugly hack to modify TQT include directory inside autoconf files. -bakus/abakus-14.0.0.spec -# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! -bakus/abakus-14.0.0.spec -%__sed -i admin/acinclude.m4.in \ -bakus/abakus-14.0.0.spec - -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ -bakus/abakus-14.0.0.spec - -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -bakus/abakus-14.0.0.spec -%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" -bakus/abakus-14.0.0.spec -%__make -f "admin/Makefile.common" -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%build -bakus/abakus-14.0.0.spec -unset QTDIR; . /etc/profile.d/qt3.sh -bakus/abakus-14.0.0.spec -export PATH="%{tde_bindir}:${PATH}" -bakus/abakus-14.0.0.spec -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -export KDEDIR="%{tde_prefix}" -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%configure \ -bakus/abakus-14.0.0.spec - --prefix=%{tde_prefix} \ -bakus/abakus-14.0.0.spec - --exec-prefix=%{tde_prefix} \ -bakus/abakus-14.0.0.spec - --disable-dependency-tracking \ -bakus/abakus-14.0.0.spec - --disable-rpath \ -bakus/abakus-14.0.0.spec - --with-extra-includes=%{tde_includedir}/tqt \ -bakus/abakus-14.0.0.spec - --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \ -bakus/abakus-14.0.0.spec - --bindir=%{tde_bindir} \ -bakus/abakus-14.0.0.spec - --libdir=%{tde_libdir} \ -bakus/abakus-14.0.0.spec - --datadir=%{tde_datadir} \ -bakus/abakus-14.0.0.spec - --includedir=%{tde_tdeincludedir} -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%__make %{?_smp_mflags} LIBTOOL=$(which libtool) -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%install -bakus/abakus-14.0.0.spec -%__rm -rf $RPM_BUILD_ROOT -bakus/abakus-14.0.0.spec -%__make install DESTDIR=$RPM_BUILD_ROOT -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -# Useless files .. -bakus/abakus-14.0.0.spec -%__rm -f %{?buildroot}%{tde_libdir}/*.a -bakus/abakus-14.0.0.spec -%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%find_lang knoda -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%clean -bakus/abakus-14.0.0.spec -%__rm -rf $RPM_BUILD_ROOT -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%post -bakus/abakus-14.0.0.spec -for i in hicolor locolor ; do -bakus/abakus-14.0.0.spec - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : -bakus/abakus-14.0.0.spec - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -bakus/abakus-14.0.0.spec -done -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%postun -bakus/abakus-14.0.0.spec -for i in hicolor locolor ; do -bakus/abakus-14.0.0.spec - touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : -bakus/abakus-14.0.0.spec - gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : -bakus/abakus-14.0.0.spec -done -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%files -f knoda.lang -bakus/abakus-14.0.0.spec -%defattr(-,root,root,-) -bakus/abakus-14.0.0.spec -%doc AUTHORS COPYING README ChangeLog -bakus/abakus-14.0.0.spec -%{tde_bindir}/knoda -bakus/abakus-14.0.0.spec -%{tde_bindir}/knoda-rt -bakus/abakus-14.0.0.spec -%{tde_libdir}/libhk_kdeclasses.la -bakus/abakus-14.0.0.spec -%{tde_libdir}/libhk_kdeclasses.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdedbdesignerpart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdedbdesignerpart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdeformpart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdeformpart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdegridpart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdegridpart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdemodulepart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdemodulepart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdeqbepart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdeqbepart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdequerypart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdequerypart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdereportpart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdereportpart.so -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdetablepart.la -bakus/abakus-14.0.0.spec -%{tde_tdelibdir}/libhk_kdetablepart.so -bakus/abakus-14.0.0.spec -%{tde_datadir}/applnk/Office/knoda.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/apps/hk_kdeclasses/ -bakus/abakus-14.0.0.spec -%{tde_datadir}/apps/knoda/ -bakus/abakus-14.0.0.spec -%{tde_datadir}/config/magic/hk_classes.magic -bakus/abakus-14.0.0.spec -%{tde_tdedocdir}/HTML/en/knoda/ -bakus/abakus-14.0.0.spec -%{tde_datadir}/icons/hicolor/*/apps/knoda.png -bakus/abakus-14.0.0.spec -%{tde_datadir}/icons/locolor/*/apps/knoda.png -bakus/abakus-14.0.0.spec -%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite2.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite3.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/mimelnk/application/x-hk_connection.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/mimelnk/application/x-paradox.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/mimelnk/application/x-xbase.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdedbdesignerpart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdeformpart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdegridpart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdemodulepart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdeqbepart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdequerypart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdereportpart.desktop -bakus/abakus-14.0.0.spec -%{tde_datadir}/services/hk_kdetablepart.desktop -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%files devel -bakus/abakus-14.0.0.spec -%defattr(-,root,root,-) -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeboolean.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdebutton.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdecolumn.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdecombobox.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdecsvexportdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdecsvimportdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdecsvimportdialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedatasource.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedate.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedbdesignerpart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedbdesignerpartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedblistview.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdedriverdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdefilterdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdefilterdialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdefinddialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdefinddialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeform.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformdatasourcedialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformdatasourcedialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformfocus.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformpart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformpartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeformpartwidget.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdegrid.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdegridcolumndialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdegridcolumndialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdegridpart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdegridpartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeimage.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeindexeditwindow.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeinterpreterdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdelabel.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdelineedit.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdememo.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdemessages.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdemodule.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdemodulepart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdemodulepartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdenewpassworddialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdenewpassworddialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdepassworddialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeproperty.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdepropertybase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeqbe.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeqbepart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdeqbepartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdequery.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdequerypart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdequerypartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdequerypartwidget.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereport.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportdata.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportpart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportpartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportpartwidget.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportproperty.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportpropertybase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportsection.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportsectiondialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdereportsectiondialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kderowselector.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesimpleform.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesimplegrid.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesimplereport.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesubform.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesubreportdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdesubreportdialogbase.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetable.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetabledesign.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetablepart.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetablepartfactory.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetablepartwidget.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdetoolbar.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdexmlexportdialog.h -bakus/abakus-14.0.0.spec -%{tde_tdeincludedir}/hk_kdexmlexportdialogbase.h -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec - -bakus/abakus-14.0.0.spec -%changelog -bakus/abakus-14.0.0.spec -* Mon Apr 08 2013 Francois Andriot - 0.5b-1 -bakus/abakus-14.0.0.spec -- Initial release for TDE 3.5.13.2 -bakus/abakus-14.0.0.spec diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec new file mode 100644 index 000000000..9b4ef2c77 --- /dev/null +++ b/redhat/extras/knoda/trinity-knoda.spec @@ -0,0 +1,486 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +bakus/abakus-14.0.0.spec +%if "%{?tde_prefix}" != "/usr" +bakus/abakus-14.0.0.spec +%define _variant .opt +bakus/abakus-14.0.0.spec +%endif +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +# TDE 3.5.13 specific building variables +bakus/abakus-14.0.0.spec +%define tde_bindir %{tde_prefix}/bin +bakus/abakus-14.0.0.spec +%define tde_datadir %{tde_prefix}/share +bakus/abakus-14.0.0.spec +%define tde_docdir %{tde_datadir}/doc +bakus/abakus-14.0.0.spec +%define tde_includedir %{tde_prefix}/include +bakus/abakus-14.0.0.spec +%define tde_libdir %{tde_prefix}/%{_lib} +bakus/abakus-14.0.0.spec +%define tde_mandir %{tde_datadir}/man +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%define tde_tdeappdir %{tde_datadir}/applications/kde +bakus/abakus-14.0.0.spec +%define tde_tdedocdir %{tde_docdir}/tde +bakus/abakus-14.0.0.spec +%define tde_tdeincludedir %{tde_includedir}/tde +bakus/abakus-14.0.0.spec +%define tde_tdelibdir %{tde_libdir}/trinity +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%define _docdir %{tde_docdir} +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +Name: trinity-knoda +bakus/abakus-14.0.0.spec +Version: 0.8.3 +bakus/abakus-14.0.0.spec +Release: 1%{?dist}%{?_variant} +bakus/abakus-14.0.0.spec +Summary: A database frontend for TDE. +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +Group: Applications/Productivity +bakus/abakus-14.0.0.spec +License: GPLv2+ +bakus/abakus-14.0.0.spec +URL: http://sourceforge.net/projects/knoda/ +bakus/abakus-14.0.0.spec +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +Source0: http://downloads.sourceforge.net/project/knoda/knoda/0.8.3/knoda-0.8.3.tar.bz2 +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +Patch1: knoda-0.8.3-trinity.patch +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +BuildRequires: desktop-file-utils +bakus/abakus-14.0.0.spec +BuildRequires: trinity-tdelibs-devel +bakus/abakus-14.0.0.spec +BuildRequires: hk_classes-devel +bakus/abakus-14.0.0.spec +Requires: hk_classes +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%description +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%package devel +bakus/abakus-14.0.0.spec +Summary: Development files for %{name} +bakus/abakus-14.0.0.spec +Group: Development/Libraries +bakus/abakus-14.0.0.spec +Requires: %{name} = %{version}-%{release} +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%description devel +bakus/abakus-14.0.0.spec +%{summary} +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%if 0%{?suse_version} +bakus/abakus-14.0.0.spec +%debug_package +bakus/abakus-14.0.0.spec +%endif +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%prep +bakus/abakus-14.0.0.spec +%setup -q -n knoda-%{version} +bakus/abakus-14.0.0.spec +%patch1 -p1 -b .trinity +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +# Ugly hack to modify TQT include directory inside autoconf files. +bakus/abakus-14.0.0.spec +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +bakus/abakus-14.0.0.spec +%__sed -i admin/acinclude.m4.in \ +bakus/abakus-14.0.0.spec + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ +bakus/abakus-14.0.0.spec + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +bakus/abakus-14.0.0.spec +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" +bakus/abakus-14.0.0.spec +%__make -f "admin/Makefile.common" +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%build +bakus/abakus-14.0.0.spec +unset QTDIR; . /etc/profile.d/qt3.sh +bakus/abakus-14.0.0.spec +export PATH="%{tde_bindir}:${PATH}" +bakus/abakus-14.0.0.spec +export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +export KDEDIR="%{tde_prefix}" +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%configure \ +bakus/abakus-14.0.0.spec + --prefix=%{tde_prefix} \ +bakus/abakus-14.0.0.spec + --exec-prefix=%{tde_prefix} \ +bakus/abakus-14.0.0.spec + --disable-dependency-tracking \ +bakus/abakus-14.0.0.spec + --disable-rpath \ +bakus/abakus-14.0.0.spec + --with-extra-includes=%{tde_includedir}/tqt \ +bakus/abakus-14.0.0.spec + --with-qt-libraries=${QTLIB:-${QTDIR}/%{_lib}} \ +bakus/abakus-14.0.0.spec + --bindir=%{tde_bindir} \ +bakus/abakus-14.0.0.spec + --libdir=%{tde_libdir} \ +bakus/abakus-14.0.0.spec + --datadir=%{tde_datadir} \ +bakus/abakus-14.0.0.spec + --includedir=%{tde_tdeincludedir} +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%install +bakus/abakus-14.0.0.spec +%__rm -rf $RPM_BUILD_ROOT +bakus/abakus-14.0.0.spec +%__make install DESTDIR=$RPM_BUILD_ROOT +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +# Useless files .. +bakus/abakus-14.0.0.spec +%__rm -f %{?buildroot}%{tde_libdir}/*.a +bakus/abakus-14.0.0.spec +%__rm -f %{?buildroot}%{tde_tdelibdir}/*.a +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%find_lang knoda +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%clean +bakus/abakus-14.0.0.spec +%__rm -rf $RPM_BUILD_ROOT +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%post +bakus/abakus-14.0.0.spec +for i in hicolor locolor ; do +bakus/abakus-14.0.0.spec + touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : +bakus/abakus-14.0.0.spec + gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : +bakus/abakus-14.0.0.spec +done +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%postun +bakus/abakus-14.0.0.spec +for i in hicolor locolor ; do +bakus/abakus-14.0.0.spec + touch --no-create %{tde_datadir}/icons/$i 2>/dev/null || : +bakus/abakus-14.0.0.spec + gtk-update-icon-cache --quiet %{tde_datadir}/icons/$i 2>/dev/null || : +bakus/abakus-14.0.0.spec +done +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%files -f knoda.lang +bakus/abakus-14.0.0.spec +%defattr(-,root,root,-) +bakus/abakus-14.0.0.spec +%doc AUTHORS COPYING README ChangeLog +bakus/abakus-14.0.0.spec +%{tde_bindir}/knoda +bakus/abakus-14.0.0.spec +%{tde_bindir}/knoda-rt +bakus/abakus-14.0.0.spec +%{tde_libdir}/libhk_kdeclasses.la +bakus/abakus-14.0.0.spec +%{tde_libdir}/libhk_kdeclasses.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdedbdesignerpart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdedbdesignerpart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdeformpart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdeformpart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdegridpart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdegridpart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdemodulepart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdemodulepart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdeqbepart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdeqbepart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdequerypart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdequerypart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdereportpart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdereportpart.so +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdetablepart.la +bakus/abakus-14.0.0.spec +%{tde_tdelibdir}/libhk_kdetablepart.so +bakus/abakus-14.0.0.spec +%{tde_datadir}/applnk/Office/knoda.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/apps/hk_kdeclasses/ +bakus/abakus-14.0.0.spec +%{tde_datadir}/apps/knoda/ +bakus/abakus-14.0.0.spec +%{tde_datadir}/config/magic/hk_classes.magic +bakus/abakus-14.0.0.spec +%{tde_tdedocdir}/HTML/en/knoda/ +bakus/abakus-14.0.0.spec +%{tde_datadir}/icons/hicolor/*/apps/knoda.png +bakus/abakus-14.0.0.spec +%{tde_datadir}/icons/locolor/*/apps/knoda.png +bakus/abakus-14.0.0.spec +%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite2.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/mimelnk/application/x-hk_classes-sqlite3.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/mimelnk/application/x-hk_connection.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/mimelnk/application/x-paradox.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/mimelnk/application/x-xbase.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdedbdesignerpart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdeformpart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdegridpart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdemodulepart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdeqbepart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdequerypart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdereportpart.desktop +bakus/abakus-14.0.0.spec +%{tde_datadir}/services/hk_kdetablepart.desktop +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%files devel +bakus/abakus-14.0.0.spec +%defattr(-,root,root,-) +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeboolean.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdebutton.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdecolumn.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdecombobox.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdecsvexportdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdecsvimportdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdecsvimportdialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedatasource.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedate.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedbdesignerpart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedbdesignerpartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedblistview.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdedriverdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdefilterdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdefilterdialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdefinddialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdefinddialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeform.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformdatasourcedialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformdatasourcedialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformfocus.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformpart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformpartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeformpartwidget.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdegrid.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdegridcolumndialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdegridcolumndialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdegridpart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdegridpartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeimage.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeindexeditwindow.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeinterpreterdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdelabel.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdelineedit.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdememo.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdemessages.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdemodule.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdemodulepart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdemodulepartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdenewpassworddialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdenewpassworddialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdepassworddialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeproperty.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdepropertybase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeqbe.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeqbepart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdeqbepartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdequery.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdequerypart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdequerypartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdequerypartwidget.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereport.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportdata.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportpart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportpartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportpartwidget.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportproperty.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportpropertybase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportsection.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportsectiondialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdereportsectiondialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kderowselector.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesimpleform.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesimplegrid.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesimplereport.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesubform.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesubreportdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdesubreportdialogbase.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetable.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetabledesign.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetablepart.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetablepartfactory.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetablepartwidget.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdetoolbar.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdexmlexportdialog.h +bakus/abakus-14.0.0.spec +%{tde_tdeincludedir}/hk_kdexmlexportdialogbase.h +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec + +bakus/abakus-14.0.0.spec +%changelog +bakus/abakus-14.0.0.spec +* Mon Apr 08 2013 Francois Andriot - 0.5b-1 +bakus/abakus-14.0.0.spec +- Initial release for TDE 3.5.13.2 +bakus/abakus-14.0.0.spec diff --git a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch b/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch deleted file mode 100644 index fb50a6d6f..000000000 --- a/redhat/tdebase/tdebase-14.0.0-fix_starttde_trap.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tdebase/starttde.ORI 2014-04-20 18:05:28.820084805 +0200 -+++ tdebase/starttde 2014-04-20 18:06:08.059237113 +0200 -@@ -81,7 +81,7 @@ - - # When the X server dies we get a HUP signal from xinit. We must ignore it - # because we still need to do some cleanup. --trap '[starttde] echo GOT SIGHUP' HUP -+trap 'echo "[starttde] GOT SIGHUP"' HUP - - # Check if a TDE session is already running. - if kcheckrunning >/dev/null 2>&1; then diff --git a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch b/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch deleted file mode 100644 index 0d73de5a4..000000000 --- a/redhat/tdebase/tdebase-14.0.0-kcontrol_menu_entry.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- ./kcontrol/kcontrol/KControl.desktop~ 2013-01-09 02:12:13.000000000 +0100 -+++ ./kcontrol/kcontrol/KControl.desktop 2013-05-08 17:55:54.250733219 +0200 -@@ -5,7 +5,7 @@ - DocPath=kcontrol/index.html - X-TDE-StartupNotify=true - --Name=Control Center -+Name=Trinity Control Center - Name[af]=Beheer Sentrum - Name[ar]=مركز التحكم - Name[az]=İdarə Mərkəzi -@@ -28,7 +28,7 @@ - Name[eu]=Kontrol gunea - Name[fa]=مرکز کنترل - Name[fi]=Ohjauskeskus --Name[fr]=Centre de configuration de TDE -+Name[fr]=Centre de configuration de Trinity - Name[fy]=Konfiguraasjesintrum - Name[ga]=Lárionad Rialaithe - Name[gl]=Centro de Control diff --git a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch b/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch deleted file mode 100644 index 0a692c42b..000000000 --- a/redhat/tdebase/tdebase-14.0.0-kickoff_xdg_dirs.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- ./kicker/kicker/ui/k_new_mnu.cpp.ori 2013-05-08 21:56:01.084691260 +0200 -+++ ./kicker/kicker/ui/k_new_mnu.cpp 2013-05-08 21:58:02.086130445 +0200 -@@ -1428,6 +1428,42 @@ - m_systemView->insertItem( "folder_man", i18n( "My Documents" ), documentPath, documentPath, nId++, index++ ); - } - -+ if ( TDEStandardDirs::exists( TDEGlobalSettings::picturesPath() + "/" ) ) -+ { -+ TQString picturesPath = TDEGlobalSettings::picturesPath(); -+ if ( picturesPath.endsWith( "/" ) ) -+ picturesPath = picturesPath.left( picturesPath.length() - 1 ); -+ if (picturesPath!=TQDir::homeDirPath()) -+ m_systemView->insertItem( "folder_image", i18n( "My Images" ), picturesPath, picturesPath, nId++, index++ ); -+ } -+ -+ if ( TDEStandardDirs::exists( TDEGlobalSettings::musicPath() + "/" ) ) -+ { -+ TQString musicPath = TDEGlobalSettings::musicPath(); -+ if ( musicPath.endsWith( "/" ) ) -+ musicPath = musicPath.left( musicPath.length() - 1 ); -+ if (musicPath!=TQDir::homeDirPath()) -+ m_systemView->insertItem( "folder_sound", i18n( "My Music" ), musicPath, musicPath, nId++, index++ ); -+ } -+ -+ if ( TDEStandardDirs::exists( TDEGlobalSettings::videosPath() + "/" ) ) -+ { -+ TQString videosPath = TDEGlobalSettings::videosPath(); -+ if ( videosPath.endsWith( "/" ) ) -+ videosPath = videosPath.left( videosPath.length() - 1 ); -+ if (videosPath!=TQDir::homeDirPath()) -+ m_systemView->insertItem( "folder_video", i18n( "My Videos" ), videosPath, videosPath, nId++, index++ ); -+ } -+ -+ if ( TDEStandardDirs::exists( TDEGlobalSettings::downloadPath() + "/" ) ) -+ { -+ TQString downloadPath = TDEGlobalSettings::downloadPath(); -+ if ( downloadPath.endsWith( "/" ) ) -+ downloadPath = downloadPath.left( downloadPath.length() - 1 ); -+ if (downloadPath!=TQDir::homeDirPath()) -+ m_systemView->insertItem( "folder_inbox", i18n( "My Downloads" ), downloadPath, downloadPath, nId++, index++ ); -+ } -+ - m_systemView->insertItem( "network", i18n( "Network Folders" ), - "remote:/", "remote:/", nId++, index++ ); - diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 0f92dad16..32e461e56 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -82,7 +82,6 @@ Source9: mgabutton.svg %endif # Patch party ! -#Patch0: tdebase-14.0.0-ftbfs.patch # Permanent patches, all TDE versions ## [tdebase/kdesktop] Modifies 'open terminal here' on desktop [RHEL/Fedora] @@ -98,9 +97,7 @@ Patch105: tdebase-14.0.0-konsole_wordseps.patch # Patches from Mandriva Patch201: tdebase-14.0.0-vibrate_dialog.patch -Patch202: tdebase-14.0.0-kcontrol_menu_entry.patch Patch203: tdebase-14.0.0-kdesktop_crossfade.patch -Patch204: tdebase-14.0.0-kickoff_xdg_dirs.patch Patch205: tdebase-14.0.0-suspend_unmount.patch Patch206: tdebase-14.0.0-bookmark_global_copy.patch @@ -3333,7 +3330,6 @@ Windows and Samba shares. %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -#patch0 -p1 -b .ftbfs %patch101 -p1 -b .openterminalhere %patch102 -p1 -b .startmenuicon @@ -3341,9 +3337,7 @@ Windows and Samba shares. %patch105 -p1 -b .konsolewordseps %patch201 -p1 -b .vibrate_dialog -%patch202 -p1 -b .kcontrol_menu_entry %patch203 -p1 -b .kdesktop_crossfade -%patch204 -p1 -b .kickoff_xdg %patch205 -p1 -b .suspend_unmount %patch206 -p1 -b .bookmark_global_copy diff --git a/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch b/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch deleted file mode 100644 index f32dec25b..000000000 --- a/redhat/tdelibs/tdelibs-14.0.0-xdg_dirs_set_path.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- ./tdecore/tdeglobalsettings.h.Ori 2013-05-08 22:16:42.771982104 +0200 -+++ ./tdecore/tdeglobalsettings.h 2013-05-08 22:18:33.882577602 +0200 -@@ -253,6 +253,29 @@ - */ - static TQString documentPath() { initStatic(); return *s_documentPath; } - -+ /** -+ * The path where documents are stored of the current user. -+ * @return the path of the videos directory -+ */ -+ static TQString videosPath() { initStatic(); return *s_videosPath; } -+ -+ /** -+ * The path where documents are stored of the current user. -+ * @return the path of the music directory -+ */ -+ static TQString musicPath() { initStatic(); return *s_musicPath; } -+ -+ /** -+ * The path where documents are stored of the current user. -+ * @return the path of the downloads directory -+ */ -+ static TQString downloadPath() { initStatic(); return *s_downloadPath; } -+ -+ /** -+ * The path where documents are stored of the current user. -+ * @return the path of the pictures directory -+ */ -+ static TQString picturesPath() { initStatic(); return *s_picturesPath; } - - /** - * The default color to use when highlighting toolbar buttons. -@@ -560,6 +583,10 @@ - static TQString* s_autostartPath; - static TQString* s_trashPath; - static TQString* s_documentPath; -+ static TQString* s_picturesPath; -+ static TQString* s_downloadPath; -+ static TQString* s_musicPath; -+ static TQString* s_videosPath; - static TQFont *_generalFont; - static TQFont *_fixedFont; - static TQFont *_toolBarFont; ---- ./tdecore/tdeglobalsettings.cpp.xdg_path 2013-01-09 19:23:09.000000000 +0100 -+++ ./tdecore/tdeglobalsettings.cpp 2013-05-08 22:26:26.451376166 +0200 -@@ -62,6 +62,10 @@ - TQString* TDEGlobalSettings::s_autostartPath = 0; - TQString* TDEGlobalSettings::s_trashPath = 0; - TQString* TDEGlobalSettings::s_documentPath = 0; -+TQString* TDEGlobalSettings::s_videosPath = 0; -+TQString* TDEGlobalSettings::s_musicPath = 0; -+TQString* TDEGlobalSettings::s_downloadPath = 0; -+TQString* TDEGlobalSettings::s_picturesPath = 0; - TQFont *TDEGlobalSettings::_generalFont = 0; - TQFont *TDEGlobalSettings::_fixedFont = 0; - TQFont *TDEGlobalSettings::_toolBarFont = 0; -@@ -83,7 +87,7 @@ - - // helper function for reading xdg user dirs: it is required in order to take - // care of locale stuff --void readXdgUserDirs(TQString *desktop, TQString *documents) -+void readXdgUserDirs(TQString *desktop, TQString *documents, TQString *videos, TQString *music, TQString *download, TQString *pictures) - { - TQFile f( TQDir::homeDirPath() + "/.config/user-dirs.dirs" ); - -@@ -101,6 +105,14 @@ - *desktop = line.remove("XDG_DESKTOP_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); - else if (line.startsWith("XDG_DOCUMENTS_DIR=")) - *documents = line.remove("XDG_DOCUMENTS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); -+ else if (line.startsWith("XDG_MUSIC_DIR=")) -+ *videos = line.remove("XDG_MUSIC_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); -+ else if (line.startsWith("XDG_DOWNLOAD_DIR=")) -+ *download = line.remove("XDG_DOWNLOAD_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); -+ else if (line.startsWith("XDG_VIDEOS_DIR=")) -+ *music = line.remove("XDG_VIDEOS_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); -+ else if (line.startsWith("XDG_PICTURES_DIR=")) -+ *pictures = line.remove("XDG_PICTURES_DIR=").remove("\"").replace("$HOME", TQDir::homeDirPath()); - - line = s.readLine(); - } -@@ -515,30 +527,45 @@ - s_autostartPath = new TQString(); - s_trashPath = new TQString(); - s_documentPath = new TQString(); -+ s_videosPath = new TQString(); -+ s_musicPath = new TQString(); -+ s_downloadPath = new TQString(); -+ s_picturesPath = new TQString(); -+ - - TDEConfigGroup g( TDEGlobal::config(), "Paths" ); - -- // Read desktop and documents path using XDG_USER_DIRS -- readXdgUserDirs(s_desktopPath, s_documentPath); -+ // Read desktop and documents path using XDG_USER_DIRS -+ readXdgUserDirs(s_desktopPath, s_documentPath, s_musicPath, s_videosPath, s_downloadPath, s_picturesPath); - - if (s_desktopPath->isEmpty() == true) { - *s_desktopPath = TQDir::homeDirPath() + "/Desktop/"; - } -+ - *s_desktopPath = TQDir::cleanDirPath( *s_desktopPath ); - if ( !s_desktopPath->endsWith("/") ) - s_desktopPath->append('/'); - -- if (s_documentPath->isEmpty() == true) { --#ifdef Q_WS_WIN -- *s_documentPath = getWin32ShellFoldersPath("Personal"); --#else -- *s_documentPath = TQDir::homeDirPath() + "/Documents/"; --#endif -- } - *s_documentPath = TQDir::cleanDirPath( *s_documentPath ); - if ( !s_documentPath->endsWith("/")) - s_documentPath->append('/'); - -+ *s_musicPath = TQDir::cleanDirPath( *s_musicPath ); -+ if ( !s_musicPath->endsWith("/")) -+ s_musicPath->append('/'); -+ -+ *s_videosPath = TQDir::cleanDirPath( *s_videosPath ); -+ if ( !s_videosPath->endsWith("/")) -+ s_videosPath->append('/'); -+ -+ *s_downloadPath = TQDir::cleanDirPath( *s_downloadPath ); -+ if ( !s_downloadPath->endsWith("/")) -+ s_downloadPath->append('/'); -+ -+ *s_picturesPath = TQDir::cleanDirPath( *s_picturesPath ); -+ if ( !s_picturesPath->endsWith("/")) -+ s_picturesPath->append('/'); -+ - // Trash Path - TODO remove in KDE4 (tdeio_trash can't use it for interoperability reasons) - *s_trashPath = *s_desktopPath + i18n("Trash") + "/"; - *s_trashPath = g.readPathEntry( "Trash" , *s_trashPath); -@@ -603,6 +630,14 @@ - s_desktopPath = 0L; - delete s_documentPath; - s_documentPath = 0L; -+ delete s_videosPath; -+ s_videosPath = 0L; -+ delete s_picturesPath; -+ s_picturesPath = 0L; -+ delete s_downloadPath; -+ s_downloadPath = 0L; -+ delete s_musicPath; -+ s_musicPath = 0L; - } - - TDEGlobalSettings::KMouseSettings & TDEGlobalSettings::mouseSettings() diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index c865d591b..fa2ada3b3 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -39,7 +39,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz #Patch11: tdelibs-14.0.0-displayconfig_crash.patch # Patches from Mandriva -Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch Patch102: tdelibs-14.0.0-cups_by_default.patch # Enables the 'kddebug' feature even when built with '-DNDEBUG' @@ -468,7 +467,6 @@ applications for TDE. #patch11 -p1 -b .displayconfigcrash -%patch101 -p1 -b .xdg_path %patch102 -p1 -b .cups_by_default #patch201 -p1 -b .kddebug -- cgit v1.2.3