[kdebase-workspace] Fix files

Thu Nov 24 10:23:41 UTC 2011

commit 6cf490eed7800e581edc91ef5677b42f5a9ba3c0
Author: Radek Novacek <rnovacek at redhat.com>
Date:   Thu Nov 24 11:23:32 2011 +0100

    Fix files

 ...kspace-4.7.80-kcontrol-test-wrong-install.patch |   14 ++++++++++
 kdebase-workspace.spec                             |   28 +++++++++++++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)
---

diff --git a/kde-workspace-4.7.80-kcontrol-test-wrong-install.patch b/kde-workspace-4.7.80-kcontrol-test-wrong-install.patch
new file mode 100644
index 0000000..fea672a
--- /dev/null
+++ b/kde-workspace-4.7.80-kcontrol-test-wrong-install.patch
@@ -0,0 +1,14 @@
+diff -up kde-workspace-4.7.80/kcontrol/keyboard/tests/CMakeLists.txt.kcontrol-test-wrong-install kde-workspace-4.7.80/kcontrol/keyboard/tests/CMakeLists.txt
+--- kde-workspace-4.7.80/kcontrol/keyboard/tests/CMakeLists.txt.kcontrol-test-wrong-install	2011-11-24 10:52:39.975490670 +0100
++++ kde-workspace-4.7.80/kcontrol/keyboard/tests/CMakeLists.txt	2011-11-24 10:53:00.003996709 +0100
+@@ -17,7 +17,9 @@ KEYBOARD_DAEMON_UNIT_TESTS(iso_codes)
+ kde4_add_unit_test(flags_test NOGUI flags_test.cpp ../flags.cpp ../x11_helper.cpp ../keyboard_config.cpp ../xkb_rules.cpp)
+ target_link_libraries(flags_test ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY} ${QT_QTTEST_LIBRARY} ${X11_Xkbfile_LIB} ${X11_LIBRARIES} ${text_paint_LIB})
+ 
+-install( DIRECTORY config DESTINATION ${CMAKE_CURRENT_BINARY_DIR} )
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.1.1.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.1.1.xml COPYONLY)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.bad.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.bad.xml COPYONLY)
++configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config/base.xml ${CMAKE_CURRENT_BINARY_DIR}/config/base.xml COPYONLY)
+ 
+ if( X11_XTest_FOUND )
+    kde4_add_unit_test(keyboard_daemon_test NOGUI keyboard_daemon_test.cpp ../keyboard_daemon.cpp ../layout_memory.cpp ../layout_memory_persister.cpp ../flags.cpp ../x11_helper.cpp ../xkb_helper.cpp ../xinput_helper.cpp ../layout_tray_icon.cpp ../keyboard_config.cpp ../xkb_rules.cpp ../keyboard_hardware.cpp ../bindings.cpp ../layouts_menu.cpp ../numlockx.c)
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index 40af7a7..7b12d34 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -9,7 +9,7 @@
 Summary: KDE Workspace
 Name:    kdebase-workspace
 Version: 4.7.80
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: GPLv2
 Group:   User Interface/Desktops
@@ -81,6 +81,8 @@ Patch52: kde-workspace-4.7.80-bz#732830-login.patch
 # adapted version of wac-html-widgets.patch
 Patch153: kde-workspace-4.7.80-wac-html-widgets.patch
 Patch154: kwin-check-opengl.diff
+# don't use INSTALL to copy file to current binary dir
+Patch155: kde-workspace-4.7.80-kcontrol-test-wrong-install.patch
 
 ## Fedora specific patches
 ## HAL-ectomy
@@ -374,6 +376,8 @@ Requires: akonadi
 %patch153 -p1 -b .wac-html-widgets
 %patch154 -p1 -b .kwin-check-opengl
 
+%patch155 -p1 -b .kcontrol-test-wrong-install
+
 # Fedora patches
 %patch200 -p1 -b .no_HAL
 %patch210 -p1 -b .no_HAL2
@@ -606,6 +610,7 @@ fi
 %{_kde4_libdir}/libkickoff.so
 %{_kde4_libdir}/libpowerdevilcore.so
 %{_kde4_libdir}/libpowerdevilui.so
