rpms/kdelibs4/F-7 kdelibs-3.97.0-alsa-default-device.patch, NONE, 1.1 kdelibs-3.97.0-flac113.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 kdelibs4.spec, 1.6, 1.7 sources, 1.5, 1.6

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Thu Jan 10 05:40:55 UTC 2008 

Author: kkofler

Update of /cvs/pkgs/rpms/kdelibs4/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25917/F-7

Modified Files:
	.cvsignore kdelibs4.spec sources 
Added Files:
	kdelibs-3.97.0-alsa-default-device.patch 
	kdelibs-3.97.0-flac113.patch 
Log Message:
Sync from kdelibs/devel:

* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.0.0-1
- 4.0.0

* Fri Jan 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-11
- force Phonon to use the ALSA default device by default

* Wed Jan 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-10
- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake

* Sat Dec 22 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-9
- drop BR aspell-devel on F9+, use only enchant (FeatureDictionary)

* Tue Dec 18 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-8
- don't put binaries into kdelibs-common, they drag in kdelibs (#417251)

* Mon Dec 17 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
- split out kdelibs-common on F9+ (shared with KDE 3) (#417251)
- Requires: kdelibs-common (F9+) (#417251)

* Tue Dec 11 2007 Than Ngo <than at redhat.com> 3.97.0-6
- enable subversion again

* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
- rebuild for changed _kde4_includedir

* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
- drop Req: kdebase-runtime oxygen-icon-theme (at least for now)

* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-2
- drop BR: subversion temporarily (due to rawhide breakage)

* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
- kde-3.97.0

* Tue Dec 04 2007 Than Ngo <than at redhat.com> 3.96.2-4
- rebuilt against new openssl/openldap

kdelibs-3.97.0-alsa-default-device.patch:

--- NEW FILE kdelibs-3.97.0-alsa-default-device.patch ---
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodevice.cpp	2007-11-20 23:02:30.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodevice.cpp	2008-01-04 16:23:04.000000000 +0100
@@ -349,6 +349,8 @@
     if (lines.size() > 1) {
         d->cardName = i18n("%1 (%2)", d->cardName, lines[1]);
     }
+    if (alsaDeviceName == "default")
+        d->initialPreference = 1000;
     if (alsaDeviceName.startsWith("front:") ||
             alsaDeviceName.startsWith("rear:") ||
             alsaDeviceName.startsWith("center_lfe:") ||
diff -ur kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp
--- kdelibs-3.97.0/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2007-11-27 18:17:14.000000000 +0100
+++ kdelibs-3.97.0-alsa-default-device/phonon/libkaudiodevicelist/audiodeviceenumerator.cpp	2008-01-04 16:23:04.000000000 +0100
@@ -188,6 +188,11 @@
     }
     snd_device_name_free_hint(hints);
 
+    DeviceHint defaultHint;
+    defaultHint.name = QString::fromLatin1("default");
+    defaultHint.description= QString::fromLatin1("ALSA Default Device");
+    deviceHints << defaultHint;
+
     snd_config_update_free_global();
     snd_config_update();
     Q_ASSERT(snd_config);

kdelibs-3.97.0-flac113.patch:

--- NEW FILE kdelibs-3.97.0-flac113.patch ---
Index: kdelibs/cmake/modules/FindFlac.cmake
===================================================================
--- kdelibs/cmake/modules/FindFlac.cmake	(revision 749960)
+++ kdelibs/cmake/modules/FindFlac.cmake	(working copy)
@@ -5,6 +5,9 @@
 #  FLAC_INCLUDE_DIR - the Flac include directory
 #  FLAC_LIBRARIES - Link these to use Flac
 #  FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac
+#
+# No version checking is done - use FLAC_API_VERSION_CURRENT to
+# conditionally compile version-dependent code
 
 # Copyright (c) 2006, Laurent Montel, <montel at kde.org>
 # Copyright (c) 2006, Alexander Neundorf, <neundorf at kde.org>
@@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC )
 
 FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC)
 
-check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK)
-
 
 
-IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
+IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
    SET(FLAC_FOUND TRUE)
    IF (FLAC_OGG_LIBRARY)
       SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES})
    ENDIF (FLAC_OGG_LIBRARY)
-ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
+ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
    SET(FLAC_FOUND FALSE)
-ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
+ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
 
 IF(FLAC_FOUND)
    IF(NOT Flac_FIND_QUIETLY)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Dec 2007 02:29:16 -0000	1.5
+++ .cvsignore	10 Jan 2008 05:40:20 -0000	1.6
@@ -1 +1 @@
-kdelibs-3.96.2.tar.bz2
+kdelibs-4.0.0.tar.bz2


Index: kdelibs4.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/kdelibs4.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- kdelibs4.spec	3 Dec 2007 11:01:04 -0000	1.6
+++ kdelibs4.spec	10 Jan 2008 05:40:20 -0000	1.7
@@ -3,8 +3,8 @@
 # 1. package some noarch bits separately: apidocs.
 
 Summary: K Desktop Environment 4 - Libraries
-Version: 3.96.2
-Release: 3%{?dist}.1
+Version: 4.0.0
+Release: 1%{?dist}
 
 %if 0%{?fedora} > 8
 Name: kdelibs
@@ -35,6 +35,9 @@
 Requires: kde-settings
 %{?_kde4_macros_api:Requires: kde4-macros(api) = %{_kde4_macros_api} }
 Requires: shared-mime-info
+%if "%{name}" == "kdelibs"
+Requires: kdelibs-common
+%endif
 
 Source1: kde4.sh
 Source2: kde4.csh
@@ -45,6 +48,12 @@
 Patch1: kdelibs-3.93.0-kde149703.diff
 # fix kde#149705
 Patch2: kdelibs-3.95.0-kde149705.patch
+# FLAC 1.1.3+ support for FindFlac.cmake (patch by Alex Merry)
+# http://lists.kde.org/?l=kde-multimedia&m=119806833708186&w=2
+Patch3: kdelibs-3.97.0-flac113.patch
+# Force Phonon to use the ALSA default device by default
+# This should make it work better with PulseAudio.
+Patch4: kdelibs-3.97.0-alsa-default-device.patch
 
 BuildRequires: qt4-devel >= 4.3.0
 Requires: qt4 >= %{_qt4_version} 
@@ -53,7 +62,10 @@
 Requires(postun): /sbin/ldconfig xdg-utils
 
 BuildRequires: alsa-lib-devel
+%if 0%{?fedora} < 9
+# we don't want a hard dependency on aspell on F9+, use enchant only
 BuildRequires: aspell-devel
+%endif
 BuildRequires: avahi-devel
 BuildRequires: bzip2-devel
 BuildRequires: cmake
@@ -75,7 +87,7 @@
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel
 BuildRequires: shared-mime-info
-BuildRequires: soprano-devel >= 1.97.1
+BuildRequires: soprano-devel >= 1.99
 BuildRequires: strigi-devel >= 0.5.7
 BuildRequires: zlib-devel
 # extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts) 
@@ -87,6 +99,14 @@
 %description
 Libraries for the K Desktop Environment 4.
 
+%if "%{name}" == "kdelibs"
+%package common
+Group: System Environment/Libraries
+Summary: Common files for KDE 3 and KDE 4 libraries
+%description common
+This package includes the common files for the KDE 3 and KDE 4 libraries.
+%endif
+
 %package devel
 Group: Development/Libraries
 Summary: Header files for compiling KDE 4 applications
@@ -111,6 +131,8 @@
 %patch0 -p1 -b .parallel_devel
 %patch1 -p1 -b .kde149703
 %patch2 -p1 -b .kde149705
+%patch3 -p1 -b .flac113
+%patch4 -p1 -b .alsa-default
 
 
 %build
@@ -201,9 +223,6 @@
 %{_kde4_sharedir}/kde4/services/*
 %{_kde4_sharedir}/kde4/servicetypes/*
 %{_kde4_sharedir}/icons/hicolor/*/actions/presence_*
-%if "%{name}" == "kdelibs"
-%{_kde4_datadir}/locale/all_languages/
-%endif
 %{_kde4_docdir}/HTML/en/*
 %{_kde4_libdir}/lib*.so.*
 %{_kde4_libdir}/libkdeinit4_*.so
@@ -211,6 +230,22 @@
 %exclude %{_kde4_libdir}/kde4/devel/
 %{_kde4_sysconfdir}/xdg/menus/*.menu
 %doc %{_mandir}/man*/*
+# kdelibs-common comes from here for fedora >= 9
+%if "%{name}" == "kdelibs"
+%exclude %{_kde4_configdir}/kdebug.areas
+%exclude %{_kde4_configdir}/kdebugrc
+%exclude %{_kde4_configdir}/ui/ui_standards.rc
+%exclude %{_kde4_docdir}/HTML/en/common
+
+%files common
+%defattr(-,root,root,-)
+%{_kde4_configdir}/kdebug.areas
+%{_kde4_configdir}/kdebugrc
+%dir %{_kde4_configdir}/ui
+%{_kde4_configdir}/ui/ui_standards.rc
+%{_kde4_docdir}/HTML/en/common
+%{_kde4_datadir}/locale/all_languages/
+%endif
 
 %files devel
 %defattr(-,root,root,-)
@@ -226,8 +261,42 @@
 
 
 %changelog
-* Mon Dec 03 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3.fc7.1
-- remove kdebase-runtime reqs in F7 branch to work around chicken&egg problem
+* Mon Jan 07 2008 Than Ngo <than at redhat.com> 4.0.0-1
+- 4.0.0
+
+* Fri Jan 04 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-11
+- force Phonon to use the ALSA default device by default
+
+* Wed Jan 02 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-10
+- apply patch by Alex Merry to support FLAC 1.1.3+ in FindFlac.cmake
+
+* Sat Dec 22 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-9
+- drop BR aspell-devel on F9+, use only enchant (FeatureDictionary)
+
+* Tue Dec 18 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-8
+- don't put binaries into kdelibs-common, they drag in kdelibs (#417251)
+
+* Mon Dec 17 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-7
+- split out kdelibs-common on F9+ (shared with KDE 3) (#417251)
+- Requires: kdelibs-common (F9+) (#417251)
+
+* Tue Dec 11 2007 Than Ngo <than at redhat.com> 3.97.0-6
+- enable subversion again
+
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.97.0-5
+- rebuild for changed _kde4_includedir
+
+* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-4
+- drop Req: kdebase-runtime oxygen-icon-theme (at least for now)
+
+* Thu Dec 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-2
+- drop BR: subversion temporarily (due to rawhide breakage)
+
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.97.0-1
+- kde-3.97.0
+
+* Tue Dec 04 2007 Than Ngo <than at redhat.com> 3.96.2-4
+- rebuilt against new openssl/openldap
 
 * Sat Dec 01 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 3.96.2-3
 - install profile scripts as 644 instead of 755 (Ville Skyttä, #407521)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdelibs4/F-7/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Dec 2007 02:29:16 -0000	1.5
+++ sources	10 Jan 2008 05:40:20 -0000	1.6
@@ -1 +1 @@
-f8dc1a0a7ae5b580b6d85938995789cc  kdelibs-3.96.2.tar.bz2
+79d0f83ca81fc4a135663943340c0b8f  kdelibs-4.0.0.tar.bz2

More information about the fedora-extras-commits mailing list