Hello community,

here is the log from the commit of package kdebase4 for openSUSE:Factory
checked in at Fri Jul 22 16:35:55 CEST 2011.



--------
--- KDE/kdebase4/kdebase4.changes       2011-07-01 11:19:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4/kdebase4.changes      2011-07-21 
14:20:24.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Jul 21 12:20:14 UTC 2011 - idon...@novell.com
+
+- Update to 4.6.95 
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  kdebase-4.6.5.tar.bz2
  konsolesu.desktop
  utilities-terminal-su-128.png
  utilities-terminal-su-16.png
  utilities-terminal-su-22.png
  utilities-terminal-su-32.png
  utilities-terminal-su-48.png
  utilities-terminal-su-64.png

New:
----
  kde-baseapps-4.6.95.tar.bz2

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

Other differences:
------------------
++++++ kdebase4.spec ++++++
--- /var/tmp/diff_new_pack.fNRhSD/_old  2011-07-22 16:34:42.000000000 +0200
+++ /var/tmp/diff_new_pack.fNRhSD/_new  2011-07-22 16:34:42.000000000 +0200
@@ -18,44 +18,31 @@
 
 
 Name:           kdebase4
-Version:        4.6.5
+Version:        4.6.95
 Release:        1
 License:        GPLv2+
 Summary:        The Base KDE Apps
 Url:            http://www.kde.org/
 Group:          System/GUI/KDE
+Source0:        kde-baseapps-%{version}.tar.bz2
+Source1:        baselibs.conf
+Source2:        rpmlintrc
+Source5:        dolphinsu.desktop
+Patch7:         dolphin-go_up.diff
 BuildRequires:  NetworkManager-devel
 BuildRequires:  bluez-devel
+BuildRequires:  fdupes
 BuildRequires:  kwebkitpart-devel
-BuildRequires:  libkde4-devel = %{version}
+BuildRequires:  libkde4-devel
 BuildRequires:  libqimageblitz-devel
 BuildRequires:  libraw1394-devel
 BuildRequires:  libsmbclient-devel
 BuildRequires:  libsoprano-devel
-BuildRequires:  libxklavier-devel
-BuildRequires:  soprano-backend-redland
-BuildRequires:  xine-devel
-%if 0%{?suse_version} > 1020
-BuildRequires:  fdupes
 BuildRequires:  libusb-devel
-%else
-BuildRequires:  libusb
-%endif
-%if 0%{?suse_version} > 1030
 BuildRequires:  pciutils-devel
-%endif
-Source0:        kdebase-%{version}.tar.bz2
-Source1:        baselibs.conf
-Source2:        rpmlintrc
-Source4:        konsolesu.desktop
-Source5:        dolphinsu.desktop
-Source21:       utilities-terminal-su-16.png
-Source22:       utilities-terminal-su-22.png
-Source23:       utilities-terminal-su-32.png
-Source24:       utilities-terminal-su-48.png
-Source25:       utilities-terminal-su-64.png
-Source26:       utilities-terminal-su-128.png
-Patch7:         dolphin-go_up.diff
+BuildRequires:  soprano-backend-redland
+BuildRequires:  xine-devel
+BuildRequires:  pkgconfig(libxklavier)
 Suggests:       dolphin
 Suggests:       kdebase4-libkonq
 Suggests:       kdebase4-nsplugin
@@ -70,6 +57,7 @@
 Provides:       kdebase4-devel = 3.96.0
 Obsoletes:      kdebase4-devel <= 3.96.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+#Patch8:         plasma-new-default-panel.diff
 %kde4_runtime_requires
 
 %description
@@ -77,7 +65,7 @@
 Environment workspace.
 
 %prep
-%setup -q -n kdebase-%{version}
+%setup -q -n kde-baseapps-%{version}
 %patch7
 
 %build
@@ -85,7 +73,7 @@
   %make_jobs
 
 %install
-  cd build
+  pushd build
 %make_install
   %create_subdir_filelist -d dolphin
   %create_subdir_filelist -d kdepasswd
@@ -93,24 +81,15 @@
   %create_subdir_filelist -d keditbookmarks
   %create_subdir_filelist -d kfind
   %create_subdir_filelist -d konqueror
-  %create_subdir_filelist -d konsole
-  %create_subdir_filelist -d kwrite
+  %create_subdir_filelist -d konq-plugins
   %create_subdir_filelist -d lib -v lib.devel
   %create_subdir_filelist -d nsplugins
-  cd ..
+  popd
   %create_exclude_filelist
-  install -D -m 0644 %SOURCE4 %SOURCE5 
%{buildroot}%{_datadir}/applications/kde4/
-  install -D -m 0644 %SOURCE21 
%{buildroot}%{_datadir}/icons/hicolor/16x16/apps/utilities-terminal_su.png
-  install -D -m 0644 %SOURCE22 
%{buildroot}%{_datadir}/icons/hicolor/22x22/apps/utilities-terminal_su.png
-  install -D -m 0644 %SOURCE23 
%{buildroot}%{_datadir}/icons/hicolor/32x32/apps/utilities-terminal_su.png
-  install -D -m 0644 %SOURCE24 
%{buildroot}%{_datadir}/icons/hicolor/48x48/apps/utilities-terminal_su.png
-  install -D -m 0644 %SOURCE25 
%{buildroot}%{_datadir}/icons/hicolor/64x64/apps/utilities-terminal_su.png
-  install -D -m 0644 %SOURCE26 
%{buildroot}%{_datadir}/icons/hicolor/128x128/apps/utilities-terminal_su.png
+  install -D -m 0644 %{SOURCE5} %{buildroot}%{_datadir}/applications/kde4/
   %suse_update_desktop_file konqbrowser      WebBrowser
   %suse_update_desktop_file konquerorsu      System FileManager
   %suse_update_desktop_file dolphin          System FileManager
