rpms/kdebase-runtime/F-8 .cvsignore, 1.11, 1.12 kdebase-runtime.spec, 1.18, 1.19 sources, 1.11, 1.12

[Kevin Kofler]

Author: kkofler

Update of /cvs/pkgs/rpms/kdebase-runtime/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21956/F-8

Modified Files:
	.cvsignore kdebase-runtime.spec sources 
Log Message:
Sync from devel:

* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
- fix broken audio-backend-jack.svgz

* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
- add missing icons

* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
- make VERBOSE=1
- respin against new(er) kde-filesystem
- grow -libs, kde4 styles are unavailable for i386 applications (#456826)

* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
- 4.1.2

* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
- fix inherit issue in iconthemes, preview icons
  do not show


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/.cvsignore,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- .cvsignore	4 Sep 2008 21:36:31 -0000	1.11
+++ .cvsignore	6 Oct 2008 23:24:52 -0000	1.12
@@ -1,3 +1,9 @@
-kdebase-runtime-4.0.99.tar.bz2
-kdebase-runtime-4.1.0.tar.bz2
-kdebase-runtime-4.1.1.tar.bz2
+kdebase-runtime-4.1.2.tar.bz2
+audio-backend-arts.svgz
+audio-backend-esd.svgz
+audio-backend-jack.svgz
+audio-backend-pulseaudio.svgz
+audio-card-firewire.svgz
+audio-card-usb.svgz
+audio-headset-bluetooth.svgz
+audio-headset-usb.svgz


Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/kdebase-runtime.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kdebase-runtime.spec	4 Sep 2008 21:36:31 -0000	1.18
+++ kdebase-runtime.spec	6 Oct 2008 23:24:52 -0000	1.19
@@ -9,17 +9,27 @@
 
 Name:          kdebase-runtime
 Summary:       K Desktop Environment - Runtime 
-Version:       4.1.1
-Release:       2%{?dist}
+Version:       4.1.2
+Release:       4%{?dist}
 
 License:       GPLv2
 Group:         User Interface/Desktops
 URL:           http://www.kde.org/
 Source0:       ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-runtime-%{version}.tar.bz2
 Source1:       khelpcenter.desktop
+# http://websvn.kde.org/trunk/playground/artwork/Oxygen/phonon/
+Source2:       audio-backend-arts.svgz
+Source3:       audio-backend-esd.svgz
+Source4:       audio-backend-jack.svgz
+Source5:       audio-backend-pulseaudio.svgz
+Source6:       audio-card-firewire.svgz
+Source7:       audio-card-usb.svgz
+Source8:       audio-headset-bluetooth.svgz
+Source9:       audio-headset-usb.svgz
 Patch0:        kdebase-runtime-4.1.0-pulseaudio.patch
 Patch1:        kdebase-runtime-4.1.x-searchproviders-shortcuts.patch
 Patch2:        kdebase-runtime-4.1.1-knetattach.patch
+Patch3:        kdebase-runtime-4.1.1-iconthemes-inherit.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %ifarch noarch
@@ -29,14 +39,15 @@
 %define rest 1
 %endif
 
+Requires: %{name}-libs = %{version}-%{release}
+
 Obsoletes: kdebase4-runtime < %{version}-%{release}
 Provides:  kdebase4-runtime = %{version}-%{release}
 
 BuildRequires: kde-filesystem
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(postun): /sbin/ldconfig xdg-utils
-Requires: kdelibs4 >= %{version}
+Requires(post): xdg-utils
+Requires(postun): xdg-utils
 Requires: kdepimlibs >= %{version}
 %ifnarch s390 s390x
 Requires: eject
@@ -65,6 +76,7 @@
 BuildRequires: xorg-x11-font-utils
 BuildRequires: xorg-x11-proto-devel
 BuildRequires: zlib-devel
+BuildRequires: ImageMagick
 
 %description
 Core runtime for the K Desktop Environment 4.
@@ -73,6 +85,14 @@
 provided by KDE 3 because of file and configuration setting conflicts.
 %endif
 
+%package libs
+Summary: Runtime libraries for %{name}
+Group:   System Environment/Libraries
+Requires: kdelibs4 >= %{version}
+Requires: %{name} = %{version}-%{release}
+%description libs
+%{summary}.
+
 %package -n oxygen-icon-theme
 Summary: Oxygen icon theme
 Group: User Interface/Desktops
@@ -102,6 +122,7 @@
 %patch0 -p1 -b .pulseaudio
 %patch1 -p1 -b .searchproviders-shortcuts
 %patch2 -p1 -b .knetattach
+%patch3 -p1 -b .iconthemes-inherit
 
 # upstream patches
 
@@ -113,7 +134,7 @@
 popd
 
 %if 0%{?rest}
-make %{?_smp_mflags} -C %{_target_platform}
+make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1
 %endif
 
 
@@ -126,6 +147,18 @@
 
 %if 0%{?icons}
 make install DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+# install phone-xine icons
+for i in 16 22 32 48 64 128 ; do
+  install -m 0644 -D phonon/xine/ox$i-app-phonon-xine.png %{buildroot}%{_kde4_iconsdir}/oxygen/${i}x${i}/apps/phonon-xine.png
+done
+install -m 0644 -D phonon/xine/oxsc-app-phonon-xine.svgz %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/phonon-xine.svgz
+for j in %{SOURCE2} %{SOURCE3} %{SOURCE4} %{SOURCE5} %{SOURCE6} %{SOURCE7} %{SOURCE8} %{SOURCE9} ; do
+  n=`basename $j`
+  for i in 16 22 32 48 64 128; do
+    convert -background None -geometry ${i}x${i} ${j} %{buildroot}%{_datadir}/icons/oxygen/${i}x${i}/apps/${n%.svgz}.png
+  done
+  install -m 0644 -D ${j} %{buildroot}%{_kde4_iconsdir}/oxygen/scalable/apps/${n}
+done
 %if ! 0%{?rest}
 ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
 %endif
@@ -244,17 +277,19 @@
 
 
 %post
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
 %postun
-/sbin/ldconfig ||:
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || : }
 %{!?kde3_desktop:xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || : }
 xdg-desktop-menu forceupdate 2> /dev/null || :
 
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
 %if 0%{?icons}
 %post -n oxygen-icon-theme
 xdg-icon-resource forceupdate --theme oxygen 2> /dev/null || :
