From 885623cf40aa8649f157f03bbb7f5e54dffbf459 Mon Sep 17 00:00:00 2001 From: Francois Andriot Date: Tue, 29 Nov 2011 23:11:51 +0100 Subject: [PATCH] RHEL/Fedora: add bibletime, ktorrent, rosegarden, wlassistant --- .../amarok-3.5.13-enable_riokarma.patch | 19 ++ .../bibletime/trinity-bibletime.spec | 121 +++++++++++++ .../ktorrent/trinity-ktorrent.spec | 144 +++++++++++++++ .../rosegarden/rosegarden-3.5.13-ftbfs.patch | 10 ++ .../rosegarden/trinity-rosegarden.spec | 164 ++++++++++++++++++ .../wlassistant/trinity-wlassistant.spec | 123 +++++++++++++ redhat/components.txt | 18 +- 7 files changed, 592 insertions(+), 7 deletions(-) create mode 100644 redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch create mode 100644 redhat/applications/bibletime/trinity-bibletime.spec create mode 100644 redhat/applications/ktorrent/trinity-ktorrent.spec create mode 100644 redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch create mode 100644 redhat/applications/rosegarden/trinity-rosegarden.spec create mode 100644 redhat/applications/wlassistant/trinity-wlassistant.spec diff --git a/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch new file mode 100644 index 000000000..7bbd11fca --- /dev/null +++ b/redhat/applications/amarok/amarok-3.5.13-enable_riokarma.patch @@ -0,0 +1,19 @@ +--- amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt.ORI 2011-11-28 21:59:41.607054279 +0100 ++++ amarok/amarok/src/mediadevice/riokarma/CMakeLists.txt 2011-11-28 21:59:50.413975791 +0100 +@@ -9,7 +9,7 @@ + # + ################################################# + +-tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" ) ++#tde_message_fatal( "riokarma support is not buildable, it needs to link to karma-sharp.dll" ) + + include( ConfigureChecks.cmake ) + +@@ -38,6 +38,6 @@ + + tde_add_kpart( libamarok_riokarma-mediadevice AUTOMOC + SOURCES riokarmamediadevice.cpp +- LINK amarok-shared ${KARMA_LIBRARIES} ++ LINK amarok-shared ${KARMA_LIBRARIES} karma + DESTINATION ${PLUGIN_INSTALL_DIR} + ) diff --git a/redhat/applications/bibletime/trinity-bibletime.spec b/redhat/applications/bibletime/trinity-bibletime.spec new file mode 100644 index 000000000..d18884140 --- /dev/null +++ b/redhat/applications/bibletime/trinity-bibletime.spec @@ -0,0 +1,121 @@ +# Default version for this component +%define kdecomp bibletime +%define version 1.6.6.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: A bible study tool for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.trinitydesktop.org + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: sword-devel +Requires: sword + +%description +BibleTime is a free and easy to use bible study tool for UNIX systems. +It requires a working KDE environment and the SWORD library. +BibleTime provides easy handling of digitized texts (Bibles, commentaries +and lexicons) and powerful features to work with these texts (search in +texts, write own notes, save, print etc.). + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + +# Not SMP safe ! +%__make -C bibletime/frontend + +# SMP safe ! +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/pics/* +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/bibletimeui.rc +%__chmod 644 %{buildroot}%{_datadir}/apps/bibletime/tips + + + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/bibletime +%{_includedir}/bibletimeinterface.h +%{_datadir}/applications/bibletime.desktop +%{_datadir}/apps/bibletime +%{tde_docdir}/HTML/en/bibletime/ +%{_datadir}/icons/hicolor/*/*/*.png + + +%Changelog +* Tue Nov 29 2011 Francois Andriot - 1.6.6.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/ktorrent/trinity-ktorrent.spec b/redhat/applications/ktorrent/trinity-ktorrent.spec new file mode 100644 index 000000000..3ca5c5958 --- /dev/null +++ b/redhat/applications/ktorrent/trinity-ktorrent.spec @@ -0,0 +1,144 @@ +# Default version for this component +%define kdecomp ktorrent +%define version 2.2.6 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: BitTorrent client for Trinity +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://ktorrent.org + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + + +%description +KTorrent is a BitTorrent program for Trinity. Its features include speed capping +(both down and up), integrated searching, UDP tracker support, preview of +certain file types (video and audio) and integration into the KDE Panel +enabling background downloading. + + +%prep +%setup -q -n applications/%{kdecomp} + +# 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,%{_includedir}/tqt,g" \ + -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__make -f "admin/Makefile.common" + + +%build +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +%configure \ + --disable-rpath \ + --with-extra-includes=%{_includedir}/tqt + + +# Not SMP safe ! +%__make + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} + + +%find_lang %{kdecomp} + + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +/sbin/ldconfig || : + + +%files -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_bindir}/ktcachecheck +%{_bindir}/ktorrent +%{_bindir}/ktshell +%{_bindir}/kttorinfo +%{_bindir}/ktupnptest +%{_libdir}/libktorrent-2.2.6.so +%{_libdir}/libktorrent.la +%{_libdir}/libktorrent.so +%{tde_libdir}/ktinfowidgetplugin.la +%{tde_libdir}/ktinfowidgetplugin.so +%{tde_libdir}/ktipfilterplugin.la +%{tde_libdir}/ktipfilterplugin.so +%{tde_libdir}/ktlogviewerplugin.la +%{tde_libdir}/ktlogviewerplugin.so +%{tde_libdir}/ktpartfileimportplugin.la +%{tde_libdir}/ktpartfileimportplugin.so +%{tde_libdir}/ktrssfeedplugin.la +%{tde_libdir}/ktrssfeedplugin.so +%{tde_libdir}/ktscanfolderplugin.la +%{tde_libdir}/ktscanfolderplugin.so +%{tde_libdir}/ktschedulerplugin.la +%{tde_libdir}/ktschedulerplugin.so +%{tde_libdir}/ktsearchplugin.la +%{tde_libdir}/ktsearchplugin.so +%{tde_libdir}/ktstatsplugin.la +%{tde_libdir}/ktstatsplugin.so +%{tde_libdir}/ktupnpplugin.la +%{tde_libdir}/ktupnpplugin.so +%{tde_libdir}/ktwebinterfaceplugin.la +%{tde_libdir}/ktwebinterfaceplugin.so +%{_datadir}/applications/kde/ktorrent.desktop +%{_datadir}/apps/ktorrent +%{_datadir}/config.kcfg/*.kcfg +%{_datadir}/icons/hicolor/*/*/*.png +%{_datadir}/icons/hicolor/*/*/*.svgz +%{_datadir}/services/*.desktop +%{_datadir}/servicetypes/ktorrentplugin.desktop + + +%Changelog +* Tue Nov 29 2011 Francois Andriot - 2.2.6-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch new file mode 100644 index 000000000..6967f300c --- /dev/null +++ b/redhat/applications/rosegarden/rosegarden-3.5.13-ftbfs.patch @@ -0,0 +1,10 @@ +--- rosegarden/src/CMakeLists.txt.ORI 2011-11-26 23:09:57.776046683 +0100 ++++ rosegarden/src/CMakeLists.txt 2011-11-26 23:10:07.534844583 +0100 +@@ -148,6 +148,7 @@ + + TARGET_LINK_LIBRARIES(rosegarden + dl ++ fontconfig + lo + ${QT_AND_KDECORE_LIBS} + ${LIBLO_LIBS} diff --git a/redhat/applications/rosegarden/trinity-rosegarden.spec b/redhat/applications/rosegarden/trinity-rosegarden.spec new file mode 100644 index 000000000..3c42931f9 --- /dev/null +++ b/redhat/applications/rosegarden/trinity-rosegarden.spec @@ -0,0 +1,164 @@ +# Default version for this component +%define kdecomp rosegarden +%define version 1.7.0 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: music editor and MIDI/audio sequencer [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Multimedia + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://www.rosegardenmusic.com/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz +Patch0: rosegarden-3.5.13-ftbfs.patch + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: fftw-devel +BuildRequires: dssi-devel +BuildRequires: liblo-devel +BuildRequires: liblrdf-devel +BuildRequires: fontconfig-devel + +Requires: lilypond +Requires: perl-XML-Twig +Requires: libsndfile-utils + +# LIRC does not exist on RHEL. +%if 0%{?fedora} > 0 +BuildRequires: lirc-devel +%endif + +Requires: %{name}-data == %{version}-%{release} + +%description +Rosegarden is a KDE application which provides a mixed Audio/MIDI +sequencer (for playback and recording), a multi-track editor, music +editing using both piano-roll and score notation, MIDI file IO, +lilypond and Csound files export, etc. + +%package data +Group: Applications/Multimedia +Requires: %{name} == %{version}-%{release} +Summary: music editor and MIDI/audio sequencer data files [Trinity] + +%description data +Rosegarden is a KDE application which provides a mixed Audio/MIDI +sequencer (for playback and recording), a multi-track editor, music +editing using both piano-roll and score notation, MIDI file IO, +lilypond and Csound files export, etc. + +This package provides the data files necessary for running Rosegarden + + +%prep +%setup -q -n applications/%{kdecomp} +%patch0 -p1 + +# Hard-coded path to TQT binaries spotted !!! +%__sed -i CMakeLists.txt \ + -e "s,/usr/bin/uic-tqt,%{_bindir}/uic-tqt,g" \ + -e "s,/usr/bin/tmoc,%{_bindir}/tmoc,g" \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + +%build +unset QTDIR && . %{_sysconfdir}/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" +export CMAKE_INCLUDE_PATH="%{_includedir}:%{_includedir}/tqt" + +%__mkdir_p build +cd build +%cmake \ + -DWANT_DEBUG=OFF \ + -DWANT_FULLDBG=OFF \ + -DWANT_SOUND=ON \ + -DWANT_JACK=OFF \ + -DWANT_DSSI=ON \ +%if 0%{?fedora} > 0 + -DWANT_LIRC=ON \ +%else + -DWANT_LIRC=OFF \ +%endif + -DWANT_PCH=OFF \ + -DWANT_TEST=OFF \ + -DBUILD_ALL=ON \ + .. + +%__make %{?_smp_mflags} + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +%__make install DESTDIR=%{buildroot} -C build + + +%find_lang %{kdecomp} + +%clean +%__rm -rf %{buildroot} + + +%post +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%{_bindir}/rosegarden +%{_bindir}/rosegarden-audiofile-importer +%{_bindir}/rosegarden-lilypondview +%{_bindir}/rosegarden-project-package +%{_bindir}/rosegardensequencer + +%files data -f %{kdecomp}.lang +%defattr(-,root,root,-) +%{_datadir}/applications/kde/rosegarden.desktop +%{_datadir}/apps/profiles/rosegarden.profile.xml +%lang(en) %{tde_docdir}/HTML/en/rosegarden +%lang(es) %{tde_docdir}/HTML/es/rosegarden +%lang(ja) %{tde_docdir}/HTML/ja/rosegarden +%lang(sv) %{tde_docdir}/HTML/sv/rosegarden +%{_datadir}/apps/rosegarden +%{_datadir}/icons/*/*/*/* +%{_datadir}/mimelnk/audio/x-rosegarden-device.desktop +%{_datadir}/mimelnk/audio/x-rosegarden.desktop +%{_datadir}/mimelnk/audio/x-rosegarden21.desktop +%{_datadir}/mimelnk/audio/x-soundfont.desktop + + +%Changelog +* Sat Nov 26 2011 Francois Andriot - 1.7.0-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/applications/wlassistant/trinity-wlassistant.spec b/redhat/applications/wlassistant/trinity-wlassistant.spec new file mode 100644 index 000000000..85276e5ec --- /dev/null +++ b/redhat/applications/wlassistant/trinity-wlassistant.spec @@ -0,0 +1,123 @@ +# Default version for this component +%define kdecomp wlassistant +%define version 0.5.7 +%define release 1 + +# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". +%if "%{?_prefix}" != "/usr" +%define _variant .opt +%define _docdir %{_prefix}/share/doc +%endif + +# TDE 3.5.13 specific building variables +BuildRequires: autoconf automake libtool m4 +%define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde +%define tde_libdir %{_libdir}/trinity + + +Name: trinity-%{kdecomp} +Summary: User friendly KDE frontend for wireless network connection [Trinity] +Version: %{?version} +Release: %{?release}%{?dist}%{?_variant} + +License: GPLv2+ +Group: Applications/Utilities + +Vendor: Trinity Project +Packager: Francois Andriot +URL: http://wlassistant.sourceforge.net/ + +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Source0: %{kdecomp}-3.5.13.tar.gz + +BuildRequires: tqtinterface-devel +BuildRequires: trinity-kdelibs-devel +BuildRequires: trinity-kdebase-devel +BuildRequires: desktop-file-utils +BuildRequires: gettext + +BuildRequires: python +BuildRequires: scons + +%description +Wireless Assistant scans for wireless access points and displays link quality, +encryption and other useful information. When user wants to connect to a +network, Wireless Assistant opens up its wizards and guides the user through +Wi-Fi settings. After a successful connection is made the settings are +remembered so next time the user won't have to enter them again. + + +%prep +%setup -q -n applications/%{kdecomp} + +# Ugly hack to modify TQT include directory inside SCONS files. +# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! +%__sed -i bksys/kde.py \ + -e "s,/usr/include/tqt,%{_includedir}/tqt,g" + + +%build +unset QTDIR; . /etc/profile.d/qt.sh +export PATH="%{_bindir}:${PATH}" +export LDFLAGS="-L%{_libdir} -I%{_includedir}" + +scons configure \ + prefix=%{_prefix} \ + execprefix=%{_bindir} \ + libdir=%{_libdir} \ + qtdir=${QTDIR} \ + kdedir=%{_prefix} \ + kdeincludes=%{_includedir} \ + qtincludes=${QTINC} \ + kdelibs=%{_libdir} \ + qtlibs=${QTLIB} \ + extraincludes=%{_includedir}:%{_includedir}/tqt:${QTINC} + +scons -j4 + + +%install +export PATH="%{_bindir}:${PATH}" +%__rm -rf %{buildroot} +scons install DESTDIR=%{buildroot} + +%clean +%__rm -rf %{buildroot} + + +%post +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + +%postun +/sbin/ldconfig +touch --no-create %{_datadir}/icons/hicolor || : +gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + + +%files +%defattr(-,root,root,-) +%doc ChangeLog VERSION +%{_bindir}/wlassistant +%{_datadir}/applnk/Utilities/wlassistant.desktop +%{_datadir}/icons/hicolor/16x16/apps/wlassistant.png +%{_datadir}/icons/hicolor/32x32/apps/wlassistant.png +%lang(ar) %{_datadir}/locale/ar/LC_MESSAGES/wlassistant.mo +%lang(ca) %{_datadir}/locale/ca/LC_MESSAGES/wlassistant.mo +%lang(es) %{_datadir}/locale/es/LC_MESSAGES/wlassistant.mo +%lang(fr) %{_datadir}/locale/fr/LC_MESSAGES/wlassistant.mo +%lang(nb) %{_datadir}/locale/nb/LC_MESSAGES/wlassistant.mo +%lang(pl) %{_datadir}/locale/pl/LC_MESSAGES/wlassistant.mo +%lang(pt) %{_datadir}/locale/pt_BR/LC_MESSAGES/wlassistant.mo +%lang(sv) %{_datadir}/locale/sv/LC_MESSAGES/wlassistant.mo +%lang(zh_CN) %{_datadir}/locale/zh_CN/LC_MESSAGES/wlassistant.mo +%lang(zh_TW) %{_datadir}/locale/zh_TW/LC_MESSAGES/wlassistant.mo + + +%Changelog +* Tue Nov 29 2011 Francois Andriot - 0.5.7-1 +- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16 diff --git a/redhat/components.txt b/redhat/components.txt index 10fb6ad96..3ba0b44a4 100644 --- a/redhat/components.txt +++ b/redhat/components.txt @@ -1,3 +1,7 @@ +libraries/libkdcraw +libraries/libkexiv2 +libraries/libkipi +libraries/libksquirrel qt3 dependencies/libcaldav dependencies/libcarddav @@ -27,9 +31,9 @@ kdeedu kdeaddons kdewebdev kde-i18n -libraries/libkdcraw -libraries/libkexiv2 -libraries/libkipi +extras/ksensors +extras/libkarma +#extras/libkexif applications/k3b applications/abakus applications/dolphin @@ -43,7 +47,7 @@ applications/kdiff3 #applications/kuickshow applications/basket applications/katapult -#compizconfig-backend-kconfig +#applications/compizconfig-backend-kconfig applications/kbookreader applications/kdbusnotification applications/kmymoney @@ -51,7 +55,6 @@ applications/kstreamripper applications/kdesudo applications/digikam applications/konversation -extras/ksensors applications/amarok applications/kaffeine applications/knetworkmanager @@ -68,8 +71,6 @@ applications/kcpuload applications/fusion-icon applications/ksplash-engine-moodin applications/knights -libraries/libksquirrel -#extras/libkexif applications/ksquirrel applications/gtk-qt-engine applications/koffice @@ -83,3 +84,6 @@ applications/knemo applications/kerry applications/kvirc applications/rosegarden +applications/wlassistant +applications/ktorrent +applications/bibletime