-  %suse_update_desktop_file kwrite           TextEditor
-  %suse_update_desktop_file konsole          TerminalEmulator
   %suse_update_desktop_file kfind            System Filesystem core
   %suse_update_desktop_file Home             System FileManager core
   %if 0%{?suse_version} > 1020
@@ -129,28 +108,6 @@
   rm -rf %{buildroot}
   rm -rf filelists
 
-%package -n konsole
-License:        GPLv2+
-Summary:        KDE Terminal
-Group:          System/X11/Terminals
-Provides:       kdebase3:/opt/kde3/bin/konsole
-Provides:       kde4-konsole = 4.3.0
-Obsoletes:      kde4-konsole < 4.3.0
-%kde4_runtime_requires
-
-%description -n konsole
-Konsole is a terminal emulator for the K Desktop Environment.
-
-%post -n konsole -p /sbin/ldconfig
-
-%postun -n konsole -p /sbin/ldconfig
-
-%files -n konsole -f filelists/konsole
-%defattr(-,root,root)
-%doc COPYING COPYING.DOC README
-%_kde4_applicationsdir/konsolesu.desktop
-%_kde4_iconsdir/hicolor/*/apps/utilities-terminal_su.png
-
 %package -n dolphin
 License:        GPLv2+
 Summary:        KDE File Manager
@@ -182,10 +139,13 @@
 Requires:       kdebase4-libkonq = %{version}
 # needed for embedded filemanagement part
 Recommends:     dolphin
-Recommends:     konqueror-plugins
 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
@@ -196,7 +156,7 @@
 
 %postun -n konqueror -p /sbin/ldconfig
 
-%files -n konqueror -f filelists/konqueror
+%files -n konqueror -f filelists/konqueror -f filelists/konq-plugins
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
 %dir %{_datadir}/autostart
@@ -211,33 +171,34 @@
 %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
 # 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
 
-%package -n kwrite
-License:        GPLv2+
-Summary:        KDE Text Editor
-Group:          Productivity/Editors/Other
-Provides:       kdebase3:/opt/kde3/bin/kwrite
-Provides:       kde4-kwrite = 4.3.0
-Obsoletes:      kde4-kwrite < 4.3.0
-%kde4_runtime_requires
-
-%description -n kwrite
-KWrite is the default text editor of the K desktop environment.
-
-%post -n kwrite -p /sbin/ldconfig
-
-%postun -n kwrite -p /sbin/ldconfig
-
-%files -n kwrite -f filelists/kwrite
-%defattr(-,root,root)
-%doc COPYING COPYING.DOC README
-
 %package -n kfind
 License:        GPLv2+
 Summary:        KDE Find File Utility
@@ -276,10 +237,7 @@
 
 %files -n kdialog -f filelists/kdialog
 %defattr(-,root,root)
-%doc COPYING COPYING.DOC kdialog/README 
-%if 0%{?suse_version} > 1120
-%doc kdialog/progressdemo kdialog/progresscanceldemo kdialog/test
-%endif
+%doc kdialog/README kdialog/progressdemo kdialog/progresscanceldemo 
kdialog/test
 
 %package -n keditbookmarks
 License:        GPLv2+
@@ -321,7 +279,7 @@
 
 %files nsplugin -f filelists/nsplugins
 %defattr(-,root,root)
-%dir %_kde4_appsdir/plugin
+%dir %_kde4_appsdir/nsplugin
 
 %package -n libkonq5
 License:        GPLv2+
@@ -364,6 +322,12 @@
 %dir %_kde4_appsdir/kbookmark
 %dir %_kde4_sharedir/templates
 %dir %_kde4_sharedir/templates/.source
+%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
 
 %package -n libkonq-devel
 License:        GPLv2+
@@ -379,6 +343,12 @@
 %files -n libkonq-devel -f filelists/lib.devel
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README
+%{_includedir}/konq_*.h
+%{_includedir}/konqmimedata.h
+%{_includedir}/libkonq_export.h
+%{_includedir}/kversioncontrolplugin.h
+%{_includedir}/knewmenu.h
+%_kde4_libdir/libkonq.so
 
 %package -n kdepasswd
 License:        GPLv2+
@@ -402,31 +372,6 @@
 %dir %_kde4_appsdir/kdm/pics
 %dir %_kde4_appsdir/kdm/pics/users
 
-%if 0
-
-%package -n kinfocenter
-License:        GPLv2+
-Summary:        KDE Information Center
-Group:          Productivity/File utilities
-Provides:       kdebase3:/opt/kde3/bin/kinfocenter
-Provides:       kde4-kinfocenter = 4.3.0
-Obsoletes:      kde4-kinfocenter < 4.3.0
-%kde4_runtime_requires
-
-%description -n kinfocenter
-This application displays information about your system.
-
-%post -n kinfocenter -p /sbin/ldconfig
-
-%postun -n kinfocenter -p /sbin/ldconfig
-
-%files -n kinfocenter -f filelists/kinfocenter
-%defattr(-,root,root)
-%dir %_kde4_appsdir/kcmusb
-%dir %_kde4_appsdir/kcmview1394
-
-%endif
-
 %files -f filelists/exclude
 %defattr(-,root,root)
 %doc COPYING COPYING.DOC README


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



Remember to have fun...

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to