From 3792651f66effac697d6db240c6475259a4cfa0a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Feb 03 2014 00:56:08 +0000 Subject: Merge branch 'master' into f20 --- diff --git a/.gitignore b/.gitignore index 226d26d..0072b60 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ /kde-baseapps-4.11.3.tar.xz +/kde-baseapps-4.11.90.tar.xz +/kde-baseapps-4.11.95.tar.xz +/kde-baseapps-4.11.97.tar.xz +/kde-baseapps-4.12.0.tar.xz +/kde-baseapps-4.12.1.tar.xz +/kde-baseapps-4.12.2.tar.xz diff --git a/0001-Fix-Bug-287983-Dolphin-truncates-tooltip-information.patch b/0001-Fix-Bug-287983-Dolphin-truncates-tooltip-information.patch deleted file mode 100644 index 8c52b99..0000000 --- a/0001-Fix-Bug-287983-Dolphin-truncates-tooltip-information.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 1af756f101d099592df25ddaaf1c34d63633f3a3 Mon Sep 17 00:00:00 2001 -From: Emmanuel Pescosta -Date: Sat, 2 Nov 2013 00:12:33 +0100 -Subject: [PATCH 1/2] Fix Bug 287983 - Dolphin truncates tooltip information - for long file names - -Use KStringHandler and QTextLayout to wrap the text (file name) -into the maximum width of the label "name". - -Make use of QFontMetrics to calculate a font size aware tooltip size. - -BUG: 287983 -FIXED-IN: 4.11.3 -REVIEW: 113101 ---- - dolphin/src/views/tooltips/filemetadatatooltip.cpp | 37 +++++++++++++++++++++- - 1 file changed, 36 insertions(+), 1 deletion(-) - -diff --git a/dolphin/src/views/tooltips/filemetadatatooltip.cpp b/dolphin/src/views/tooltips/filemetadatatooltip.cpp -index c22f6be..67911ee 100644 ---- a/dolphin/src/views/tooltips/filemetadatatooltip.cpp -+++ b/dolphin/src/views/tooltips/filemetadatatooltip.cpp -@@ -24,11 +24,15 @@ - #include - #include - #include -+#include - - #include - #include - #include - #include -+#include -+#include -+#include - - #ifndef HAVE_NEPOMUK - #include -@@ -56,10 +60,15 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) : - m_name = new QLabel(this); - m_name->setForegroundRole(QPalette::ToolTipText); - m_name->setTextFormat(Qt::PlainText); -+ m_name->setAlignment(Qt::AlignHCenter); -+ - QFont font = m_name->font(); - font.setBold(true); - m_name->setFont(font); - -+ QFontMetrics fontMetrics(font); -+ m_name->setMaximumWidth(fontMetrics.averageCharWidth() * 40); -+ - // Create widget for the meta data - #ifndef HAVE_NEPOMUK - m_fileMetaDataWidget = new KFileMetaDataWidget(this); -@@ -108,7 +117,33 @@ QPixmap FileMetaDataToolTip::preview() const - - void FileMetaDataToolTip::setName(const QString& name) - { -- m_name->setText(name); -+ QTextOption textOption; -+ textOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere); -+ -+ const QString processedName = Qt::mightBeRichText(name) ? name : KStringHandler::preProcessWrap(name); -+ -+ QTextLayout textLayout(processedName); -+ textLayout.setFont(m_name->font()); -+ textLayout.setTextOption(textOption); -+ -+ QString wrappedText; -+ wrappedText.reserve(processedName.length()); -+ -+ // wrap the text to fit into the maximum width of m_name -+ textLayout.beginLayout(); -+ QTextLine line = textLayout.createLine(); -+ while (line.isValid()) { -+ line.setLineWidth(m_name->maximumWidth()); -+ wrappedText += processedName.mid(line.textStart(), line.textLength()); -+ -+ line = textLayout.createLine(); -+ if (line.isValid()) { -+ wrappedText += QChar::LineSeparator; -+ } -+ } -+ textLayout.endLayout(); -+ -+ m_name->setText(wrappedText); - } - - QString FileMetaDataToolTip::name() const --- -1.8.4.2 - diff --git a/0002-Revert-Files-passed-as-arguments-Ignore-unsupported-.patch b/0002-Revert-Files-passed-as-arguments-Ignore-unsupported-.patch deleted file mode 100644 index 9620cb8..0000000 --- a/0002-Revert-Files-passed-as-arguments-Ignore-unsupported-.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 1c856e44774a7ce8eb6dce6828ef689647f83ca4 Mon Sep 17 00:00:00 2001 -From: Wolfgang Bauer -Date: Wed, 6 Nov 2013 16:46:09 +0100 -Subject: [PATCH 2/2] Revert "Files passed as arguments: Ignore unsupported - files" - -This reverts commit cd9e50ae4f3ded5a78d0cfb09a67684a9c15d726. - -See bug#327224 for details. ---- - dolphin/src/dolphinmainwindow.cpp | 23 +++++------------------ - 1 file changed, 5 insertions(+), 18 deletions(-) - -diff --git a/dolphin/src/dolphinmainwindow.cpp b/dolphin/src/dolphinmainwindow.cpp -index 9da73f9..b477600 100644 ---- a/dolphin/src/dolphinmainwindow.cpp -+++ b/dolphin/src/dolphinmainwindow.cpp -@@ -31,7 +31,6 @@ - #include "panels/information/informationpanel.h" - #include "settings/dolphinsettingsdialog.h" - #include "statusbar/dolphinstatusbar.h" --#include "views/dolphinview.h" - #include "views/dolphinviewactionhandler.h" - #include "views/dolphinremoteencoding.h" - #include "views/draganddrophelper.h" -@@ -244,20 +243,8 @@ void DolphinMainWindow::openDirectories(const QList& dirs) - return; - } - -- // dirs could contain URLs that actually point to archives or other files. -- // Replace them by URLs we can open where possible and filter the rest out. -- QList urlsToOpen; -- foreach (const KUrl& rawUrl, dirs) { -- const KFileItem& item = KFileItem(KFileItem::Unknown, KFileItem::Unknown, rawUrl); -- item.determineMimeType(); -- const KUrl& url = DolphinView::openItemAsFolderUrl(item); -- if (!url.isEmpty()) { -- urlsToOpen.append(url); -- } -- } -- -- if (urlsToOpen.count() == 1) { -- m_activeViewContainer->setUrl(urlsToOpen.first()); -+ if (dirs.count() == 1) { -+ m_activeViewContainer->setUrl(dirs.first()); - return; - } - -@@ -267,12 +254,12 @@ void DolphinMainWindow::openDirectories(const QList& dirs) - - // Open each directory inside a new tab. If the "split view" option has been enabled, - // always show two directories within one tab. -- QList::const_iterator it = urlsToOpen.begin(); -- while (it != urlsToOpen.end()) { -+ QList::const_iterator it = dirs.begin(); -+ while (it != dirs.end()) { - openNewTab(*it); - ++it; - -- if (hasSplitView && (it != urlsToOpen.end())) { -+ if (hasSplitView && (it != dirs.end())) { - const int tabIndex = m_viewTab.count() - 1; - m_viewTab[tabIndex].secondaryView->setUrl(*it); - ++it; --- -1.8.4.2 - diff --git a/kde-baseapps-4.12.2-bz#609039.patch b/kde-baseapps-4.12.2-bz#609039.patch new file mode 100644 index 0000000..d658ce2 --- /dev/null +++ b/kde-baseapps-4.12.2-bz#609039.patch @@ -0,0 +1,28 @@ +diff -up kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp.bz#609039 kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp +--- kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp.bz#609039 2014-01-30 15:10:31.000000000 -0600 ++++ kde-baseapps-4.12.2/kdepasswd/kcm/chfnprocess.cpp 2014-02-01 21:33:15.140447271 -0600 +@@ -63,19 +63,16 @@ int ChfnProcess::ConverseChfn(const char + break; + } + +- if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ ) ++ if ( line.contains( "Changing finger info" ) ) ++ { ++ // do nothing ++ } ++ else if ( line.contains( "Password: " )/*isPrompt( line, "password" )*/ ) + { + WaitSlave(); + write(fd(), pass, strlen(pass)); + write(fd(), "\n", 1); + } +- +- line = readLine(); // Let's see what the outcome was +- +- if ( line.contains( "Changing finger info" ) ) +- { +- // do nothing +- } + else if ( line.contains( "information changed" ) ) + { + status=0; diff --git a/kde-baseapps.spec b/kde-baseapps.spec index a0fd775..3b52fd2 100644 --- a/kde-baseapps.spec +++ b/kde-baseapps.spec @@ -1,9 +1,13 @@ + +# trim changelog included in binary rpms +%global _changelog_trimtime %(date +%s -d "1 year ago") + Name: kde-baseapps Summary: KDE Core Applications -Version: 4.11.3 +Version: 4.12.2 Release: 2%{?dist} -License: GPLv2 +License: GPLv2 and GFDL URL: https://projects.kde.org/projects/kde/kde-baseapps %global revision %(echo %{version} | cut -d. -f3) %if %{revision} >= 50 @@ -23,25 +27,26 @@ Patch2: kdebase-4.2.1-home-icon.patch # fix disabling automatic spell checking in the Konqueror UI (kde#228593) Patch3: kdebase-4.4.0-konqueror-kde#228593.patch +# Password & User account becomes non responding +Patch4: kde-baseapps-4.12.2-bz#609039.patch + # add x-scheme-handler/http for konqueror so it can be set # as default browser in GNOME Patch5: kde-baseapps-4.9.2-konqueror-mimetyp.patch +## upstream patches + # optional runtime dep for kcm_useraccount, see https://git.reviewboard.kde.org/r/110875/ %if 0%{?fedora} || 0%{?rhel} > 6 Requires: accountsservice %endif -## upstream patches -# some post v4.11.3 commits, one for regression -Patch101: 0001-Fix-Bug-287983-Dolphin-truncates-tooltip-information.patch -Patch102: 0002-Revert-Files-passed-as-arguments-Ignore-unsupported-.patch - %ifnarch s390 s390x Requires: eject %endif -Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} +# kdepasswd uses chfn +Requires: util-linux Obsoletes: kdebase < 6:4.7.97-10 Provides: kdebase = 6:%{version}-%{release} @@ -49,18 +54,6 @@ Provides: kdebase = 6:%{version}-%{release} Obsoletes: kdebase4 < %{version}-%{release} Provides: kdebase4 = %{version}-%{release} -Obsoletes: d3lphin -Obsoletes: dolphin < 1.0.2-1 -Provides: dolphin = %{version}-%{release} - -Obsoletes: kde-plasma-folderview < 6:4.3.1-1 -Provides: kde-plasma-folderview = %{?epoch:%{epoch}:}%{version}-%{release} - -Obsoletes: konq-plugins < 4.6.80-1 -Provides: konq-plugins = %{version}-%{release} - -Provides: konqueror = %{version}-%{release} - BuildRequires: desktop-file-utils BuildRequires: kactivities-devel >= %{version} BuildRequires: kdelibs4-devel >= %{version} @@ -72,39 +65,51 @@ BuildRequires: libtidy-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(libstreams) +BuildRequires: pkgconfig(soprano) +BuildRequires: pkgconfig(xrender) +BuildRequires: pkgconfig(zlib) + +Requires: %{name}-common = %{version}-%{release} +Requires: dolphin = %{version}-%{release} +Requires: kde-plasma-folderview = 6:%{version}-%{release} +Requires: kdepasswd = %{version}-%{release} +Requires: kdialog = %{version}-%{release} +Requires: keditbookmarks = %{version}-%{release} +Requires: kfind = %{version}-%{release} +Requires: konqueror = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} # for upgrade path, when konsole, kwrite were split out since 4.7.90 -# remove unconditional or f18+ only? (bug #834137) -- rex %if 0%{?fedora} < 17 && 0%{?rhel} < 7 Requires: konsole Requires: kwrite %endif %description -Core applications for KDE 4, including: +Metapackage for Core applications of KDE 4, including: dolphin : File manager -kdepasswd : Changes a UNIX password. +kdepasswd : Changes a UNIX password kdialog : Nice dialog boxes from shell scripts -keditbookmarks : Bookmark oranizer and editor +keditbookmarks : Bookmark organizer and editor kfind : File find utility -kfmclient : Tool for opening URLs from the command line konqueror : Web browser, file manager and document viewer +plasma_applet_folderview : folderview plasma applet -%package -n kde-plasma-folderview -Summary: FolderView plasma applet -Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -%description -n kde-plasma-folderview -%{summary}. +%package common +Summary: Common files for %{name} +Conflicts: kde-baseapps < 4.12.0-2 +BuildArch: noarch +%description common +%{summary} %package libs Summary: Runtime libraries for %{name} Obsoletes: kdebase-libs < 6:4.7.97-10 Provides: kdebase-libs < 6:%{version}-%{release} Provides: kdebase-libs%{?_isa} < 6:%{version}-%{release} -# lib(dolphin|konq) likely require appsdir resources, and other goodies -Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} -%{?_kde4_version:Requires: kdelibs4%{?_isa} >= %{_kde4_version}} +Requires: %{name}-common = %{version}-%{release} +Requires: dolphin-libs%{?_isa} = %{version}-%{release} +Requires: konqueror-libs%{?_isa} = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} %description libs %{summary}. @@ -114,11 +119,115 @@ Obsoletes: kdebase-devel < 6:4.7.97-10 Provides: kdebase-devel = 6:%{version}-%{release} Obsoletes: kdebase4-devel < %{version}-%{release} Provides: kdebase4-devel = %{version}-%{release} -Requires: %{name}-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} -Requires: kdelibs4-devel +Requires: %{name}-common = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} %description devel %{summary}. +%package -n dolphin +Summary: KDE File Manager +Obsoletes: d3lphin +Requires: %{name}-common = %{version}-%{release} +Requires: dolphin-libs%{?_isa} = %{version}-%{release} +Requires: kdialog = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n dolphin +This package contains the default file manager of KDE. + +%package -n dolphin-libs +Summary: Dolphin runtime libraries +Requires: dolphin = %{version}-%{release} +%description -n dolphin-libs +%{summary}. + +%package -n kdepasswd +Summary: Changes your UNIX password +Requires: %{name}-common = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n kdepasswd +This application allows you to change your UNIX password. + +%package -n kdialog +Summary: Nice dialog boxes from shell scripts +Requires: %{name}-common = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n kdialog +KDialog can be used to show nice dialog boxes from shell scripts. + +%package -n keditbookmarks +Summary: Bookmark organizer and editor +Requires: %{name}-common = %{version}-%{release} +Requires: keditbookmarks-libs%{?_isa} = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n keditbookmarks +%{summary}. + +%package -n keditbookmarks-libs +Summary: Dolphin runtime libraries +Requires: keditbookmarks = %{version}-%{release} +%description -n keditbookmarks-libs +%{summary}. + +%package -n kfind +Summary: KDE Find File Utility +Requires: %{name}-common = %{version}-%{release} +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n kfind +KFind allows you to search for directories and files. + +%package -n konqueror +Summary: KDE File Manager and Browser +Provides: %{name}-nsplugins = %{version}-%{release} +Requires: %{name}-common = %{version}-%{release} +# dolphinpart for embedded filemanagement +Requires: dolphin = %{version}-%{release} +Requires: konqueror-libs%{?_isa} = %{version}-%{release} +Requires: kdialog = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} +#Requires: kwebkitpart +Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +%description -n konqueror +Konqueror allows you to manage your files and browse the web in a +unified interface. + +%package -n konqueror-libs +Summary: Konqueror runtime libraries +Requires: konqueror = %{version}-%{release} +%description -n konqueror-libs +%{summary}. + +%package -n konqueror-devel +Summary: Development files for konqueror +Requires: konqueror-libs%{?_isa} = %{version}-%{release} +Requires: libkonq-devel%{?_isa} +Requires: kdelibs4-devel +%description -n konqueror-devel +%{summary}. + +%package -n libkonq +Summary: Libkonq shared resources +Requires: %{name}-common = %{version}-%{release} +Requires: kdelibs4%{?_isa}%{?_kde4_version: >= %{_kde4_version}} +%description -n libkonq +%{summary}. + +%package -n libkonq-devel +Summary: Development files for Libkonq +Requires: libkonq%{?_isa} = %{version}-%{release} +Requires: kdelibs4-devel +%description -n libkonq-devel +%{summary}. + +%package -n kde-plasma-folderview +# inherited epoch from old kdebase pkg :( +Epoch: 6 +Summary: FolderView plasma applet +Requires: %{name}-common = %{version}-%{release} +Requires: libkonq%{?_isa} = %{version}-%{release} +%description -n kde-plasma-folderview +%{summary}. + %prep %setup -q -n kde-baseapps-%{version} @@ -126,11 +235,9 @@ Requires: kdelibs4-devel %patch0 -p2 -b .nsplugins-paths %patch2 -p2 -b .home-icon %patch3 -p2 -b .kde#228593 +%patch4 -p1 -b .bz#609039 %patch5 -p1 -b .mimetyp.patch -%patch101 -p1 -b .0001 -%patch102 -p1 -b .0002 - %build mkdir -p %{_target_platform} @@ -142,7 +249,6 @@ make %{?_smp_mflags} -C %{_target_platform} %install -rm -rf %{buildroot} make install/fast DESTDIR=%{buildroot} -C %{_target_platform} # konquerorsu only show in KDE @@ -153,7 +259,10 @@ mkdir -p %{buildroot}%{_kde4_appsdir}/konqueror/{kpartplugins,icons,opensearch} ## unpackaged files # libs for which there is no (public) api -rm -f %{buildroot}%{_libdir}/lib{dolphin,kbookmarkmodel_,konqueror}private.so +rm -fv %{buildroot}%{_kde4_libdir}/lib{dolphin,kbookmarkmodel_,konqueror}private.so +# omit konqsidebarplugin api bits (for now), nothing uses it afaict -- rex +rm -fv %{buildroot}%{_kde4_libdir}/libkonqsidebarplugin.so +rm -fv %{buildroot}%{_kde4_includedir}/konqsidebarplugin.h # move devel symlinks mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel @@ -161,9 +270,9 @@ pushd %{buildroot}%{_kde4_libdir} for i in lib*.so do case "$i" in - libkonq.so|libkonqsidebarplugin.so) + libkonq.so) linktarget=`readlink "$i"` - rm -f "$i" + rm -fv "$i" ln -sf "../../$linktarget" "kde4/devel/$i" ;; *) @@ -180,7 +289,10 @@ for f in konqueror dolphin ; do bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/$f/index.cache done -%find_lang %{name} --all-name --with-kde --without-mo +%find_lang dolphin --with-kde --without-mo +%find_lang kdepasswd --with-kde --without-mo +%find_lang kfind --with-kde --without-mo +%find_lang konqueror --with-kde --without-mo %check @@ -189,10 +301,6 @@ for f in %{buildroot}%{_kde4_datadir}/applications/kde4/*.desktop ; do done -%clean -rm -rf %{buildroot} - - %post touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: @@ -211,26 +319,82 @@ if [ $1 -eq 0 ] ; then update-desktop-database -q &> /dev/null ||: fi -%files -f %{name}.lang -%doc COPYING + +%files +# empty metapackage + +%files libs +# empty metapackage + +%files common +%doc COPYING COPYING.DOC COPYING.LIB + +%posttrans -n dolphin +update-desktop-database -q &> /dev/null ||: + +%postun -n dolphin +if [ $1 -eq 0 ] ; then + update-desktop-database -q &> /dev/null ||: +fi + +%files -n dolphin -f dolphin.lang %{_kde4_bindir}/dolphin +%{_kde4_libdir}/libkdeinit4_dolphin.so +%{_kde4_bindir}/servicemenu* +%{_kde4_appsdir}/dolphin/ +%{_kde4_datadir}/applications/kde4/dolphin.desktop +%{_kde4_libdir}/kde4/kcm_dolphin*.so +%{_kde4_libdir}/kde4/kio_filenamesearch.so +%{_kde4_datadir}/config.kcfg/dolphin_*.kcfg +%{_kde4_appsdir}/dolphinpart/ +%{_kde4_libdir}/kde4/dolphinpart.so +%{_kde4_datadir}/kde4/services/dolphinpart.desktop +%{_kde4_configdir}/servicemenu.knsrc +%{_kde4_datadir}/kde4/services/kcmdolphinnavigation.desktop +%{_kde4_datadir}/kde4/services/filenamesearch.protocol +%{_kde4_datadir}/kde4/services/kcmdolphingeneral.desktop +%{_kde4_datadir}/kde4/services/kcmdolphinservices.desktop +%{_kde4_datadir}/kde4/services/kcmdolphinviewmodes.desktop +%{_kde4_datadir}/kde4/servicetypes/fileviewversioncontrolplugin.desktop +# stuff from konqueror/ source dir thats not konq-specific +%{_kde4_libdir}/kde4/kcm_kio.so +%{_kde4_datadir}/kde4/services/smb.desktop +%{_kde4_datadir}/applications/kde4/Home.desktop + +%post -n dolphin-libs -p /sbin/ldconfig +%postun -n dolphin-libs -p /sbin/ldconfig + +%files -n dolphin-libs +%{_kde4_libdir}/libdolphinprivate.so.4* + +%post -n konqueror +touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: +touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + +%posttrans -n konqueror +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: +update-desktop-database -q &> /dev/null ||: + +%postun -n konqueror +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/oxygen &> /dev/null ||: + update-desktop-database -q &> /dev/null ||: +fi + +%files -n konqueror -f konqueror.lang %{_kde4_bindir}/fsview -%{_kde4_bindir}/kbookmarkmerger -%{_kde4_bindir}/kdepasswd -%{_kde4_bindir}/kdialog -%{_kde4_bindir}/keditbookmarks -%{_kde4_bindir}/kfind %{_kde4_bindir}/kfmclient +%{_kde4_libdir}/libkdeinit4_kfmclient.so %{_kde4_bindir}/konqueror +%{_kde4_libdir}/libkdeinit4_konqueror.so %{_kde4_bindir}/nspluginscan %{_kde4_bindir}/nspluginviewer %{_kde4_bindir}/servicemenudeinstallation %{_kde4_bindir}/servicemenuinstallation -%{_kde4_datadir}/applications/kde4/Home.desktop -%{_kde4_datadir}/applications/kde4/dolphin.desktop -%{_kde4_datadir}/applications/kde4/kdepasswd.desktop -%{_kde4_datadir}/applications/kde4/keditbookmarks.desktop -%{_kde4_datadir}/applications/kde4/kfind.desktop %{_kde4_datadir}/applications/kde4/kfmclient.desktop %{_kde4_datadir}/applications/kde4/kfmclient_dir.desktop %{_kde4_datadir}/applications/kde4/kfmclient_html.desktop @@ -238,56 +402,213 @@ fi %{_kde4_datadir}/applications/kde4/konqbrowser.desktop %{_kde4_datadir}/applications/kde4/konquerorsu.desktop %{_kde4_appsdir}/akregator/ -%{_kde4_appsdir}/dolphin/ -%{_kde4_appsdir}/dolphinpart/ %{_kde4_appsdir}/domtreeviewer/ %{_kde4_appsdir}/fsview/ -%{_kde4_appsdir}/kbookmark/ %{_kde4_appsdir}/kcmcss/ %{_kde4_appsdir}/kcontrol/ -%{_kde4_appsdir}/kdm/ -%{_kde4_appsdir}/keditbookmarks/ -%{_kde4_appsdir}/khtml/ +%{_kde4_appsdir}/khtml/kpartplugins/ %{_kde4_appsdir}/konqsidebartng/ %{_kde4_appsdir}/konqueror/ -%{_kde4_appsdir}/kwebkitpart/ +%dir %{_kde4_appsdir}/kwebkitpart/ +%{_kde4_appsdir}/kwebkitpart/kpartplugins/ %{_kde4_appsdir}/nsplugin/ -%{_kde4_datadir}/config.kcfg/* -%{_datadir}/dbus-1/interfaces/* -%{_kde4_iconsdir}/hicolor/*/*/* -%{_kde4_iconsdir}/oxygen/*/*/* -%{_kde4_datadir}/kde4/services/*.desktop -%{_kde4_datadir}/kde4/services/*.protocol -%{_kde4_datadir}/kde4/services/ServiceMenus/ +%{_kde4_iconsdir}/hicolor/*/apps/fsview.* +%{_kde4_iconsdir}/hicolor/*/apps/konqueror.* +%{_kde4_iconsdir}/oxygen/*/actions/* %{_kde4_datadir}/kde4/services/kded/*.desktop %{_kde4_datadir}/kde4/services/useragentstrings/ -%{_kde4_datadir}/kde4/servicetypes/*.desktop -%{_kde4_libdir}/kde4/*.so -%{_mandir}/man1/kbookmarkmerger.1.gz -%{_mandir}/man1/kfind.1.gz +%{_kde4_datadir}/kde4/servicetypes/uasprovider.desktop +%{_kde4_datadir}/kde4/servicetypes/konqaboutpage.desktop %{_kde4_datadir}/autostart/konqy_preload.desktop -%{_kde4_configdir}/* -%{_kde4_datadir}/templates/*.desktop -%{_kde4_datadir}/templates/.source/* -%{_kde4_libdir}/libkdeinit4_*.so +%{_kde4_configdir}/konqsidebartngrc +%{_kde4_configdir}/translaterc +%{_kde4_libdir}/kde4/adblock.so +%{_kde4_libdir}/kde4/akregatorkonqfeedicon.so +%{_kde4_libdir}/kde4/autorefresh.so +%{_kde4_libdir}/kde4/babelfishplugin.so +%{_kde4_libdir}/kde4/dirfilterplugin.so +%{_kde4_libdir}/kde4/domtreeviewerplugin.so +%{_kde4_libdir}/kde4/fsviewpart.so +%{_kde4_libdir}/kde4/kcm_history.so +%{_kde4_libdir}/kde4/kcm_konq.so +%{_kde4_libdir}/kde4/kcm_konqhtml.so +%{_kde4_libdir}/kde4/kcm_kurifilt.so +%{_kde4_libdir}/kde4/kcm_performance.so +%{_kde4_libdir}/kde4/kded_konqy_preloader.so +%{_kde4_libdir}/kde4/khtmlkttsdplugin.so +%{_kde4_libdir}/kde4/khtmlsettingsplugin.so +%{_kde4_libdir}/kde4/kimgallery.so +%{_kde4_libdir}/kde4/konq_aboutpage.so +%{_kde4_libdir}/kde4/konq_shellcmdplugin.so +%{_kde4_libdir}/kde4/konq_sidebar.so +%{_kde4_libdir}/kde4/konq_sidebartree_bookmarks.so +%{_kde4_libdir}/kde4/konq_sidebartree_dirtree.so +%{_kde4_libdir}/kde4/konqsidebar_history.so +%{_kde4_libdir}/kde4/konqsidebar_places.so +%{_kde4_libdir}/kde4/konqsidebar_tree.so +%{_kde4_libdir}/kde4/konqsidebar_web.so +%{_kde4_libdir}/kde4/libkcminit_nsplugins.so +%{_kde4_libdir}/kde4/libnsplugin.so +%{_kde4_libdir}/kde4/minitoolsplugin.so +%{_kde4_libdir}/kde4/rellinksplugin.so +%{_kde4_libdir}/kde4/searchbarplugin.so +%{_kde4_libdir}/kde4/uachangerplugin.so +%{_kde4_libdir}/kde4/validatorsplugin.so +%{_kde4_libdir}/kde4/webarchiverplugin.so +%{_kde4_libdir}/kde4/webarchivethumbnail.so +%{_kde4_datadir}/config.kcfg/konqueror.kcfg +%{_kde4_datadir}/config.kcfg/validators.kcfg +%{_datadir}/dbus-1/interfaces/org.kde.FavIcon.xml +%{_datadir}/dbus-1/interfaces/org.kde.Konqueror.Main.xml +%{_datadir}/dbus-1/interfaces/org.kde.Konqueror.MainWindow.xml +%{_datadir}/dbus-1/interfaces/org.kde.konqueror.Preloader.xml +%{_datadir}/dbus-1/interfaces/org.kde.nsplugins.CallBack.xml +%{_datadir}/dbus-1/interfaces/org.kde.nsplugins.class.xml +%{_datadir}/dbus-1/interfaces/org.kde.nsplugins.instance.xml +%{_datadir}/dbus-1/interfaces/org.kde.nsplugins.viewer.xml +%{_kde4_datadir}/kde4/services/ServiceMenus/imageconverter.desktop +%{_kde4_datadir}/kde4/services/bookmarks.desktop +%{_kde4_datadir}/kde4/services/cache.desktop +%{_kde4_datadir}/kde4/services/cookies.desktop +%{_kde4_datadir}/kde4/services/ebrowsing.desktop +%{_kde4_datadir}/kde4/services/filebehavior.desktop +%{_kde4_datadir}/kde4/services/fsview_part.desktop +%{_kde4_datadir}/kde4/services/kcmhistory.desktop +%{_kde4_datadir}/kde4/services/kcmkonqyperformance.desktop +%{_kde4_datadir}/kde4/services/kcmperformance.desktop +%{_kde4_datadir}/kde4/services/khtml_appearance.desktop +%{_kde4_datadir}/kde4/services/khtml_behavior.desktop +%{_kde4_datadir}/kde4/services/khtml_filter.desktop +%{_kde4_datadir}/kde4/services/khtml_general.desktop +%{_kde4_datadir}/kde4/services/khtml_java_js.desktop +%{_kde4_datadir}/kde4/services/khtml_plugins.desktop +%{_kde4_datadir}/kde4/services/konq_aboutpage.desktop +%{_kde4_datadir}/kde4/services/konq_sidebartng.desktop +%{_kde4_datadir}/kde4/services/konqueror.desktop +%{_kde4_datadir}/kde4/services/netpref.desktop +%{_kde4_datadir}/kde4/services/proxy.desktop +%{_kde4_datadir}/kde4/services/useragent.desktop +%{_kde4_datadir}/kde4/services/webarchivethumbnail.desktop + +%post -n konqueror-libs -p /sbin/ldconfig +%postun -n konqueror-libs -p /sbin/ldconfig + +%files -n konqueror-libs +%{_kde4_libdir}/libkonqsidebarplugin.so.* +%{_kde4_libdir}/libkonquerorprivate.so.4* -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +#files -n konqueror-devel +#{_kde4_libdir}/kde4/devel/libkonqsidebarplugin.so +#{_kde4_includedir}/konqsidebarplugin.h -%files libs -%{_kde4_libdir}/libkbookmarkmodel_private.so.4* -%{_kde4_libdir}/libdolphinprivate.so.4* +%post -n libkonq -p /sbin/ldconfig +%postun -n libkonq -p /sbin/ldconfig + +%files -n libkonq %{_kde4_libdir}/libkonq.so.5* -%{_kde4_libdir}/libkonqsidebarplugin.so.4* -%{_kde4_libdir}/libkonquerorprivate.so.4* +%{_kde4_libdir}/kde4/kded_favicons.so +%{_kde4_libdir}/kde4/konq_sound.so +%{_kde4_appsdir}/kbookmark/ +%dir %{_kde4_appsdir}/konqueror/ +%dir %{_kde4_appsdir}/konqueror/pics/ +%{_kde4_appsdir}/konqueror/pics/arrow_*.png +%{_kde4_datadir}/kde4/services/kded/favicons.desktop +%{_kde4_datadir}/kde4/servicetypes/konqdndpopupmenuplugin.desktop +%{_kde4_datadir}/kde4/servicetypes/konqpopupmenuplugin.desktop +%{_kde4_datadir}/templates/.source/* +%{_kde4_datadir}/templates/*.desktop +#files -n libkonq-devel %files devel -%{_kde4_includedir}/*.h %{_kde4_libdir}/kde4/devel/libkonq.so -%{_kde4_libdir}/kde4/devel/libkonqsidebarplugin.so +%{_kde4_includedir}/knewmenu.h +%{_kde4_includedir}/konq_*.h +%{_kde4_includedir}/konqmimedata.h +%{_kde4_includedir}/kversioncontrolplugin*.h +%{_kde4_includedir}/libkonq_export.h + +%files -n kdepasswd -f kdepasswd.lang +%{_kde4_bindir}/kdepasswd +%{_kde4_datadir}/applications/kde4/kdepasswd.desktop +%{_kde4_libdir}/kde4/kcm_useraccount.so +%{_kde4_datadir}/config.kcfg/kcm_useraccount.kcfg +%{_kde4_datadir}/config.kcfg/kcm_useraccount_pass.kcfg +%{_kde4_datadir}//kde4/services/kcm_useraccount.desktop +%dir %{_kde4_appsdir}/kdm +%dir %{_kde4_appsdir}/kdm/pics +%dir %{_kde4_appsdir}/kdm/pics/users/ +%{_kde4_appsdir}/kdm/pics/users/* + +%files -n kdialog +%{_kde4_bindir}/kdialog +%{_datadir}/dbus-1/interfaces/org.kde.kdialog.ProgressDialog.xml + +%files -n keditbookmarks +%{_kde4_bindir}/kbookmarkmerger +%{_kde4_bindir}/keditbookmarks +%{_kde4_libdir}/libkdeinit4_keditbookmarks.so +%{_kde4_datadir}/applications/kde4/keditbookmarks.desktop +%{_kde4_appsdir}/keditbookmarks/ +%{_kde4_datadir}/config.kcfg/keditbookmarks.kcfg +%{_kde4_appsdir}/kbookmark/ +%{_mandir}/man1/kbookmarkmerger.1.gz + +%files -n keditbookmarks-libs +%{_kde4_libdir}/libkbookmarkmodel_private.so.4* + +%post -n kfind +touch --no-create %{_kde4_iconsdir}/oxygen &> /dev/null ||: + +%posttrans -n kfind +gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: + +%postun -n kfind +if [ $1 -eq 0 ] ; then + touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null ||: + gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null ||: +fi + +%files -n kfind -f kfind.lang +%{_kde4_bindir}/kfind +%{_kde4_datadir}/applications/kde4/kfind.desktop +%{_mandir}/man1/kfind.1.gz +%{_kde4_iconsdir}/hicolor/*/apps/kfind.* + +%files -n kde-plasma-folderview +%{_kde4_libdir}/kde4/plasma_applet_folderview.so +%{_kde4_datadir}/kde4/services/plasma-applet-folderview.desktop %changelog +* Sat Feb 01 2014 Rex Dieter - 4.12.2-2 +- rebase chfn patch, +Requires: util-linux (#609039) + +* Fri Jan 31 2014 Rex Dieter - 4.12.2-1 +- 4.12.2 + +* Fri Jan 10 2014 Rex Dieter - 4.12.1-1 +- 4.12.1 + +* Tue Dec 31 2013 Rex Dieter - 4.12.0-3 +- dolphin,konqueror: Requires: kdialog + +* Sun Dec 29 2013 Rex Dieter - 4.12.0-2 +- impliment split packaging +- trim changelog +- License: +GFDL + +* Thu Dec 19 2013 Rex Dieter - 4.12.0-1 +- 4.12.0 + +* Sun Dec 01 2013 Rex Dieter - 4.11.97-1 +- 4.11.97 + +* Thu Nov 21 2013 Rex Dieter - 4.11.95-1 +- 4.11.95 + +* Sat Nov 16 2013 Rex Dieter - 4.11.90-1 +- 4.11.90 + * Sat Nov 09 2013 Rex Dieter 4.11.3-2 - include some post v4.11.3 commits, including fix for dolphin kde bug #318683 diff --git a/sources b/sources index 17615fd..3728c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7ef16f46e8e3dff0d6c9ca1f36dfa976 kde-baseapps-4.11.3.tar.xz +3b53de2c94d35d5f4dbd3645da8204f2 kde-baseapps-4.12.2.tar.xz