diff options
30 files changed, 1160 insertions, 273 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 new file mode 100644 index 000000000..73021cb11 --- /dev/null +++ b/redhat/applications/gtk-qt-engine/gtk-qt-engine-14.0.0-fix_gtk3_segv.patch @@ -0,0 +1,28 @@ +--- 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 384d73c46..6f21d16f7 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 @@ -40,9 +40,11 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Source1: gtk-qt-engine.rc.sh -Source2: gtkrc-2.0-kde4 -Source3: gtkrc-2.0-kde-kde4 +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 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version} @@ -68,6 +70,7 @@ a way to configure it from within KControl. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .segv # Renames the '.po' files for f in po/*/*.po; do diff --git a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec index d66401cf3..0cd051c82 100644 --- a/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec +++ b/redhat/applications/k3b-i18n/k3b-i18n-14.0.0.spec @@ -65,109 +65,265 @@ steps of the burning process the beginner may find comfort in the automatic settings and the reasonable k3b defaults which allow a quick start. -%package da +########## + +%package Danish Group: Applications/Archiving Requires: trinity-k3b Summary: Danish (da) translations for K3B [Trinity] -%description da + +Obsoletes: trinity-k3b-i18n-da < %{version}-%{release} +Provides: trinity-k3b-i18n-da = %{version}-%{release} + +%description Danish This package contains the Danish translations for K3B. -%package de +%files Danish +%defattr(-,root,root,-) +%lang(da) %{tde_tdedocdir}/HTML/da/k3b +%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo + +########## + +%package German Group: Applications/Archiving Requires: trinity-k3b Summary: German (de) translations for K3B [Trinity] -%description de + +Obsoletes: trinity-k3b-i18n-de < %{version}-%{release} +Provides: trinity-k3b-i18n-de = %{version}-%{release} + +%description German This package contains the German translations for K3B. -%package el +%files German +%defattr(-,root,root,-) +%lang(de) %{tde_tdedocdir}/HTML/de/k3b +%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo + +########## + +%package Greek Group: Applications/Archiving Requires: trinity-k3b >= %{version} Summary: Greek (el) translations for K3B [Trinity] -%description el + +Obsoletes: trinity-k3b-i18n-el < %{version}-%{release} +Provides: trinity-k3b-i18n-el = %{version}-%{release} + +%description Greek This package contains the greek translations for K3B. -%package es +%files Greek +%defattr(-,root,root,-) +#%lang(el) %{tde_tdedocdir}/HTML/el/k3b +%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo + +########## + +%package Spanish Group: Applications/Archiving Requires: trinity-k3b Summary: Spanish (es) translations for K3B [Trinity] -%description es + +Obsoletes: trinity-k3b-i18n-es < %{version}-%{release} +Provides: trinity-k3b-i18n-es = %{version}-%{release} + +%description Spanish This package contains the Spanish translations for K3B. -%package et +%files Spanish +%defattr(-,root,root,-) +%lang(es) %{tde_tdedocdir}/HTML/es/k3b +%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo + +########## + +%package Estonian Group: Applications/Archiving Requires: trinity-k3b Summary: Estonian (et) translations for K3B [Trinity] -%description et + +Obsoletes: trinity-k3b-i18n-et < %{version}-%{release} +Provides: trinity-k3b-i18n-et = %{version}-%{release} + +%description Estonian This package contains the Estonian translations for K3B. -%package fr +%files Estonian +%defattr(-,root,root,-) +%lang(et) %{tde_tdedocdir}/HTML/et/k3b +%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo + +########## + +%package French Group: Applications/Archiving Requires: trinity-k3b Summary: French (fr) translations for K3B [Trinity] -%description fr + +Obsoletes: trinity-k3b-i18n-fr < %{version}-%{release} +Provides: trinity-k3b-i18n-fr = %{version}-%{release} + +%description French This package contains the French translations for K3B. -%package it +%files French +%defattr(-,root,root,-) +%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b +%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo + +########## + +%package Italian Group: Applications/Archiving Requires: trinity-k3b Summary: Italian (it) translations for K3B [Trinity] -%description it + +Obsoletes: trinity-k3b-i18n-it < %{version}-%{release} +Provides: trinity-k3b-i18n-it = %{version}-%{release} + +%description Italian This package contains the Italian translations for K3B. -%package nl +%files Italian +%defattr(-,root,root,-) +%lang(it) %{tde_tdedocdir}/HTML/it/k3b +%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo + +########## + +%package Dutch Group: Applications/Archiving Requires: trinity-k3b Summary: Dutch (nl) translations for K3B [Trinity] -%description nl + +Obsoletes: trinity-k3b-i18n-nl < %{version}-%{release} +Provides: trinity-k3b-i18n-nl = %{version}-%{release} + +%description Dutch This package contains the Dutch translations for K3B. -%package pl +%files Dutch +%defattr(-,root,root,-) +%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b +%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo + +########## + +%package Polish Group: Applications/Archiving Requires: trinity-k3b Summary: Polish (pl) translations for K3B [Trinity] -%description pl + +Obsoletes: trinity-k3b-i18n-pl < %{version}-%{release} +Provides: trinity-k3b-i18n-pl = %{version}-%{release} + +%description Polish This package contains the Polish translations for K3B. -%package pt +%files Polish +%defattr(-,root,root,-) +%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b +%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo + +########## + +%package Portuguese Group: Applications/Archiving Requires: trinity-k3b Summary: Portuguese (pt) translations for K3B [Trinity] -%description pt + +Obsoletes: trinity-k3b-i18n-pt < %{version}-%{release} +Provides: trinity-k3b-i18n-pt = %{version}-%{release} + +%description Portuguese This package contains the Portuguese translations for K3B. -%package ptbr +%files Portuguese +%defattr(-,root,root,-) +%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b +%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo + +########## + +%package Brazil Group: Applications/Archiving Requires: trinity-k3b Summary: Brazilian Portuguese (pt_BR) translations for K3B [Trinity] -%description ptbr + +Obsoletes: trinity-k3b-i18n-pt_BR < %{version}-%{release} +Provides: trinity-k3b-i18n-pt_BR = %{version}-%{release} +Obsoletes: trinity-k3b-i18n-ptbr < %{version}-%{release} +Provides: trinity-k3b-i18n-ptbr = %{version}-%{release} + +%description Brazil This package contains the Brazilian Portuguese translations for K3B. -%package ru +%files Brazil +%defattr(-,root,root,-) +%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b +%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo + +########## + +%package Russian Group: Applications/Archiving Requires: trinity-k3b Summary: Russian (ru) translations for K3B [Trinity] -%description ru + +Obsoletes: trinity-k3b-i18n-ru < %{version}-%{release} +Provides: trinity-k3b-i18n-ru = %{version}-%{release} + +%description Russian This package contains the Russian translations for K3B. -%package sv +%files Russian +%defattr(-,root,root,-) +%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b +%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo + +########## + +%package Swedish Group: Applications/Archiving Requires: trinity-k3b Summary: Swedish (sv) translations for K3B [Trinity] -%description sv + +Obsoletes: trinity-k3b-i18n-sv < %{version}-%{release} +Provides: trinity-k3b-i18n-sv = %{version}-%{release} + +%description Swedish This package contains the Swedish translations for K3B. -%package uk +%files Swedish +%defattr(-,root,root,-) +%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b +%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo + +########## + +%package Ukrainian Group: Applications/Archiving Requires: trinity-k3b Summary: Ukrainian (uk) translations for K3B [Trinity] -%description uk + +Obsoletes: trinity-k3b-i18n-uk < %{version}-%{release} +Provides: trinity-k3b-i18n-uk = %{version}-%{release} + +%description Ukrainian This package contains the Ukrainian translations for K3B. +%files Ukrainian +%defattr(-,root,root,-) +%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b +%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo + +########## %prep %setup -q -n %{name}-%{tde_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" @@ -192,6 +348,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__make %{?_smp_mflags} + %install %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} @@ -242,78 +399,6 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %__rm -rf %{buildroot} -%files da -%defattr(-,root,root,-) -%lang(da) %{tde_tdedocdir}/HTML/da/k3b -%lang(da) %{tde_datadir}/locale/da/LC_MESSAGES/*.mo - -%files de -%defattr(-,root,root,-) -%lang(de) %{tde_tdedocdir}/HTML/de/k3b -%lang(de) %{tde_datadir}/locale/de/LC_MESSAGES/*.mo - -%files el -%defattr(-,root,root,-) -#%lang(el) %{tde_tdedocdir}/HTML/el/k3b -%lang(el) %{tde_datadir}/locale/el/LC_MESSAGES/*.mo - -%files es -%defattr(-,root,root,-) -%lang(es) %{tde_tdedocdir}/HTML/es/k3b -%lang(es) %{tde_datadir}/locale/es/LC_MESSAGES/*.mo - -%files et -%defattr(-,root,root,-) -%lang(et) %{tde_tdedocdir}/HTML/et/k3b -%lang(et) %{tde_datadir}/locale/et/LC_MESSAGES/*.mo - -%files fr -%defattr(-,root,root,-) -%lang(fr) %{tde_tdedocdir}/HTML/fr/k3b -%lang(fr) %{tde_datadir}/locale/fr/LC_MESSAGES/*.mo - -%files it -%defattr(-,root,root,-) -%lang(it) %{tde_tdedocdir}/HTML/it/k3b -%lang(it) %{tde_datadir}/locale/it/LC_MESSAGES/*.mo - -%files nl -%defattr(-,root,root,-) -%lang(nl) %{tde_tdedocdir}/HTML/nl/k3b -%lang(nl) %{tde_datadir}/locale/nl/LC_MESSAGES/*.mo - -%files pl -%defattr(-,root,root,-) -%lang(pl) %{tde_tdedocdir}/HTML/pl/k3b -%lang(pl) %{tde_datadir}/locale/pl/LC_MESSAGES/*.mo - -%files pt -%defattr(-,root,root,-) -%lang(pt) %{tde_tdedocdir}/HTML/pt/k3b -%lang(pt) %{tde_datadir}/locale/pt/LC_MESSAGES/*.mo - -%files ptbr -%defattr(-,root,root,-) -%lang(pt_BR) %{tde_tdedocdir}/HTML/pt_BR/k3b -%lang(pt_BR) %{tde_datadir}/locale/pt_BR/LC_MESSAGES/*.mo - -%files ru -%defattr(-,root,root,-) -%lang(ru) %{tde_tdedocdir}/HTML/ru/k3b -%lang(ru) %{tde_datadir}/locale/ru/LC_MESSAGES/*.mo - -%files sv -%defattr(-,root,root,-) -%lang(sv) %{tde_tdedocdir}/HTML/sv/k3b -%lang(sv) %{tde_datadir}/locale/sv/LC_MESSAGES/*.mo - -%files uk -%defattr(-,root,root,-) -%lang(uk) %{tde_tdedocdir}/HTML/uk/k3b -%lang(uk) %{tde_datadir}/locale/uk/LC_MESSAGES/*.mo - - - %changelog * Fri Jul 05 2013 Francois Andriot <[email protected]> - 1.0.5-4 - Initial release for TDE 14.0.0 diff --git a/redhat/applications/kcmldap/kcmldap-14.0.0.spec b/redhat/applications/kcmldap/kcmldap-14.0.0.spec index dd5878e7e..42184a43c 100644 --- a/redhat/applications/kcmldap/kcmldap-14.0.0.spec +++ b/redhat/applications/kcmldap/kcmldap-14.0.0.spec @@ -72,7 +72,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %postun -n trinity-kcontrol-ldap-bonding touch --no-create %{tde_datadir}/icons/hicolor || : -%files -n trinity-kcontrol-ldap-bonding -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-bonding %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapbonding @@ -98,7 +98,7 @@ touch --no-create %{tde_datadir}/icons/hicolor || : %postun -n trinity-tde-ldap-cert-updater touch --no-create %{tde_datadir}/icons/hicolor || : -%files -n trinity-tde-ldap-cert-updater -f %{tde_pkg}.lang +%files -n trinity-tde-ldap-cert-updater %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapcertupdater @@ -141,8 +141,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec index 12afa5925..9aee80f36 100644 --- a/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec +++ b/redhat/applications/kcmldapcontroller/kcmldapcontroller-14.0.0.spec @@ -70,7 +70,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %postun -n trinity-kcontrol-ldap-controller update-desktop-database %{tde_tdeappdir} > /dev/null -%files -n trinity-kcontrol-ldap-controller -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-controller %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/primaryrccertupdater @@ -121,8 +121,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec index 45c0c9e1b..dec203b63 100644 --- a/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec +++ b/redhat/applications/kcmldapmanager/kcmldapmanager-14.0.0.spec @@ -70,7 +70,7 @@ update-desktop-database %{tde_tdeappdir} > /dev/null %postun -n trinity-kcontrol-ldap-manager update-desktop-database %{tde_tdeappdir} > /dev/null -%files -n trinity-kcontrol-ldap-manager -f %{tde_pkg}.lang +%files -n trinity-kcontrol-ldap-manager %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING %{tde_bindir}/tdeldapmanager @@ -116,8 +116,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kerberostray/kerberostray-14.0.0.spec b/redhat/applications/kerberostray/kerberostray-14.0.0.spec index dfca0749f..eb772fad6 100644 --- a/redhat/applications/kerberostray/kerberostray-14.0.0.spec +++ b/redhat/applications/kerberostray/kerberostray-14.0.0.spec @@ -89,8 +89,6 @@ export PATH="%{tde_bindir}:${PATH}" %__rm -rf %{buildroot} %__make install DESTDIR=%{buildroot} -%find_lang %{tde_pkg} - %clean %__rm -rf %{buildroot} diff --git a/redhat/applications/kvirc/kvirc-14.0.0.spec b/redhat/applications/kvirc/kvirc-14.0.0.spec index c3cd3d09a..ef3690e8f 100644 --- a/redhat/applications/kvirc/kvirc-14.0.0.spec +++ b/redhat/applications/kvirc/kvirc-14.0.0.spec @@ -109,8 +109,8 @@ with the K Desktop Environment version 3. ./autogen.sh # Fix Q_OBJECT => TQ_OBJECT -#%__sed -i src/*/*/*.h src/*/*/*.sh \ -# -e "s|Q_OBJECT|TQ_OBJECT|" +%__sed -i src/*/*/*.h src/*/*/*.sh \ + -e "s|Q_OBJECT|TQ_OBJECT|" %build diff --git a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec index c4cbbf333..53303d743 100644 --- a/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec +++ b/redhat/applications/qt4-tqt-theme-engine/qt4-tqt-theme-engine-14.0.0.spec @@ -75,8 +75,13 @@ unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" +if [ -x "%{_libdir}/qt4/bin/qmake" ]; then + export PATH="%{_libdir}/qt4/bin:${PATH}" +fi + # Use QT4's qmake -%{_bindir}/qmake +qmake + # Not SMP SAFE ! %__make diff --git a/redhat/applications/rosegarden/rosegarden-14.0.0.spec b/redhat/applications/rosegarden/rosegarden-14.0.0.spec index e09752d31..d2565fa5a 100644 --- a/redhat/applications/rosegarden/rosegarden-14.0.0.spec +++ b/redhat/applications/rosegarden/rosegarden-14.0.0.spec @@ -68,7 +68,7 @@ BuildRequires: jack-audio-connection-kit-devel %endif # LIRC support -%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 6 %define with_lirc 1 BuildRequires: lirc-devel %endif diff --git a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec index 66308d351..fabd6739c 100644 --- a/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec +++ b/redhat/applications/soundkonverter/soundkonverter-14.0.0.spec @@ -105,7 +105,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" --mandir=%{tde_mandir} \ --includedir=%{tde_tdeincludedir} \ --disable-rpath \ - --with-extra-includes=:/usr/include/cdda \ + --with-extra-includes=/usr/include/cdda \ --enable-closure %__make %{?_smp_mflags} diff --git a/redhat/applications/tdesvn/tdesvn-14.0.0.spec b/redhat/applications/tdesvn/tdesvn-14.0.0.spec index cb5785496..2fbfd2f92 100644 --- a/redhat/applications/tdesvn/tdesvn-14.0.0.spec +++ b/redhat/applications/tdesvn/tdesvn-14.0.0.spec @@ -155,8 +155,6 @@ export PATH="%{_bindir}:${PATH}" %__make install DESTDIR=%{buildroot} -C build -%find_lang kdesvn - # Installs SVN protocols as alternatives %__mv -f %{?buildroot}%{tde_datadir}/services/svn+file.protocol %{?buildroot}%{tde_datadir}/services/svn+file.protocol_tdesvn %__mv -f %{?buildroot}%{tde_datadir}/services/svn+http.protocol %{?buildroot}%{tde_datadir}/services/svn+http.protocol_tdesvn @@ -209,7 +207,7 @@ fi /sbin/ldconfig || : -%files -f kdesvn.lang +%files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{tde_bindir}/tdesvn diff --git a/redhat/buildall.sh b/redhat/buildall.sh index 000e0a9fd..8358ef15a 100755 --- a/redhat/buildall.sh +++ b/redhat/buildall.sh @@ -2,10 +2,11 @@ tdp='cd ~/tde/tde-packaging/redhat' #grp='tdp; ./genrpm.sh -v 3.5.13.2 -a' -grp='tdp; ./genrpm.sh -v 14.0.0 -a' +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})" if [ -x /usr/sbin/urpmi ]; then PKGMGR="urpmi" @@ -82,34 +83,36 @@ rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" #fi grpiud dependencies/tqt3 grpiud dependencies/tqtinterface -grpi dependencies/arts -grpi dependencies/avahi-tqt -grpi dependencies/dbus-1-tqt -grpi dependencies/dbus-tqt -grpi dependencies/libcaldav -grpi dependencies/libcarddav +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 grpiu dependencies/tqca-tls -eval ${PKGINST} trinity-tqca-tls trinity-dbus-1-tqt-devel + +# Build akode now, required for some packages later ... +grpiud extras/akode # Build main # basic packages rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" -eval ${PKGINST} trinity-arts-devel trinity-avahi-tqt-devel trinity-dbus-tqt-devel grpiud tdelibs grpiud tdebase -# packages which are required by others +# Back to remaining dependencies ... +grpiud dependencies/tqscintilla +grpiud dependencies/python-tqt +# Main packages which are required by later main packages rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" -eval ${PKGINST} trinity-libcaldav-devel trinity-libcarddav-devel grpiud tdepim -grpiu extras/akode -eval ${PKGINST} trinity-akode-libmad trinity-akode-devel grpiud tdemultimedia grpiud tdegames grpiud tdebindings grpiud tdegraphics grpiud tdenetwork -# other packages +# other main packages rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" grpiui tdeaccessibility grpiui tdeaddons @@ -132,13 +135,16 @@ grpiud libraries/libkdcraw grpiud libraries/libkexiv2 grpiud libraries/libkipi grpiud libraries/libksquirrel +grpiud libraries/libtdeldap +grpiui libraries/libtqt-perl grpiud libraries/python-trinity -grpiu libraries/pytdeextensions -eval ${PKGINST} trinity-libpythonize0-devel trinity-pytdeextensions +grpiud libraries/pytdeextensions # Build applications rm -rf "${BUILDDIR}" "${BUILDROOTDIR}" +# K3B is required later for k9copy grpiud applications/k3b +# other applications, any order ... grpiui applications/abakus #grpiui applications/adept grpiui applications/amarok @@ -150,13 +156,11 @@ grpiui applications/dolphin grpiui applications/filelight #grpiui applications/filelight-l10n #grpiui applications/fusion-icon -grpiui applications/gtk-qt-engine grpiui applications/gwenview grpiui applications/gwenview-i18n -#grpiui applications/k3b -if ! is_installed trinity-k3b-i18n-fr; then +if ! is_installed trinity-k3b-i18n-French; then grpiu applications/k3b-i18n - eval ${PKGINST} trinity-k3b-i18n-fr + eval ${PKGINST} trinity-k3b-i18n-French fi grpiui applications/k9copy grpiui applications/kaffeine @@ -164,15 +168,22 @@ grpiui applications/kaffeine-mozilla grpiui applications/katapult grpiui applications/kbarcode grpiui applications/kbfx +grpiui applications/kbibtex +grpiui applications/kbiff grpiui applications/kbookreader grpiui applications/kchmviewer +grpiui applications/kcmautostart +grpiui applications/kcmldap +grpiui applications/kcmldapcontroller +grpiui applications/kcmldapmanager grpiui applications/kcpuload +grpiui applications/kdbg grpiui applications/kdbusnotification grpiui applications/kdiff3 grpiui applications/kdirstat grpiui applications/keep +grpiui applications/kerberostray #grpiui applications/kerry -#grpiui applications/kgtk-qt3 grpiui applications/kile grpiui applications/kima grpiui applications/kiosktool @@ -210,7 +221,7 @@ grpiui applications/ktorrent grpiui applications/kuickshow grpiui applications/kvirc grpiui applications/kvkbd -#grpiui applications/kvpnc +grpiui applications/kvpnc grpiui applications/piklab grpiui applications/potracegui grpiui applications/rosegarden @@ -221,6 +232,8 @@ grpiui applications/tde-guidance grpiui applications/tdeio-apt grpiui applications/tdeio-locate grpiui applications/tdeio-umountwrapper +grpiui applications/tdenetworkmanager +grpiui applications/tdepowersave grpiui applications/tderadio grpiui applications/tde-style-lipstik grpiui applications/tde-style-qtcurve @@ -234,15 +247,19 @@ grpiui applications/wlassistant grpiui applications/yakuake eval ${PKGINST} trinity-desktop-applications +# Decoration-related stuff are distribution-dependant. +grpiui applications/gtk-qt-engine +[ "${DIST:0:3}" = ".el" ] || grpiui applications/gtk3-tqt-engine +grpiui applications/qt4-tqt-theme-engine +grpiui applications/kgtk-qt3 + + # Build extra packages grpiui extras/icons-crystalsvg-updated grpiui extras/icons-kfaenza grpiui extras/icons-oxygen grpiui extras/kasablanca -grpiui extras/kbibtex -grpiui extras/kbiff #grpiui extras/kcheckgmail -grpiui extras/kcmautostart #grpiui extras/kdebluetooth grpiui extras/kftpgrabber grpiui extras/kickoff-i18n 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 index 7716f3597..069111d3e 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0-ftbfs.patch @@ -9,3 +9,25 @@ // 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 36323f4e2..46fac8e28 100644 --- a/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec +++ b/redhat/dependencies/python-tqt/python-tqt-14.0.0.spec @@ -119,6 +119,7 @@ Linguist translation files from Python code. %package devel Summary: TQt bindings for Python - Development files Requires: %{name} = %{version}-%{release} +Requires: %{name}-tools = %{version}-%{release} %description devel Development .sip files with definitions of PyQt classes. They @@ -127,7 +128,7 @@ packages based on them, like PyKDE. %files devel %defattr(-,root,root,-) -%{python_sitearch}/pyqtconfig.py +%{python_sitearch}/pyqtconfig.py* %{_datadir}/sip/tqt/ ########## @@ -147,6 +148,10 @@ unset QTDIR QTINC QTLIB mkdir build cd build + +# WTF ? CentOS 6 ! +cp -rf ../pyuic3 ../pylupdate3 . + echo yes | python ../configure.py \ -c -n %{_includedir}/tqscintilla \ -q /usr/share/tqt3 \ diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch new file mode 100644 index 000000000..095b5508c --- /dev/null +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0-visibility.patch @@ -0,0 +1,64 @@ +diff --git a/configure b/configure +index 0ced074..7a6fcfe 100755 +--- a/configure ++++ b/configure +@@ -44,7 +44,7 @@ while [ $# -gt 0 ]; do + done + + +-echo "Configuring qca-tls ..." ++echo "Configuring tqca-tls ..." + + if [ "$QC_DEBUG" = "Y" ]; then + echo +diff --git a/qca-tls.pro b/qca-tls.pro +index c1541bf..2457746 100644 +--- a/qca-tls.pro ++++ b/qca-tls.pro +@@ -1,8 +1,8 @@ +-# qca-tls qmake profile ++# tqca-tls qmake profile + + TEMPLATE = lib + CONFIG += qt thread release plugin +-TARGET = qca-tls ++TARGET = tqca-tls + + !exists(qcaprovider.h) { + Q_PREFIX = ../../src +@@ -13,9 +13,9 @@ HEADERS += ($$Q_PREFIX)qcaprovider.h + HEADERS = qca-tls.h + SOURCES = qca-tls.cpp + +-DEFINES += QCA_PLUGIN ++DEFINES += TQCA_PLUGIN + win32:{ +- DEFINES += QCA_PLUGIN_DLL OSSL_097 ++ DEFINES += TQCA_PLUGIN_DLL OSSL_097 + INCLUDEPATH += c:\local\include + LIBS += c:\local\lib\libeay32.lib c:\local\lib\ssleay32.lib + } +diff --git a/qca-tls.qc b/qca-tls.qc +index ef0a739..91179cf 100644 +--- a/qca-tls.qc ++++ b/qca-tls.qc +@@ -1,5 +1,5 @@ + <qconf> +- <name>qca-tls</name> ++ <name>tqca-tls</name> + <profile>qca-tls.pro</profile> + <noprefix/> + <dep type='openssl'> +diff --git a/qca.h b/qca.h +index 184a4b0..ccd6d03 100644 +--- a/qca.h ++++ b/qca.h +@@ -49,7 +49,7 @@ + # endif + #endif + #ifndef TQCA_PLUGIN_EXPORT +-#define TQCA_PLUGIN_EXPORT extern "C" ++#define TQCA_PLUGIN_EXPORT extern "C" __attribute__ ((visibility ("default"))) + #endif + + class TQHostAddress; diff --git a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec index b8bbfb5c8..c6dc18eff 100644 --- a/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec +++ b/redhat/dependencies/tqca-tls/tqca-tls-14.0.0.spec @@ -30,6 +30,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz +Patch1: tqca-tls-14.0.0-visibility.patch + BuildRequires: trinity-tqt3-devel >= 3.5.0 BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqca-devel >= 1.0 @@ -52,6 +54,7 @@ contains the TLS plugin. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} +%patch1 -p1 -b .visibility %build @@ -77,7 +80,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" %files %defattr(0644,root,root,0755) %doc README COPYING -%{_libdir}/tqt3/plugins/crypto/libqca-tls.so +%{_libdir}/tqt3/plugins/crypto/libtqca-tls.so %changelog diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index aa2813914..dcabb903f 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -26,8 +26,6 @@ Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Patch1: tqt3-14.0.0-shared_lib.patch # [tqt3] Fix FTBFS Patch2: tqt3-14.0.0-fix_ftbfs.patch -# [tqt3] Fix GLIB initialization -Patch3: tqt3-14.0.0-fix_glib_init.patch BuildRequires: desktop-file-utils BuildRequires: libmng-devel @@ -430,7 +428,15 @@ for the TQt 3 toolkit. %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %patch1 -p1 -b .sharedlibs %patch2 -p1 -b .ftbfs -%patch3 -p1 -b .glibinit + +# fix variables in 'qmake.conf' +%__sed -i mkspecs/*/qmake.conf \ + -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ + -e "s|\$(QTDIR)|/usr|g" \ + -e "s|-lqt|-ltqt|g" \ + -e "s|^QMAKE_STRIP =.*|QMAKE_STRIP =|" \ + -e "s|^QMAKE_STRIPFLAGS_LIB +=.*|QMAKE_STRIPFLAGS_LIB +=|" + %build unset QTDIR QTINC QTLIB @@ -549,12 +555,6 @@ ln -s ../src/inputmethod/ntqinputcontextplugin.h include/ntqinputcontextplugin.h # fix .prl files %__sed -i lib/*.prl -e "s|${QTDIR}|%{tde_datadir}/tqt3|g" -# fix QTDIR in 'qmake.conf' -%__sed -i mkspecs/*/qmake.conf \ - -e "s|^QMAKE_INCDIR_QT.*|QMAKE_INCDIR_QT = /usr/include/tqt3|" \ - -e "s|\$(QTDIR)|/usr|g" \ - -e "s|-lqt|-ltqt|g" - %install %__rm -rf %{buildroot} diff --git a/redhat/extras/akode/akode-14.0.0.spec b/redhat/extras/akode/akode-14.0.0.spec new file mode 100644 index 000000000..7d59fccd3 --- /dev/null +++ b/redhat/extras/akode/akode-14.0.0.spec @@ -0,0 +1,361 @@ +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?tde_prefix}" != "/usr" +%define _variant .opt +%endif + +# TDE 3.5.13 specific building variables +%define tde_bindir %{tde_prefix}/bin +%define tde_datadir %{tde_prefix}/share +%define tde_docdir %{tde_datadir}/doc +%define tde_includedir %{tde_prefix}/include +%define tde_libdir %{tde_prefix}/%{_lib} +%define tde_mandir %{tde_datadir}/man + +%define tde_tdeappdir %{tde_datadir}/applications/kde +%define tde_tdedocdir %{tde_docdir}/tde +%define tde_tdeincludedir %{tde_includedir}/tde +%define tde_tdelibdir %{tde_libdir}/trinity + +%define _docdir %{tde_docdir} + +Summary: Audio-decoding framework +Name: trinity-akode +Version: 2.0.2 +Release: 5%{?dist}%{?_variant} + +License: LGPLv2+ +Group: System Environment/Libraries +#URL: http://carewolf.com/akode/ +URL: http://www.kde-apps.org/content/show.php?content=30375 +Source0: akode-2.0.2.tar.bz2 + +Prefix: %{tde_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + +# Legacy Fedora 9 patches +Patch1: akode-pulseaudio.patch +Patch2: akode-2.0.2-multilib.patch +Patch3: akode-2.0.2-flac113-portable.patch +Patch4: akode-2.0.2-gcc43.patch + +# New patch for Fedora 16 / TDE 3.5.13 +Patch10: akode-autotools.patch +Patch11: akode-2.0.2-fix_ffmpeg_include.patch + + +# FLAC support +%define _with_flac --with-flac +%if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?pclinuxos} +BuildRequires: libflac-devel +%else +BuildRequires: %{_lib}flac-devel +%endif +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: flac-devel +%endif + +# JACK support +%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_jack --with-jack +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}jack-devel +%endif +%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +BuildRequires: jack-audio-connection-kit-devel +%endif +%endif + +# SAMPLERATE support +%if 0%{?rhel} >= 4 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_libsamplerate --with-libsamplerate +BuildRequires: libsamplerate-devel +%endif + +# PULSEAUDIO support +%if 0%{?fedora} >= 15 || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} +%define _with_pulseaudio --with-pulseaudio +%if 0%{?mgaversion} || 0%{?mdkversion} +BuildRequires: %{_lib}pulseaudio-devel +%endif +%if 0%{?rhel} || 0%{?fedora} +BuildRequires: pulseaudio-libs-devel +%endif +%if 0%{?suse_version} +BuildRequires: pulseaudio-devel +%endif +%endif + +# MAD support +%if 0%{?mdkversion} || 0%{?mgaversion} || 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +%define _with_libmad --with-libmad +%if 0%{?mdkversion} || 0%{?mgaversion} +BuildRequires: %{_lib}mad-devel +%endif +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} +BuildRequires: libmad-devel +%endif +%endif + + +BuildRequires: automake libtool +BuildRequires: alsa-lib-devel +BuildRequires: libvorbis-devel +BuildRequires: speex-devel + + +%description +aKode is a simple audio-decoding frame-work that provides a uniform +interface to decode the most common audio-formats. It also has a direct +playback option for a number of audio-outputs. + +aKode currently has the following decoder plugins: +* mpc: Decodes musepack aka mpc audio. +* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. + +aKode also has the following audio outputs: +* alsa: Outputs to ALSA (dmix is recommended). + +%files +%defattr(-,root,root,-) +%doc rpmdocs/* +%{tde_bindir}/akodeplay +%{tde_libdir}/libakode.so.* +%{tde_libdir}/libakode_alsa_sink.la +%{tde_libdir}/libakode_alsa_sink.so +%{tde_libdir}/libakode_mpc_decoder.la +%{tde_libdir}/libakode_mpc_decoder.so +%{tde_libdir}/libakode_oss_sink.la +%{tde_libdir}/libakode_oss_sink.so +%{tde_libdir}/libakode_xiph_decoder.la +%{tde_libdir}/libakode_xiph_decoder.so + +%post +/sbin/ldconfig + +%postun +/sbin/ldconfig + +########## + +%package devel +Summary: Headers for developing programs that will use %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +%{?_with_jack:Requires: %{name}-jack = %{version}-%{release}} +%{?_with_pulseaudio:Requires: %{name}-pulseaudio = %{version}-%{release}} +%{?_with_libsamplerate:Requires: %{name}-libsamplerate = %{version}-%{release}} +%{?_with_libmad:Requires: %{name}-libmad = %{version}-%{release}} +Requires: pkgconfig + +%description devel +%{summary}. + +%files devel +%defattr(-,root,root,-) +%{tde_bindir}/akode-config +%{tde_includedir}/* +%{tde_libdir}/libakode.la +%{tde_libdir}/libakode.so +%{tde_libdir}/pkgconfig/*.pc + +%post devel +/sbin/ldconfig + +%postun devel +/sbin/ldconfig + +########## + +%if "%{?_with_jack}" != "" + +%package jack +Summary: Jack audio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description jack +%{summary}. + +%files jack +%defattr(-,root,root,-) +%{tde_libdir}/libakode_jack_sink.la +%{tde_libdir}/libakode_jack_sink.so + +%post jack +/sbin/ldconfig + +%postun jack +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_pulseaudio}" != "" + +%package pulseaudio +Summary: Pulseaudio output backend for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description pulseaudio +%{summary}. +Recommended for network transparent audio. + +%files pulseaudio +%defattr(-,root,root,-) +%{tde_libdir}/libakode_polyp_sink.la +%{tde_libdir}/libakode_polyp_sink.so + +%post pulseaudio +/sbin/ldconfig + +%postun pulseaudio +/sbin/ldconfig + +%endif + +########## + +# Packaged separately to keep main/core %{akode} package LGPL-clean. +%if "%{?_with_libsamplerate:1}" == "1" + +%package libsamplerate +Summary: Resampler based on libsamplerate for %{name} +Group: Development/Libraries +License: GPLv2+ +Requires: %{name} = %{version}-%{release} + +%description libsamplerate +%{summary}. + +# License: GPLv2+ +%files libsamplerate +%defattr(-,root,root,-) +%{tde_libdir}/libakode_src_resampler.la +%{tde_libdir}/libakode_src_resampler.so + +%post libsamplerate +/sbin/ldconfig + +%postun libsamplerate +/sbin/ldconfig + +%endif + +########## + +%if "%{?_with_libmad}" != "" + +%package libmad +Summary: Decoder based on libmad for %{name} +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} + +%description libmad +%{summary}. + +%files libmad +%{tde_libdir}/libakode_mpeg_decoder.la +%{tde_libdir}/libakode_mpeg_decoder.so + +%post libmad +/sbin/ldconfig + +%postun libmad +/sbin/ldconfig + +%endif + +########## + +%if 0%{?suse_version} || 0%{?pclinuxos} +%debug_package +%endif + +########## + +%prep +%setup -q -n akode-%{version} + +%patch1 -p1 -b .pulseaudio +%patch2 -p1 -b .multilib +%patch3 -p4 -b .flac113_portable +%patch4 -p1 -b .gcc43 + +%patch10 -p1 -b .autotools +%patch11 -p1 -b .ffmpeg + +# Ugly hack to modify TQT include directory inside autoconf files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i "admin/acinclude.m4.in" \ + -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g" + +%__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 cvs + +%build +%configure \ + --bindir=%{tde_bindir} \ + --libdir=%{tde_libdir} \ + --includedir=%{tde_includedir} \ + --datadir=%{tde_datadir} \ + --disable-static \ + --enable-shared \ + --disable-debug --disable-warnings --disable-dependency-tracking \ + --without-libltdl \ + --with-alsa \ + --with-oss \ + %{?_with_flac} %{!?_with_flac:--without-flac} \ + %{?_with_jack} %{!?_with_jack:--without-jack} \ + %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ + %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ + --with-speex \ + --with-vorbis \ + --without-ffmpeg \ + %{?_with_libmad} %{!?_with_libmad:--without-libmad} \ + --enable-closure \ + --enable-new-ldflags \ + --enable-final + +%__make %{?_smp_mflags} LIBTOOL=$(which libtool) + + +%install +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +# unpackaged files +%__rm -f %{buildroot}%{tde_libdir}/*.a + +# rpmdocs +for file in AUTHORS COPYING NEWS README TODO ; do + test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file" +done + + +%clean +%__rm -rf %{buildroot} + + +%changelog +* Fri Jul 05 2013 Francois Andriot <[email protected]> - 2.0.2-5 +- Initial release for TDE 14.0.0 + +* Sat Jan 19 2013 Francois Andriot <[email protected]> - 2.0.2-4 +- Initial release for TDE 3.5.13.2 + +* Wed Oct 03 2012 Francois Andriot <[email protected]> - 2.0.2-3 +- Initial release for TDE 3.5.13.1 + +* Mon Jul 30 2012 Francois Andriot <[email protected]> - 2.0.2-2 +- Re-adds '.la' files + +* Tue May 01 2012 Francois Andriot <[email protected]> - 2.0.2-1 +- Port to TDE 3.5.13 +- Based on spec file from Fedora 9 'akode-2.0.2-5' 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 eb7a65689..e13fcd7dd 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop-14.0.0.spec @@ -1,3 +1,6 @@ +# Starting with TDE R14.0.0, TDE is not intended to run in RHEL4 and older. +# Minimum (oldest) distribution supported is RHEL5. + # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?tde_prefix}" != "/usr" %define _variant .opt @@ -82,26 +85,6 @@ Requires: trinity-tdewebdev >= %{version} Group: User Interface/Desktops Summary: Meta-package to install all TDE applications -# Some applications are disabled for now ... -# Compiz-related stuff does not work (obsolete) -#Requires: trinity-compizconfig-backend-kconfig -#Requires: trinity-desktop-effects-kde -#Requires: trinity-fusion-icon - -# Obsolete l10n package -#Requires: trinity-filelight-l10n - -# Not even an RPM package ... -#Requires: trinity-konstruct - -# Debian/Ubuntu specific ... -#Requires: trinity-adept - -# Future R14 packages -Requires: trinity-qt4-tqt-theme-engine - -# Warning, k9copy requires ffmpeg -# Warning, tderadio requires libmp3lame Requires: trinity-abakus Requires: trinity-amarok Requires: trinity-basket @@ -113,6 +96,8 @@ Requires: trinity-gwenview Requires: trinity-gwenview-i18n Requires: trinity-k3b Requires: trinity-k9copy +Requires: trinity-kaffeine +Requires: trinity-kaffeine-mozilla Requires: trinity-katapult Requires: trinity-kbarcode Requires: trinity-kbfx @@ -126,12 +111,15 @@ Requires: trinity-kcmldapcontroller Requires: trinity-kcmldapmanager Requires: trinity-kcpuload Requires: trinity-kdbg +Requires: trinity-kdbusnotification Requires: trinity-kdiff3 Requires: trinity-kdirstat Requires: trinity-keep Requires: trinity-kerberostray Requires: trinity-kile +Requires: trinity-kima Requires: trinity-kiosktool +Requires: trinity-kmplayer Requires: trinity-kmyfirewall Requires: trinity-kmymoney Requires: trinity-knemo @@ -142,7 +130,9 @@ Requires: trinity-knowit Requires: trinity-knutclient Requires: trinity-koffice-suite Requires: trinity-konversation +Requires: trinity-kopete-otr Requires: trinity-kpicosim +Requires: trinity-kpilot Requires: trinity-krename Requires: trinity-krusader Requires: trinity-ksplash-engine-moodin @@ -157,76 +147,52 @@ Requires: trinity-kvkbd Requires: trinity-kvpnc Requires: trinity-piklab Requires: trinity-potracegui +Requires: trinity-rosegarden Requires: trinity-smb4k Requires: trinity-smartcardauth Requires: trinity-soundkonverter +Requires: trinity-tde-guidance +Requires: trinity-tde-guidance-powermanager Requires: trinity-tde-style-lipstik Requires: trinity-tde-style-qtcurve Requires: trinity-tde-systemsettings Requires: trinity-tdeio-apt Requires: trinity-tdeio-locate Requires: trinity-tdeio-umountwrapper +Requires: trinity-tdenetworkmanager +Requires: trinity-tdepowersave Requires: trinity-tderadio Requires: trinity-tdesudo +Requires: trinity-tdesvn Requires: trinity-tdmtheme Requires: trinity-tellico Requires: trinity-twin-style-crystal Requires: trinity-wlassistant Requires: trinity-yakuake -Requires: trinity-gtk3-tqt-engine +# Decoration-related stuff (not installed by default) +#Requires: trinity-kgtk-qt3 +#Requires: trinity-gtk-qt-engine +#Requires: trinity-gtk3-tqt-engine +#Requires: trinity-qt4-tqt-theme-engine -# Disabled applications for RHEL5 -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -# On RHEL 5, HAL version is too old for kpowersave . -Requires: trinity-tdekpowersave -# On RHEL 5, GTK2 version is too old for GTK stuff ... -Requires: trinity-gtk-qt-engine -# On RHEL 5, lilypond is not available, so no rosegarden :'-( -Requires: trinity-rosegarden -# RHEL5: kpilot library is too old -Requires: trinity-kpilot -%endif +# Compiz-related stuff does not work (obsolete) +#Requires: trinity-compizconfig-backend-kconfig +#Requires: trinity-desktop-effects-kde +#Requires: trinity-fusion-icon -# These python stuff have not been ported to TQT3 and still rely on HAL -#Requires: trinity-tde-guidance -#Requires: trinity-tde-guidance-powermanager -Obsoletes: trinity-guidance -Obsoletes: trinity-guidance-powermanager -Obsoletes: trinity-tde-guidance -Obsoletes: trinity-tde-guidance-powermanager +# Useless l10n package +#Requires: trinity-filelight-l10n -# This one causes several crashes . Obsolete. -#Requires: trinity-kgtk-qt3 -Obsoletes: trinity-kgtk-qt3 +# Not even an RPM package ... +#Requires: trinity-konstruct -# OBSOLETE: beagle does not exist anymore. Kerry is now useless. -# RHEL, openSUSE 12: no Beagle library -Obsoletes: trinity-kerry +# Debian/Ubuntu specific ... +#Requires: trinity-adept -# RHEL 6 only: knetworkmanager8 -%if 0%{?rhel} == 6 -Requires: trinity-knetworkmanager8 -%endif -# Other distros: tdenetworkmanager (knetworkmanager9) -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} || 0%{?fedora} -Requires: trinity-tdenetworkmanager -%endif -# RHEL 4 -%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -# HAL is too old -Requires: trinity-kima -Requires: trinity-kaffeine -Requires: trinity-kaffeine-mozilla -Requires: trinity-kmplayer -# No OTR support -Requires: trinity-kopete-otr -# No DBUS support -Requires: trinity-kdbusnotification -# Subversion 1.1 is too old -Requires: trinity-tdesvn -%endif +# Beagle does not exist anymore, so Kerry is now useless. +#Requires: trinity-kerry %description applications %{summary} diff --git a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec index b6f168c63..c8aac10c4 100644 --- a/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec +++ b/redhat/libraries/libtqt-perl/libtqt-perl-14.0.0.spec @@ -50,6 +50,10 @@ BuildRequires: gettext BuildRequires: trinity-libsmoketqt-devel >= %{tde_version} +Provides: perl(TQtShell) +Provides: perl(TQtShellControl) + + %description This module lets you use the TQt library from Perl. It provides an object-oriented interface and is easy to use. diff --git a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec index abf387f10..6cb948967 100644 --- a/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec +++ b/redhat/libraries/pytdeextensions/pytdeextensions-14.0.0.spec @@ -68,6 +68,15 @@ PyTDE Extensions is a collection of software and Python packages to support the creation and installation of TDE applications. +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{tde_datadir}/apps/pytdeextensions/ +%{tde_tdedocdir}/HTML/en/pytdeextensions/ +%{python_sitearch}/* + +########## + %package -n trinity-libpythonize0 Summary: Python packages to support KDE applications (library) [Trinity] Group: Environment/Libraries @@ -78,6 +87,17 @@ to support the creation and installation of KDE applications. This package contains the libpythonize library files. +%post -n trinity-libpythonize0 +/sbin/ldconfig + +%postun -n trinity-libpythonize0 +/sbin/ldconfig + +%files -n trinity-libpythonize0 +%defattr(-,root,root,-) +%{tde_libdir}/libpythonize.so.* + +########## %package -n trinity-libpythonize0-devel Summary: Python packages to support KDE applications (development) [Trinity] @@ -90,11 +110,38 @@ to support the creation and installation of TDE applications. This package contains the libpythonize development files. +%post -n trinity-libpythonize0-devel +/sbin/ldconfig + +%postun -n trinity-libpythonize0-devel +/sbin/ldconfig + +%files -n trinity-libpythonize0-devel +%defattr(-,root,root,-) +%{tde_tdeincludedir}/*.h +%{tde_libdir}/libpythonize.la +%{tde_libdir}/libpythonize.so + +########## + +%package devel +Summary: Meta-package to install all pytdeextensions development files +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} +Requires: trinity-libpythonize0-devel = %{version}-%{release} + +%description devel +%{summary} + +%files devel + +########## %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -171,37 +218,6 @@ done %__rm -rf %{buildroot} -%post -n trinity-libpythonize0 -/sbin/ldconfig - -%postun -n trinity-libpythonize0 -/sbin/ldconfig - -%post -n trinity-libpythonize0-devel -/sbin/ldconfig - -%postun -n trinity-libpythonize0-devel -/sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README TODO -%{tde_datadir}/apps/pytdeextensions/ -%{tde_tdedocdir}/HTML/en/pytdeextensions/ -%{python_sitearch}/* - -%files -n trinity-libpythonize0 -%defattr(-,root,root,-) -%{tde_libdir}/libpythonize.so.* - -%files -n trinity-libpythonize0-devel -%defattr(-,root,root,-) -%{tde_tdeincludedir}/*.h -%{tde_libdir}/libpythonize.la -%{tde_libdir}/libpythonize.so - - %changelog * Fri Jul 05 2013 Francois Andriot <[email protected]> - 0.4.0-5 - Initial build for TDE 14.0.0 diff --git a/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch b/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch new file mode 100644 index 000000000..b5adadbc9 --- /dev/null +++ b/redhat/tdebase/tdebase-14.0.0-kcm_xcursor_applytheme.patch @@ -0,0 +1,136 @@ +--- tdebase/kcontrol/input/xcursor/themepage.cpp.ORI 2013-07-22 19:33:45.153674930 +0200 ++++ tdebase/kcontrol/input/xcursor/themepage.cpp 2013-07-23 15:24:01.664497762 +0200 +@@ -33,6 +33,8 @@ + #include <tdeio/netaccess.h> + #include <ktar.h> + ++#include "../../krdb/krdb.h" ++ + #include <tqlayout.h> + #include <tqdir.h> + #include <tqpixmap.h> +@@ -42,6 +44,7 @@ + #include <tqpainter.h> + #include <tqfileinfo.h> + #include <tqpushbutton.h> ++#include <dcopref.h> + + #include <cstdlib> // for getenv() + +@@ -53,6 +56,10 @@ + #include <X11/Xlib.h> + #include <X11/Xcursor/Xcursor.h> + ++#ifdef HAVE_XFIXES ++# include <X11/extensions/Xfixes.h> ++#endif ++ + // Check for older version + #if !defined(XCURSOR_LIB_MAJOR) && defined(XCURSOR_MAJOR) + # define XCURSOR_LIB_MAJOR XCURSOR_MAJOR +@@ -133,6 +140,65 @@ + { + } + ++bool ThemePage::applyTheme(TQString theme, TQString size) ++{ ++#ifdef HAVE_XCURSOR ++ if (theme.isEmpty()) { ++ return false; ++ } ++ ++ // Apply the TDE cursor theme to ourselves ++ XcursorSetTheme(tqt_xdisplay(), theme.latin1()); ++ ++ // Tell tdelauncher to set the XCURSOR_THEME and XCURSOR_SIZE environment ++ // variables when launching applications. ++ DCOPRef tdelauncher("tdelauncher"); ++ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_THEME"), TQFile::encodeName(theme)); ++ if( !size.isEmpty()) { ++ tdelauncher.send("setLaunchEnv", TQCString("XCURSOR_SIZE"), size); ++ } ++ ++ // Update the Xcursor X resources ++ runRdb(0); ++ ++ // Apply the TDE cursor size to ourselves ++ if (!size.isEmpty()) { ++ XcursorSetDefaultSize(tqt_xdisplay(), size.toUInt()); ++ } ++ ++ // Reload the standard cursors ++ TQStringList names; ++ ++ // Qt cursors ++ names << "left_ptr" << "up_arrow" << "cross" << "wait" ++ << "left_ptr_watch" << "ibeam" << "size_ver" << "size_hor" ++ << "size_bdiag" << "size_fdiag" << "size_all" << "split_v" ++ << "split_h" << "pointing_hand" << "openhand" ++ << "closedhand" << "forbidden" << "whats_this" << "copy" << "move" << "link"; ++ ++ // X core cursors ++ names << "X_cursor" << "right_ptr" << "hand1" ++ << "hand2" << "watch" << "xterm" ++ << "crosshair" << "left_ptr_watch" << "center_ptr" ++ << "sb_h_double_arrow" << "sb_v_double_arrow" << "fleur" ++ << "top_left_corner" << "top_side" << "top_right_corner" ++ << "right_side" << "bottom_right_corner" << "bottom_side" ++ << "bottom_left_corner" << "left_side" << "question_arrow" ++ << "pirate"; ++ ++ for (int i = 0; i < names.size(); ++i) ++ { ++ const char* name = (*(names.at(i))).ascii(); ++ Cursor handle = XcursorLibraryLoadCursor(tqt_xdisplay(), name); ++ XFixesChangeCursorByName(tqt_xdisplay(), handle, TQFile::encodeName(name)); ++ XFreeCursor(tqt_xdisplay(), handle); // Don't leak the cursor ++ } ++ ++ return true; ++#else // HAVE_XCURSOR ++ return false; ++#endif ++} + + void ThemePage::save() + { +@@ -145,10 +209,17 @@ + c.setGroup( "Mouse" ); + c.writeEntry( "cursorTheme", selectedTheme != "system" ? selectedTheme : TQString::null ); + +- KMessageBox::information( this, i18n("You have to restart TDE for these " ++ // The Kcontrol panel does not allow to set cursor size for now. ++ // So we keep the same size as written in config file. ++ TQCString size = c.readEntry("cursorSize", TQString()).local8Bit(); ++ ++ if (!applyTheme(selectedTheme, size)) ++ { ++ KMessageBox::information( this, i18n("You have to restart TDE for these " + "changes to take effect."), i18n("Cursor Settings Changed"), + "CursorSettingsChanged" ); +- ++ } ++ + currentTheme = selectedTheme; + } + +--- tdebase/kcontrol/input/xcursor/themepage.h.ORI 2013-07-22 19:49:33.467191658 +0200 ++++ tdebase/kcontrol/input/xcursor/themepage.h 2013-07-22 19:56:03.990484896 +0200 +@@ -45,6 +45,7 @@ + void load(); + void load( bool useDefaults ); + void defaults(); ++ bool applyTheme(TQString theme, TQString size); + + signals: + void changed( bool ); +--- tdebase/kcontrol/input/xcursor/CMakeLists.txt.ORI 2013-07-23 15:24:41.178064068 +0200 ++++ tdebase/kcontrol/input/xcursor/CMakeLists.txt 2013-07-23 15:27:31.694851294 +0200 +@@ -21,5 +21,6 @@ + + tde_add_library( themepage STATIC_PIC AUTOMOC + SOURCES +- themepage.cpp previewwidget.cpp ++ themepage.cpp previewwidget.cpp ../../krdb/krdb.cpp ++ LINK Xfixes + ) diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec index 59dc174f8..0b2886e85 100644 --- a/redhat/tdebase/tdebase-14.0.0.spec +++ b/redhat/tdebase/tdebase-14.0.0.spec @@ -83,6 +83,8 @@ Patch4: tdebase-14.0.0-kickoff_default_favs.patch ## [kdebase] Changes konsole default word separator Patch5: tdebase-14.0.0-konsole_wordseps.patch +Patch10: tdebase-14.0.0-kcm_xcursor_applytheme.patch + # Patches from Mandriva Patch101: tdebase-14.0.0-vibrate_dialog.patch Patch102: tdebase-14.0.0-kcontrol_menu_entry.patch @@ -3207,6 +3209,8 @@ Windows and Samba shares. %patch3 -p1 -b .displayconfigtranslation %patch4 -p1 -b .kickoffdefaultsfav %patch5 -p1 -b .konsolewordseps +%patch10 -p1 -b .kcmxcursor + %patch101 -p1 -b .vibrate_dialog %patch102 -p1 -b .kcontrol_menu_entry diff --git a/redhat/tdebase/tdebase-3.5.13.2.spec b/redhat/tdebase/tdebase-3.5.13.2.spec index 48e7b887a..3cd8e267a 100644 --- a/redhat/tdebase/tdebase-3.5.13.2.spec +++ b/redhat/tdebase/tdebase-3.5.13.2.spec @@ -24,7 +24,7 @@ Name: trinity-tdebase Version: 3.5.13.2 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}%{?_variant} License: GPL Summary: Trinity Base Programs Group: User Interface/Desktops @@ -97,6 +97,8 @@ Patch8: tdebase-3.5.13.2-kickoff_default_favs.patch ## [kdebase/kcontrol] Adds FR translation for KCM ICC Patch9: tdebase-3.5.13.2-displayconfig_translation.patch +Patch10: tdebase-3.5.13.2-kcm_xcursor_applytheme.patch + # Patches from Mandriva Patch101: tdebase-3.5.13.2-vibrate_dialog.patch Patch102: tdebase-3.5.13.2-kcontrol_menu_entry.patch @@ -3260,6 +3262,7 @@ Windows and Samba shares. %patch7 -p1 -b .pid %patch8 -p1 -b .kickoff_default_favs %patch9 -p1 -b .translation +%patch10 -p1 -b .kcmxcursor %patch101 -p1 -b .vibrate_dialog %patch102 -p1 -b .kcontrol_menu_entry diff --git a/redhat/tdebindings/tdebindings-14.0.0.spec b/redhat/tdebindings/tdebindings-14.0.0.spec index 4905daf9f..62499b50d 100644 --- a/redhat/tdebindings/tdebindings-14.0.0.spec +++ b/redhat/tdebindings/tdebindings-14.0.0.spec @@ -433,7 +433,7 @@ This package is part of the official TDE bindings module. ########## %package -n trinity-libsmoketqt-devel -Summary: SMOKE Binding Library to Qt - Development Files +Summary: SMOKE Binding Library to TQt - Development Files Group: Development/Libraries Requires: trinity-libsmoketqt = %{version}-%{release} diff --git a/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch b/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch new file mode 100644 index 000000000..055cac6a8 --- /dev/null +++ b/redhat/tdelibs/tdelibs-14.0.0-devkitpower_support.patch @@ -0,0 +1,153 @@ +--- tdelibs/CMakeLists.txt.OR 2013-07-24 10:36:44.409135030 +0200 ++++ tdelibs/CMakeLists.txt 2013-07-24 10:37:09.619389250 +0200 +@@ -83,6 +83,7 @@ + OPTION( WITH_GCC_VISIBILITY "Enable fvisibility and fvisibility-inlines-hidden" ${WITH_ALL_OPTIONS} ) + OPTION( WITH_INOTIFY "Enable inotify support for tdeio" ON ) + OPTION( WITH_GAMIN "Enable FAM/GAMIN support" ${WITH_ALL_OPTIONS} ) ++option( WITH_DEVKITPOWER "Enable DevKit Power support" OFF ) + option( WITH_UPOWER "Enable uPower support" ${WITH_ALL_OPTIONS} ) + option( WITH_UDISKS "Enable uDisks support" ${WITH_ALL_OPTIONS} ) + option( WITH_UDISKS2 "Enable uDisks2 support" ${WITH_ALL_OPTIONS} ) +--- tdelibs/tdecore/CMakeLists.txt.ORI 2013-07-24 10:40:06.480153460 +0200 ++++ tdelibs/tdecore/CMakeLists.txt 2013-07-24 10:40:38.037254501 +0200 +@@ -21,6 +21,13 @@ + + if( WITH_UPOWER ) + add_definitions( -DWITH_UPOWER ) ++endif ( ) ++ ++if( WITH_DEVKITPOWER ) ++ add_definitions( -DWITH_DEVKITPOWER ) ++endif ( ) ++ ++if( WITH_UPOWER OR WITH_DEVKITPOWER ) + set ( TDEUPOWER_INCLUDE_DIRECTORIES + ${DBUS_TQT_INCLUDE_DIRS} + ) +--- tdelibs/tdecore/tdehardwaredevices.cpp.ORI 2013-07-24 10:42:27.499248218 +0200 ++++ tdelibs/tdecore/tdehardwaredevices.cpp 2013-07-24 10:55:02.895355871 +0200 +@@ -70,13 +70,13 @@ + #endif // WITH_NETWORK_MANAGER_BACKEND + + // uPower and uDisks2 integration +-#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) ++#if defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_DEVKITPOWER) + #include <tqdbusdata.h> + #include <tqdbusmessage.h> + #include <tqdbusproxy.h> + #include <tqdbusvariant.h> + #include <tqdbusconnection.h> +-#endif // defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) ++#endif // defined(WITH_UPOWER) || defined(WITH_UDISKS) || defined(WITH_UDISKS2) || defined(WITH_DEVKITPOWER) + #if defined(WITH_UDISKS) || defined(WITH_UDISKS2) + #include <tqdbuserror.h> + #include <tqdbusdatamap.h> +@@ -85,6 +85,14 @@ + #if defined(WITH_UDISKS) + #include "tqdbusdatalist.h" + #endif // ddefined(WITH_UDISKS) ++#ifdef WITH_DEVKITPOWER ++#define DBUS_POWER_CONNECTION_NAME "org.freedesktop.DeviceKit.Power" ++#define DBUS_POWER_OBJECT_PATH "/org/freedesktop/DeviceKit/Power" ++#endif // WITH_DEVKITPOWER ++#ifdef WITH_UPOWER ++#define DBUS_POWER_CONNECTION_NAME "org.freedesktop.UPower" ++#define DBUS_POWER_OBJECT_PATH "/org/freedesktop/UPower" ++#endif // WITH_UPOWER + + // BEGIN BLOCK + // Copied from include/linux/genhd.h +@@ -1364,10 +1372,10 @@ + } + } + else { +-#ifdef WITH_UPOWER ++#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); + if (dbusConn.isConnected()) { +- TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn); ++ TQT_DBusProxy upowerProperties(DBUS_POWER_CONNECTION_NAME, DBUS_POWER_OBJECT_PATH, "org.freedesktop.DBus.Properties", dbusConn); + if (upowerProperties.canSend()) { + // can suspend? + TQValueList<TQT_DBusData> params; +@@ -1387,9 +1395,9 @@ + else { + return FALSE; + } +-#else // WITH_UPOWER ++#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + return FALSE; +-#endif// WITH_UPOWER ++#endif// defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + } + } + +@@ -1405,10 +1413,10 @@ + } + } + else { +-#ifdef WITH_UPOWER ++#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + TQT_DBusConnection dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); + if (dbusConn.isConnected()) { +- TQT_DBusProxy upowerProperties("org.freedesktop.UPower", "/org/freedesktop/UPower", "org.freedesktop.DBus.Properties", dbusConn); ++ TQT_DBusProxy upowerProperties(DBUS_POWER_CONNECTION_NAME, DBUS_POWER_OBJECT_PATH, "org.freedesktop.DBus.Properties", dbusConn); + if (upowerProperties.canSend()) { + // can hibernate? + TQValueList<TQT_DBusData> params; +@@ -1428,9 +1436,9 @@ + else { + return FALSE; + } +-#else // WITH_UPOWER ++#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + return FALSE; +-#endif// WITH_UPOWER ++#endif// defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + } + } + +@@ -1565,24 +1573,24 @@ + return true; + } + else { +-#ifdef WITH_UPOWER ++#if defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + TQT_DBusConnection dbusConn; + dbusConn = TQT_DBusConnection::addConnection(TQT_DBusConnection::SystemBus); + if ( dbusConn.isConnected() ) { + if (ps == TDESystemPowerState::Suspend) { + TQT_DBusMessage msg = TQT_DBusMessage::methodCall( +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", ++ DBUS_POWER_CONNECTION_NAME, ++ DBUS_POWER_OBJECT_PATH, ++ DBUS_POWER_CONNECTION_NAME, + "Suspend"); + dbusConn.sendWithReply(msg); + return true; + } + else if (ps == TDESystemPowerState::Hibernate) { + TQT_DBusMessage msg = TQT_DBusMessage::methodCall( +- "org.freedesktop.UPower", +- "/org/freedesktop/UPower", +- "org.freedesktop.UPower", ++ DBUS_POWER_CONNECTION_NAME, ++ DBUS_POWER_OBJECT_PATH, ++ DBUS_POWER_CONNECTION_NAME, + "Hibernate"); + dbusConn.sendWithReply(msg); + return true; +@@ -1594,9 +1602,9 @@ + else { + return false; + } +-#else // WITH_UPOWER ++#else // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + return false; +-#endif // WITH_UPOWER ++#endif // defined(WITH_UPOWER) || defined(WITH_DEVKITPOWER) + } + } + else if (ps == TDESystemPowerState::PowerOff) { diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec index 8c6339f7c..adbb33814 100644 --- a/redhat/tdelibs/tdelibs-14.0.0.spec +++ b/redhat/tdelibs/tdelibs-14.0.0.spec @@ -41,6 +41,8 @@ Patch0: tdelibs-14.0.0-ftbfs.patch Patch1: tdelibs-14.0.0-fix_xdg_menu.patch # Fix battery charge detection Patch2: tdelibs-14.0.0-fix_battery_charge.patch +# Enable Devkit Power support (older than upower) +Patch3: tdelibs-14.0.0-devkitpower_support.patch # Patches from Mandriva Patch101: tdelibs-14.0.0-xdg_dirs_set_path.patch @@ -117,15 +119,30 @@ BuildRequires: bzip2-devel BuildRequires: libudev-devel # UDISKS support +%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 6 +%define with_udisks 1 +BuildRequires: udisks-devel Requires: udisks +%endif + +# PMOUNT support Requires: pmount -BuildRequires: udisks-devel # UDISKS2 support %if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} %define with_udisks2 1 -Requires: udisks2 BuildRequires: udisks2-devel +Requires: udisks2 +%endif + +# UPOWER support +%if 0%{?rhel} >= 6 +%define with_devkitpower 1 +Requires: DeviceKit-power +%endif +%if 0%{?fedora} || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion} +%define with_upower 1 +Requires: upower %endif # UTEMPTER support @@ -233,7 +250,7 @@ BuildRequires: xz-devel %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}nm-util-devel %endif -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?suse_version} BuildRequires: NetworkManager-glib-devel %endif %endif @@ -408,6 +425,7 @@ applications for TDE. %patch0 -p1 -b .ftbfs %patch1 -p1 -b .xdg %patch2 -p1 -b .batterycharge +%patch3 -p1 -b .devkitpower %patch101 -p1 -b .xdg_path %patch102 -p1 -b .cups_by_default @@ -459,8 +477,9 @@ cd build -DWITH_GCC_VISIBILITY=ON \ %{?!with_inotify:-DWITH_INOTIFY=OFF} \ %{?!with_gamin:-DWITH_GAMIN=OFF} \ - -DWITH_UPOWER=ON \ - -DWITH_UDISKS=ON \ + %{?with_devkitpower:-DWITH_DEVKITPOWER=ON} \ + %{?!with_upower:-DWITH_UPOWER=OFF} \ + %{?!with_udisks:-DWITH_UDISKS=OFF} \ %{?!with_udisks2:-DWITH_UDISKS2=OFF} \ -DWITH_CONSOLEKIT=ON \ %{?with_nm:-DWITH_NETWORK_MANAGER_BACKEND=ON} \ diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 4e2a9b099..edaa7d881 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -833,7 +833,7 @@ task. %{tde_datadir}/services/kinetd_krfb.desktop %{tde_datadir}/services/kinetd_krfb_httpd.desktop %{tde_datadir}/servicetypes/kinetdmodule.desktop -%{tde_tdedocdir}/HTML/en/krfb +%{tde_tdedocdir}/HTML/en/krfb/ %post -n trinity-krfb for f in crystalsvg locolor ; do diff --git a/redhat/tdeutils/tdeutils-14.0.0.spec b/redhat/tdeutils/tdeutils-14.0.0.spec index 4c141359a..dea9bd648 100644 --- a/redhat/tdeutils/tdeutils-14.0.0.spec +++ b/redhat/tdeutils/tdeutils-14.0.0.spec @@ -88,7 +88,7 @@ BuildRequires: libXtst-devel Requires: trinity-ark = %{version}-%{release} Requires: trinity-kcalc = %{version}-%{release} Requires: trinity-kcharselect = %{version}-%{release} -Requires: trinity-kdelirc = %{version}-%{release} +Requires: trinity-tdelirc = %{version}-%{release} Requires: trinity-tdessh = %{version}-%{release} Requires: trinity-kdf = %{version}-%{release} Requires: trinity-kedit = %{version}-%{release} @@ -111,7 +111,7 @@ Utilities for the Trinity Desktop Environment, including: * ark (tar/gzip archive manager) * kcalc (scientific calculator) * kcharselect (character selector) - * kdepasswd (change password) + * tdelirc (infrared control) * tdessh (ssh front end) * kdf (view disk usage) * kedit (simple text editor) @@ -271,14 +271,17 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : ########## -%package -n trinity-kdelirc +%package -n trinity-tdelirc Summary: infrared control for Trinity Group: Applications/Utilities -%description -n trinity-kdelirc +Obsoletes: trinity-kdelirc < %{version}-%{release} +Provides: trinity-kdelirc = %{version}-%{release} + +%description -n trinity-tdelirc This is a frontend for the LIRC suite to use infrared devices with TDE. -%files -n trinity-kdelirc +%files -n trinity-tdelirc %defattr(-,root,root,-) %{tde_bindir}/irkick %{tde_tdelibdir}/irkick.la @@ -305,7 +308,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE. %{tde_tdedocdir}/HTML/en/irkick/ %{tde_tdedocdir}/HTML/en/kcmlirc/ -%post -n trinity-kdelirc +%post -n trinity-tdelirc /sbin/ldconfig for f in hicolor locolor ; do touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: @@ -313,7 +316,7 @@ for f in hicolor locolor ; do done update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : -%postun -n trinity-kdelirc +%postun -n trinity-tdelirc /sbin/ldconfig for f in hicolor locolor ; do touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||: |