+%{_kde4_libdir}/libpowerdevilconfigcommonprivate.so
 %{_kde4_libdir}/libsystemsettingsview.so
 %{_kde4_libdir}/kconf_update_bin/*
 %{_mandir}/man1/plasm*.1*
@@ -634,6 +639,7 @@ fi
 %{_kde4_libexecdir}/fontinst_helper
 %{_kde4_libexecdir}/fontinst_x11
 %{_kde4_libexecdir}/kfontprint
+%{_kde4_configdir}/kfontinst.knsrc
 %{_polkit_qt_policydir}/org.kde.fontinst.policy
 %{_polkit_qt_policydir}/org.kde.kcontrol.kcmclock.policy
 %{_polkit_qt_policydir}/org.kde.kcontrol.kcmkdm.policy
@@ -672,6 +678,7 @@ fi
 %{_kde4_libdir}/libkwineffects.so.1*
 %{_kde4_libdir}/libkwinnvidiahack.so.4*
 %{_kde4_libdir}/liboxygenstyle.so.4*
+%{_kde4_libdir}/liboxygenstyleconfig.so.4*
 %{_kde4_libdir}/libplasma-geolocation-interface.so.4*
 %{_kde4_libdir}/libplasma_applet-system-monitor.so.4*
 %{_kde4_libdir}/libplasmaclock.so.4*
@@ -682,6 +689,8 @@ fi
 %{_kde4_libdir}/libtaskmanager.so.4*
 %{_kde4_libdir}/libweather_ion.so.6*
 %{_kde4_libdir}/libpowerdevilcore.so.0*
+%{_kde4_libdir}/libpowerdevilconfigcommonprivate.so.4*
+%{_kde4_libdir}/libkwinglutils.so.1*
 %{_kde4_libdir}/kde4/plugins/gui_platform/libkde.so
 %{_kde4_libdir}/kde4/plugins/styles/oxygen.so
 
@@ -701,6 +710,7 @@ fi
 %{_kde4_libdir}/libkworkspace.so
 %{_kde4_libdir}/liblsofui.so
 %{_kde4_libdir}/liboxygenstyle.so
+%{_kde4_libdir}/liboxygenstyleconfig.so
 %{_kde4_libdir}/libplasma-geolocation-interface.so
 %{_kde4_libdir}/libplasma_applet-system-monitor.so
 %{_kde4_libdir}/libplasmaclock.so
@@ -711,10 +721,12 @@ fi
 %{_kde4_libdir}/libsolidcontrolifaces.so
 %{_kde4_libdir}/libtaskmanager.so
 %{_kde4_libdir}/libweather_ion.so
+%{_kde4_libdir}/libkwinglutils.so
 
 %files ksplash-themes
 %defattr(-,root,root,-)
 %{_kde4_appsdir}/ksplash/Themes/Default/
+%{_kde4_appsdir}/ksplash/Themes/Minimalistic/
 
 %files -n kdm
 %defattr(-,root,root,-)
@@ -767,7 +779,6 @@ fi
 %{_kde4_docdir}/HTML/en/ksysguard/
 %{_kde4_iconsdir}/oxygen/*/apps/computer.*
 %{_kde4_iconsdir}/oxygen/*/apps/daemon.*
-%{_kde4_iconsdir}/oxygen/*/apps/computer.*
 %{_kde4_iconsdir}/oxygen/*/apps/kdeapp.*
 %{_kde4_iconsdir}/oxygen/*/apps/kernel.*
 %{_kde4_iconsdir}/oxygen/*/apps/ksysguardd.*
@@ -805,15 +816,10 @@ fi
 %files -n oxygen-cursor-themes
 %defattr(-,root,root,-)
 %{_kde4_iconsdir}/Oxygen_Black/
-%{_kde4_iconsdir}/Oxygen_Black_Big/
 %{_kde4_iconsdir}/Oxygen_Blue/
-%{_kde4_iconsdir}/Oxygen_Blue_Big/
 %{_kde4_iconsdir}/Oxygen_White/
-%{_kde4_iconsdir}/Oxygen_White_Big/
 %{_kde4_iconsdir}/Oxygen_Yellow/
-%{_kde4_iconsdir}/Oxygen_Yellow_Big/
 %{_kde4_iconsdir}/Oxygen_Zion/
-%{_kde4_iconsdir}/Oxygen_Zion_Big/
 
 %if 0%{?googlegadgets}
 %files -n plasma-scriptengine-googlegadgets
@@ -843,6 +849,14 @@ fi
 
 
 %changelog
+* Thu Nov 24 2011 Radek Novacek <rnovacek at redhat.com> 4.7.80-3
+- Fixed file listed twice
+- Remove big cursors from files (they are no longer in upstream tarball)
+- Add new files: libkwinglutils.so*, liboxygenstyleconfig.so*
+  libpowerdevilconfigcommonprivate.so*, kfontinst.knsrc
+- New ksplash theme Minimalistic
+- patch: don't use INSTALL to copy file to current binary dir
+
 * Thu Nov 24 2011 Radek Novacek <rnovacek at redhat.com> 4.7.80-2
 - Drop "only show in kde" patch (applied upstream)
 
