Mailinglist Archive: opensuse-commit (1855 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kdebase4 for openSUSE:Factory
checked in at Mon Sep 19 22:51:38 CEST 2011.



--------
--- KDE/kdebase4/kdebase4.changes       2011-09-07 14:16:07.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes      2011-09-18 
08:38:26.000000000 +0200
@@ -1,0 +2,18 @@
+Thu Sep  7 13:38:52 UTC 2011 - toddrme2178@xxxxxxxxx
+
+- added libtidy buildrequires for HTML validation in konqueror
+- removed KDE SC 3 provides and obsoletes (fix for RPMLINT warnings)
+- removed very old KDE SC 4 provides and obsoletes (KDE SC < 4.1.0,
+  fix for RPMLINT warnings)
+- removed konqueror-plugins files from konqueror
+  (this resulted in nearly 2 megabytes of duplicated data)
+- renamed kdebase4 subpackage to plasmoid-folderview,
+  since it only included files related to the folderview plasmoid
+- updated description to reflect new KDE branding
+- moved konqueror sidebar library devel files libkonq-devel
+  (fix for RPMLINT warnings)
+- changed likonq-devel group (fix for RPMLINT warning)
+- added%kde4_runtime_requires macros (fix for RPMLINT warnings)
+- cleaned up spec file formatting
+
+-------------------------------------------------------------------
@@ -5,2 +22,0 @@
-  * Bugfixes over KDE 4.7.0
-  *  see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for 
details

Package does not exist at destination yet. Using Fallback KDE/kdebase4
Destination is kdebase4
calling whatdependson for head-i586


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.v0S3vA/_old  2011-09-19 22:51:33.000000000 +0200
+++ /var/tmp/diff_new_pack.v0S3vA/_new  2011-09-19 22:51:33.000000000 +0200
@@ -38,36 +38,16 @@
 BuildRequires:  libraw1394-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libsoprano-devel
+BuildRequires:  libtidy-devel
 BuildRequires:  libusb-devel
 BuildRequires:  pciutils-devel
-BuildRequires:  soprano-backend-redland
 BuildRequires:  xine-devel
 BuildRequires:  pkgconfig(libxklavier)
-%if 0%{?suse_version} > 1020
-BuildRequires:  fdupes
-BuildRequires:  libusb-devel
-%else
-BuildRequires:  libusb
-%endif
-%if 0%{?suse_version} > 1030
-BuildRequires:  pciutils-devel
-%endif
-Suggests:       dolphin
-Suggests:       kdebase4-libkonq
-Suggests:       kdebase4-nsplugin
-Suggests:       kdepasswd
-Suggests:       kdialog
-Suggests:       keditbookmarks
-Suggests:       kfind
-Suggests:       konqueror
-Provides:       kdebase4-devel = 3.96.0
-Obsoletes:      kdebase4-devel <= 3.96.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %kde4_runtime_requires
 
 %description
-This package contains the basic applications for a K Desktop
-Environment workspace.
+This package contains the basic applications for a KDE workspace.
 
 %prep
 %setup -q -n kde-baseapps-%{version}
@@ -79,7 +59,7 @@
 
 %install
   pushd build
-%make_install
+  %make_install
   %create_subdir_filelist -d dolphin
   %create_subdir_filelist -d kdepasswd
   %create_subdir_filelist -d kdialog
@@ -91,23 +71,22 @@
   %create_subdir_filelist -d nsplugins
   popd
   %create_exclude_filelist
-  install -D -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/applications/kde4/
+  install -D -m 0644 %{SOURCE3} %{buildroot}%{_kde4_applicationsdir}
   %suse_update_desktop_file konqbrowser      WebBrowser
   %suse_update_desktop_file konquerorsu      System FileManager
   %suse_update_desktop_file dolphin          System FileManager
   %suse_update_desktop_file kfind            System Filesystem core
   %suse_update_desktop_file Home             System FileManager core
-  %if 0%{?suse_version} > 1020
   %fdupes -s %{buildroot}
-  %endif
   %kde_post_install
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
+
 %verifyscript
-%verify_permissions -e /usr/bin/kcheckpass
-%verify_permissions -e /usr/bin/kdesud
+%verify_permissions -e %{_kde4_bindir}/kcheckpass
+%verify_permissions -e %{_kde4_bindir}/kdesud
 
 %clean
   rm -rf %{buildroot}
@@ -117,9 +96,8 @@
 License:        GPLv2+
 Summary:        KDE File Manager
 Group:          Productivity/File utilities
-Requires:       kdebase4-libkonq = %{version}
+Requires:       %{name}-libkonq = %{version}
 Requires:       kfind
-Provides:       kdebase3:/opt/kde3/bin/kfmclient
 Provides:       kde4-dolphin = 4.3.0
 Obsoletes:      kde4-dolphin < 4.3.0
 %kde4_runtime_requires
@@ -134,16 +112,16 @@
 %files -n dolphin -f filelists/dolphin
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
-%dir %_kde4_appsdir/dolphinpart
-%_kde4_applicationsdir/dolphinsu.desktop
+%dir %{_kde4_appsdir}/dolphinpart
+%{_kde4_applicationsdir}/dolphinsu.desktop
 
 %package -n konqueror-plugins
 License:        GPLv2+
 Summary:        KDE File Manager and Browser
 Group:          Productivity/Networking/Web/Browsers
-Requires:       kdebase4-libkonq = %{version}
+Requires:       %{name}-libkonq = %{version}
 Provides:       konqueror-plugins-lang = %{version}
-Obsoletes:      konqueror-plugins-lang <= %{version}
+Obsoletes:      konqueror-plugins-lang < %{version}
 %kde4_runtime_requires
 
 %description -n konqueror-plugins
@@ -155,41 +133,28 @@
 
 %files -n konqueror-plugins -f filelists/konq-plugins
 %defattr(-,root,root)
-%dir %{_datadir}/kde4/apps/akregator
-%dir %{_datadir}/kde4/apps/akregator/pics
-%dir %{_datadir}/kde4/apps/domtreeviewer
-%dir %{_datadir}/kde4/apps/fsview
-%dir %{_datadir}/kde4/apps/konqueror/icons
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/16x16
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/16x16/actions
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/22x22
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/22x22/actions
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/32x32
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/32x32/actions
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/48x48
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/48x48/actions
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/64x64
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/64x64/actions
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/scalable
-%dir %{_datadir}/kde4/apps/konqueror/icons/oxygen/scalable/actions
-%dir %{_datadir}/kde4/apps/konqueror/kpartplugins
-%dir %{_datadir}/kde4/apps/konqueror/opensearch
+%doc COPYING COPYING.DOC README
+%dir %{_kde4_appsdir}/akregator
+%dir %{_kde4_appsdir}/akregator/pics
+%dir %{_kde4_appsdir}/domtreeviewer
+%dir %{_kde4_appsdir}/fsview
+%dir %{_kde4_appsdir}/konqueror/icons
+%dir %{_kde4_appsdir}/konqueror/icons/oxygen
+%dir %{_kde4_appsdir}/konqueror/icons/oxygen/*
+%dir %{_kde4_appsdir}/konqueror/icons/oxygen/*/actions
+%dir %{_kde4_appsdir}/konqueror/kpartplugins
+%dir %{_kde4_appsdir}/konqueror/opensearch
 
 %package -n konqueror
 License:        GPLv2+
 Summary:        KDE File Manager and Browser
 Group:          Productivity/Networking/Web/Browsers
-Requires:       kdebase4-libkonq = %{version}
+Requires:       %{name}-libkonq = %{version}
+Requires:       konqueror-plugins = %{version}
 # needed for embedded filemanagement part
 Recommends:     dolphin
-Provides:       kdebase3:/opt/kde3/bin/konqueror
 Provides:       kde4-konqueror = 4.3.0
 Obsoletes:      kde4-konqueror < 4.3.0
-Provides:       konqueror-plugins = %{version}
-Provides:       konqueror-plugins-lang = %{version}
-Obsoletes:      konqueror-plugins < %{version}
-Obsoletes:      konqueror-plugins-lang < %{version}
 %kde4_runtime_requires
 
 %description -n konqueror
@@ -200,54 +165,36 @@
 
 %postun -n konqueror -p /sbin/ldconfig
 
-%files -n konqueror -f filelists/konqueror -f filelists/konq-plugins
+%files -n konqueror -f filelists/konqueror
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
 %dir %{_datadir}/autostart
-%dir %_kde4_appsdir/kcmcss
-%dir %_kde4_appsdir/kcontrol
-%dir %_kde4_appsdir/kcontrol/pics
-%dir %_kde4_appsdir/konqsidebartng/dirtree
-%dir %_kde4_appsdir/konqsidebartng/entries
-%dir %_kde4_appsdir/konqsidebartng/plugins
-%dir %_kde4_appsdir/konqsidebartng/virtual_folders/remote
-%dir %_kde4_appsdir/konqsidebartng/virtual_folders/remote/ftp
-%dir %_kde4_appsdir/konqsidebartng/virtual_folders/remote/web
-%dir %_kde4_servicesdir/useragentstrings
-%dir %_kde4_appsdir/dolphinpart/kpartplugins
-%dir %_kde4_appsdir/konqueror/kpartplugins
-%dir %_kde4_appsdir/kwebkitpart/kpartplugins
-%dir %_kde4_appsdir/konqueror/opensearch
-# from konq-plugins
-%dir %_kde4_appsdir/akregator
-%dir %_kde4_appsdir/akregator/pics
-%dir %_kde4_appsdir/domtreeviewer
-%dir %_kde4_appsdir/fsview
-%dir %_kde4_appsdir/konqueror/icons
-%dir %_kde4_appsdir/konqueror/icons/oxygen
-%dir %_kde4_appsdir/konqueror/icons/oxygen/16x16
-%dir %_kde4_appsdir/konqueror/icons/oxygen/16x16/actions
-%dir %_kde4_appsdir/konqueror/icons/oxygen/22x22
-%dir %_kde4_appsdir/konqueror/icons/oxygen/22x22/actions
-%dir %_kde4_appsdir/konqueror/icons/oxygen/32x32
-%dir %_kde4_appsdir/konqueror/icons/oxygen/32x32/actions
-%dir %_kde4_appsdir/konqueror/icons/oxygen/48x48
-%dir %_kde4_appsdir/konqueror/icons/oxygen/48x48/actions
-%dir %_kde4_appsdir/konqueror/icons/oxygen/64x64
-%dir %_kde4_appsdir/konqueror/icons/oxygen/64x64/actions
-%dir %_kde4_appsdir/konqueror/icons/oxygen/scalable
-%dir %_kde4_appsdir/konqueror/icons/oxygen/scalable/actions
+%dir %{_kde4_appsdir}/kcmcss
+%dir %{_kde4_appsdir}/kcontrol
+%dir %{_kde4_appsdir}/kcontrol/pics
+%dir %{_kde4_appsdir}/konqsidebartng/dirtree
+%dir %{_kde4_appsdir}/konqsidebartng/entries
+%dir %{_kde4_appsdir}/konqsidebartng/plugins
+%dir %{_kde4_appsdir}/konqsidebartng/virtual_folders/remote
+%dir %{_kde4_appsdir}/konqsidebartng/virtual_folders/remote/ftp
+%dir %{_kde4_appsdir}/konqsidebartng/virtual_folders/remote/web
+%dir %{_kde4_appsdir}/konqueror/opensearch
+%dir %{_kde4_appsdir}/dolphinpart/kpartplugins
+%dir %{_kde4_appsdir}/konqueror/kpartplugins
+%dir %{_kde4_appsdir}/kwebkitpart/kpartplugins
+%dir %{_kde4_servicesdir}/useragentstrings
 # installed from apps/lib/konq/ and hence in kdebase4-libkonq
-%exclude %_kde4_appsdir/konqueror/pics/arrow_bottomright.png
-%exclude %_kde4_appsdir/konqueror/pics/arrow_bottomleft.png
-%exclude %_kde4_appsdir/konqueror/pics/arrow_topright.png
-%exclude %_kde4_appsdir/konqueror/pics/arrow_topleft.png
+%exclude %{_kde4_appsdir}/konqueror/pics/arrow_bottomleft.png
+%exclude %{_kde4_appsdir}/konqueror/pics/arrow_bottomright.png
+%exclude %{_kde4_appsdir}/konqueror/pics/arrow_topleft.png
+%exclude %{_kde4_appsdir}/konqueror/pics/arrow_topright.png
+%exclude %{_includedir}/konqsidebarplugin.h
+%exclude %{_kde4_libdir}/libkonqsidebarplugin.so
 
 %package -n kfind
 License:        GPLv2+
 Summary:        KDE Find File Utility
 Group:          Productivity/File utilities
-Provides:       kdebase3:/opt/kde3/bin/kfind
 Provides:       kde4-kfind = 4.3.0
 Obsoletes:      kde4-kfind < 4.3.0
 %kde4_runtime_requires
@@ -267,7 +214,6 @@
 License:        GPLv2+
 Summary:        KDE version of xdialog
 Group:          System/GUI/KDE
-Provides:       kdebase3:/opt/kde3/bin/kdialog
 Provides:       kde4-kdialog = 4.3.0
 Obsoletes:      kde4-kdialog < 4.3.0
 %kde4_runtime_requires
@@ -281,13 +227,13 @@
 
 %files -n kdialog -f filelists/kdialog
 %defattr(-,root,root)
+%doc COPYING COPYING.DOC README
 %doc kdialog/README kdialog/progressdemo kdialog/progresscanceldemo 
kdialog/test
 
 %package -n keditbookmarks
 License:        GPLv2+
 Summary:        KDE Bookmark Editor
 Group:          System/GUI/KDE
-Provides:       kdebase3:/opt/kde3/bin/keditbookmarks
 Provides:       kde4-keditbookmarks = 4.3.0
 Obsoletes:      kde4-keditbookmarks < 4.3.0
 %kde4_runtime_requires
@@ -305,16 +251,14 @@
 
 %package nsplugin
 License:        GPLv2+
-Requires:       kdebase4 = %{version}
-Provides:       kdebase4-nsplugin64 = 4.0.72
-Obsoletes:      kdebase4-nsplugin64 <= 4.0.72
+Provides:       %{name}-nsplugin64 = 4.0.72
+Obsoletes:      %{name}-nsplugin64 < 4.0.72
 %ifarch x86_64 ppc64 s390x ia64
 Recommends:     nspluginwrapper
 %endif
 Summary:        Netscape plugin support for KDE
 Group:          System/GUI/KDE
-Provides:       kdebase3-nsplugin = 3.5.1
-Obsoletes:      kdebase3-nsplugin <= 3.5.1
+%kde4_runtime_requires
 
 %description nsplugin
 This package contains support for Netscape plug-ins in konqueror. You
@@ -322,7 +266,8 @@
 
 %files nsplugin -f filelists/nsplugins
 %defattr(-,root,root)
-%dir %_kde4_appsdir/nsplugin
+%doc COPYING COPYING.DOC README
+%dir %{_kde4_appsdir}/nsplugin
 
 %package -n libkonq5
 License:        GPLv2+
@@ -330,7 +275,7 @@
 Group:          System/GUI/KDE
 # naming error, make seamless upgrade possible
 Provides:       libkonq4 = 4.0.85
-Obsoletes:      libkonq4 <= 4.0.85
+Obsoletes:      libkonq4 < 4.0.85
 %requires_ge    libqt4-x11
 
 %description -n libkonq5
@@ -343,39 +288,40 @@
 %files -n libkonq5
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
-%_kde4_libdir/libkonq.so.*
+%{_kde4_libdir}/libkonq.so.*
 
-%package -n kdebase4-libkonq
+%package libkonq
 License:        GPLv2+
 Summary:        KDE Konqueror Libraries
 Group:          System/GUI/KDE
 Requires:       libkonq5 = %{version}
+%kde4_runtime_requires
 
-%description -n kdebase4-libkonq
+%description libkonq
 This package contains the files used by file managers as Konqueror.
 
-%post -n kdebase4-libkonq -p /sbin/ldconfig
+%post   libkonq -p /sbin/ldconfig
 
-%postun -n kdebase4-libkonq -p /sbin/ldconfig
+%postun libkonq -p /sbin/ldconfig
 
-%files -n kdebase4-libkonq -f filelists/lib
+%files libkonq -f filelists/lib
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
-%exclude %_kde4_libdir/libkonq.so.*
-%dir %_kde4_appsdir/kbookmark
-%dir %_kde4_sharedir/templates
-%dir %_kde4_sharedir/templates/.source
+%dir %{_kde4_appsdir}/kbookmark
+%dir %{_kde4_sharedir}/templates
+%dir %{_kde4_sharedir}/templates/.source
+%exclude %{_includedir}/knewmenu.h
 %exclude %{_includedir}/konq_*.h
 %exclude %{_includedir}/konqmimedata.h
-%exclude %{_includedir}/libkonq_export.h
 %exclude %{_includedir}/kversioncontrolplugin.h
-%exclude %{_includedir}/knewmenu.h
-%exclude %_kde4_libdir/libkonq.so
+%exclude %{_includedir}/libkonq_export.h
+%exclude %{_kde4_libdir}/libkonq.so
+%exclude %{_kde4_libdir}/libkonq.so.*
 
 %package -n libkonq-devel
 License:        GPLv2+
 Summary:        KDE Konqueror Libraries: Build Environment
-Group:          System/GUI/KDE
+Group:          Development/Libraries/KDE
 Requires:       libkde4-devel
 Requires:       libkonq5 = %{version}
 
@@ -391,13 +337,14 @@
 %{_includedir}/libkonq_export.h
 %{_includedir}/kversioncontrolplugin.h
 %{_includedir}/knewmenu.h
-%_kde4_libdir/libkonq.so
+%{_includedir}/konqsidebarplugin.h
+%{_kde4_libdir}/libkonq.so
+%{_kde4_libdir}/libkonqsidebarplugin.so
 
 %package -n kdepasswd
 License:        GPLv2+
 Summary:        KDE Password Changer
 Group:          System/GUI/KDE
-Provides:       kdebase3:/opt/kde3/bin/kdepasswd
 Provides:       kde4-kdepasswd = 4.3.0
 Obsoletes:      kde4-kdepasswd < 4.3.0
 %kde4_runtime_requires
@@ -411,14 +358,27 @@
 
 %files -n kdepasswd -f filelists/kdepasswd
 %defattr(-,root,root)
-%dir %_kde4_appsdir/kdm
-%dir %_kde4_appsdir/kdm/pics
-%dir %_kde4_appsdir/kdm/pics/users
+%doc COPYING COPYING.DOC README
+%dir %{_kde4_appsdir}/kdm
+%dir %{_kde4_appsdir}/kdm/pics
+%dir %{_kde4_appsdir}/kdm/pics/users
+
+%package -n plasmoid-folderview
+License:        GPLv2+
+Summary:        Plasmoid to display a folder
+Group:          System/GUI/KDE
+Provides:       %{name} = %{version}-%{release}
+Obsoletes:      %{name} < %{version}-%{release}
+%kde4_runtime_requires
+
+%description -n plasmoid-folderview
+This applet displays the contents of a folder or kio slave on your
+desktop or in your panel
 
-%files -f filelists/exclude
+%files -n plasmoid-folderview
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
-%_kde4_modulesdir/plasma_applet_folderview.so
-%_kde4_servicesdir/plasma-applet-folderview.desktop
+%{_kde4_modulesdir}/plasma_applet_folderview.so
+%{_kde4_servicesdir}/plasma-applet-folderview.desktop
 
 %changelog


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx