rpms/kdebase-runtime/devel .cvsignore, 1.22, 1.23 kdebase-runtime.spec, 1.76, 1.77 sources, 1.23, 1.24 kdebase-runtime-4.1.0-pulseaudio.patch, 1.1, NONE kdebase-runtime-4.1.2-kioexec.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Wed Nov 19 22:05:55 UTC 2008
Author: than
Update of /cvs/extras/rpms/kdebase-runtime/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16550
Modified Files:
.cvsignore kdebase-runtime.spec sources
Removed Files:
kdebase-runtime-4.1.0-pulseaudio.patch
kdebase-runtime-4.1.2-kioexec.patch
Log Message:
drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 30 Sep 2008 15:05:49 -0000 1.22
+++ .cvsignore 19 Nov 2008 22:05:25 -0000 1.23
@@ -7,3 +7,4 @@
audio-card-usb.svgz
audio-headset-bluetooth.svgz
audio-headset-usb.svgz
+kdebase-runtime-4.1.80.tar.bz2
Index: kdebase-runtime.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/kdebase-runtime.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- kdebase-runtime.spec 20 Oct 2008 16:27:02 -0000 1.76
+++ kdebase-runtime.spec 19 Nov 2008 22:05:25 -0000 1.77
@@ -1,5 +1,3 @@
-%define _default_patch_fuzz 2
-
%if 0%{?fedora} < 9
# # kde3_desktop=1 -> kde3 is primary desktop, omit conflicting bits here
%define kde3_desktop 1
@@ -8,30 +6,19 @@
%define _with_samba --with-samba
Name: kdebase-runtime
-Summary: K Desktop Environment - Runtime
-Version: 4.1.2
-Release: 5%{?dist}
+Summary: K Desktop Environment - Runtime
+Version: 4.1.80
+Release: 2%{?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
-# Upstream patces
-Patch100: kdebase-runtime-4.1.2-kioexec.patch
+# Upstream patches
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch noarch
@@ -56,7 +43,7 @@
%endif
BuildRequires: alsa-lib-devel
-BuildRequires: cmake
+BuildRequires: cmake >= 2.6.2
BuildRequires: clucene-core-devel
BuildRequires: giflib-devel
BuildRequires: hal-devel
@@ -71,7 +58,6 @@
BuildRequires: qimageblitz-devel
BuildRequires: soprano-devel >= 2.0.97
BuildRequires: strigi-devel >= 0.5.7
-BuildRequires: xine-lib-devel
# needed for phonon-xine VideoWidget, also need xine-lib built with libxcb support
BuildRequires: libxcb-devel
# needed?
@@ -109,29 +95,18 @@
%description -n oxygen-icon-theme-scalable
%{summary}.
-%package -n phonon-backend-xine
-Summary: Xine phonon backend
-Group: Applications/Multimedia
-# not sure exactly how best to version this one -- Rex
-Provides: phonon-backend = 4.2
-%description -n phonon-backend-xine
-%{summary}.
-
-
%prep
%setup -q -n kdebase-runtime-%{version}
-%patch0 -p1 -b .pulseaudio
%patch1 -p1 -b .searchproviders-shortcuts
%patch2 -p1 -b .knetattach
%patch3 -p1 -b .iconthemes-inherit
# upstream patches
-%patch100 -p1 -b .kioexec
%build
-mkdir -p %{_target_platform}
+mkdir -p %{_target_platform}
pushd %{_target_platform}
%{cmake_kde4} ..
popd
@@ -145,23 +120,12 @@
rm -rf %{buildroot}
%if 0%{?rest}
-make install DESTDIR=%{buildroot} -C %{_target_platform}
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
%endif
%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
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}/pics/oxygen
+
%if ! 0%{?rest}
ln -sf oxygen %{buildroot}%{_kde4_iconsdir}/default.kde4
%endif
@@ -267,10 +231,6 @@
# FIXME: -devel type files, omit for now
rm -rf %{buildroot}%{_kde4_includedir}/phonon/
rm -f %{buildroot}%{_kde4_libdir}/libkaudiodevicelist.so
-# /usr/include/kde4/phonon/audiodevice.h
-# /usr/include/kde4/phonon/audiodeviceenumerator.h
-# /usr/include/kde4/phonon/kaudiodevicelist_export.h
-# /usr/lib64/libkaudiodevicelist.so
%endif
@@ -290,7 +250,6 @@
xdg-desktop-menu forceupdate 2> /dev/null || :
%post libs -p /sbin/ldconfig
-
%postun libs -p /sbin/ldconfig
%if 0%{?icons}
@@ -328,14 +287,12 @@
%{_kde4_libdir}/libkdeinit4_*.so
%{_kde4_libdir}/kde4/kcm_*.so
%{_kde4_libdir}/kde4/kded_*.so
+%{_kde4_libdir}/libkwalletbackend.so
+%{_kde4_libdir}/libkwalletbackend.so.*
%{_kde4_libexecdir}/*
%{_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/*
@@ -353,20 +310,9 @@
%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
-
-%files -n phonon-backend-xine
-%defattr(-,root,root,-)
-%{_kde4_libdir}/kde4/kcm_phononxine.so
-%{_kde4_datadir}/kde4/services/kcm_phononxine.desktop
-%{_kde4_libdir}/kde4/phonon_xine.so
-%{_kde4_datadir}/kde4/services/phononbackends/xine.desktop
%endif
@@ -384,6 +330,26 @@
%changelog
+* Wed Nov 19 2008 Than Ngo <than at redhat.com> 4.1.80-2
+- drop kdebase-runtime-4.0.72-pulseaudio.patch/icons, it's part of phonon
+
+* Fri Nov 21 2008 Lorenzo Villani <lvillani at binaryhelix.net> - 4.1.80-1
+- 4.1.80
+- Drop upstreamed patch kdebase-runtime-4.1.2-kioexec.patch
+- BR cmake >= 2.6.2
+- Use 'make install/fast'
+- Drop subpkg phonon-backend-xine and related file entries: this has to be
+ part of phonon now that it moved there
+- Drop xine-lib-devel BR
+- Add libkwalletbackend to files list
+- Drop _default_patch_fuzz 2
+
+* Thu Nov 13 2008 Than Ngo <than at redhat.com> 4.1.3-5
+- apply upstream patch to fix X crash when disabling compositing
+
+* Wed Nov 12 2008 Than Ngo <than at redhat.com> 4.1.3-1
+- 4.1.3
+
* Tue Oct 14 2008 Than Ngo <than at redhat.com> 4.1.2-5
- apply upstream patch, kioexec processes never terminate
@@ -453,7 +419,7 @@
- 4.0.82
* Thu Jun 05 2008 Than Ngo <than at redhat.com> 4.0.80-2
-- add searchproviders-shortcuts for redhat bugzilla
+- add searchproviders-shortcuts for redhat bugzilla
* Mon May 26 2008 Than Ngo <than at redhat.com> 4.0.80-1
- 4.1 beta 1
@@ -503,7 +469,7 @@
- 4.0.3
* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-5
-- don't own %%_kde4_docdir/HTML/en/
+- don't own %%_kde4_docdir/HTML/en/
* Thu Mar 20 2008 Rex Dieter <rdieter at fedoraproject.org> 4.0.2-4
- oxygen-icon-theme, oxygen-icon-theme-scalable pkgs
@@ -539,7 +505,7 @@
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
- kde-3.97.0
-* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4
+* Tue Dec 04 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.96.2-4
- disable kioslave/smb (f9+, samba-3.2.x/gplv3 ickiness)
* Sun Dec 02 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdebase-runtime/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 30 Sep 2008 15:32:37 -0000 1.23
+++ sources 19 Nov 2008 22:05:25 -0000 1.24
@@ -1,9 +1 @@
-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
+f32b010ddd2840c192413a170927d1d3 kdebase-runtime-4.1.80.tar.bz2
--- kdebase-runtime-4.1.0-pulseaudio.patch DELETED ---
--- kdebase-runtime-4.1.2-kioexec.patch DELETED ---
More information about the scm-commits
mailing list