@@ -287,14 +322,16 @@
 %{_kde4_datadir}/sounds/*
 %{_kde4_libdir}/kconf_update_bin/*
 %{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_libdir}/libkaudiodevicelist.so.*
-%{_kde4_libdir}/kde4/*.so
-%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/kcm_*.so
+%{_kde4_libdir}/kde4/kded_*.so
 %{_kde4_libexecdir}/*
-%{_kde4_libdir}/kde4/plugins/styles/
 %{_libdir}/strigi/*
 %{_mandir}/man1/*
 
+%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
+%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
+
 %if ! 0%{?kde3_desktop}
 %{_kde4_iconsdir}/hicolor/*/*/*
 %{_kde4_docdir}/HTML/en/*
@@ -310,10 +347,15 @@
 %{_datadir}/services/khelpcenter.desktop
 %endif
 
-%exclude %{_kde4_libdir}/kde4/kcm_phononxine.so
-%exclude %{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
+%files libs
+%defattr(-,root,root,-)
+%{_kde4_libdir}/libkaudiodevicelist.so.*
+%{_kde4_libdir}/kde4/*.so
+%{_kde4_libdir}/kde4/plugins/phonon_platform/
+%{_kde4_libdir}/kde4/plugins/styles/
+%exclude %{_kde4_libdir}/kde4/kcm_*.so
+%exclude %{_kde4_libdir}/kde4/kded_*.so
 %exclude %{_kde4_libdir}/kde4/phonon_xine.so
-%exclude %{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
 
 %files -n phonon-backend-xine
 %defattr(-,root,root,-)
@@ -338,6 +380,24 @@
 
 
 %changelog
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-4
+- fix broken audio-backend-jack.svgz
+
+* Tue Sep 30 2008 Than Ngo <than at redhat.com> 4.1.2-3
+- add missing icons
+
+* Sun Sep 28 2008 Rex Dieter <rdieter at fedoraproject.org> 4.1.2-2
+- make VERBOSE=1
+- respin against new(er) kde-filesystem
+- grow -libs, kde4 styles are unavailable for i386 applications (#456826)
+
+* Fri Sep 26 2008 Rex Dieter <rdieter at fedoraproject.org. 4.1.2-1
+- 4.1.2
+
+* Tue Sep 16 2008 Than Ngo <than at redhat.com> 4.1.1-3
+- fix inherit issue in iconthemes, preview icons
+  do not show
+
 * Mon Sep 01 2008 Than Ngo <than at redhat.com> 4.1.1-2
 - fix #460710, knetattach is kio_remote's wizard program, don't show
   it in the menu.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebase-runtime/F-8/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	1 Sep 2008 09:44:52 -0000	1.11
+++ sources	6 Oct 2008 23:24:52 -0000	1.12
@@ -1 +1,9 @@
-f03488d19c3bd95634b797229ac55127  kdebase-runtime-4.1.1.tar.bz2
+1f17bdfa4bee4bf1c7afc2bd5bdbae59  kdebase-runtime-4.1.2.tar.bz2
+f976564b84c96c43ef7bbb42576ef7bf  audio-backend-arts.svgz
+1c229ebbf0d2063927175159329ba7b8  audio-backend-esd.svgz
+0f9b16ddfbc760a82a2c51a2846c8894  audio-backend-pulseaudio.svgz
+556827fe755f3348f6b2227e29c687dc  audio-card-firewire.svgz
+1db9c22cb987582526b5b45423116f9b  audio-card-usb.svgz
+6fb861774412d3f63accf480980c0488  audio-headset-bluetooth.svgz
+b75bce5f507225e0760061a7276271a5  audio-headset-usb.svgz
+26411a187b7aa9a722f91ead4e557aa0  audio-backend-jack.svgz