From 5d02d707f02f9628b3b8a207271bb56b5c5f3b2d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 31 Jan 2008 12:52:43 +0000 Subject: [PATCH] * Wed Jan 30 2008 Rex Dieter 4.0.1-1 - 4.0.1 --- .cvsignore | 3 +-- kdelibs-3.97.0-flac113.patch | 36 ------------------------------------ kdelibs.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 45 deletions(-) delete mode 100644 kdelibs-3.97.0-flac113.patch diff --git a/.cvsignore b/.cvsignore index 797b626..bd10e4b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,2 @@ -kdelibs-3.96.2.tar.bz2 -kdelibs-3.97.0.tar.bz2 kdelibs-4.0.0.tar.bz2 +kdelibs-4.0.1.tar.bz2 diff --git a/kdelibs-3.97.0-flac113.patch b/kdelibs-3.97.0-flac113.patch deleted file mode 100644 index 6e48dd6..0000000 --- a/kdelibs-3.97.0-flac113.patch +++ /dev/null @@ -1,36 +0,0 @@ -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, - # Copyright (c) 2006, Alexander Neundorf, -@@ -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) diff --git a/kdelibs.spec b/kdelibs.spec index c326ba7..a5822a5 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -3,8 +3,8 @@ # 1. package some noarch bits separately: apidocs. Summary: K Desktop Environment 4 - Libraries -Version: 4.0.0 -Release: 4%{?dist} +Version: 4.0.1 +Release: 1%{?dist} %if 0%{?fedora} > 8 Name: kdelibs @@ -51,9 +51,6 @@ Patch0: kdelibs-3.95.0-parallel_devel.patch 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 @@ -141,7 +138,6 @@ applications for KDE 4. %patch0 -p1 -b .parallel_devel %patch1 -p1 -b .kde149703 %patch2 -p1 -b .kde149705 -%patch3 -p1 -b .flac113 %patch4 -p1 -b .alsa-default %if 0%{?fedora} >= 9 %patch5 -p1 -b .k3spell-hunspell @@ -278,6 +274,9 @@ rm -rf %{buildroot} %changelog +* Wed Jan 30 2008 Rex Dieter 4.0.1-1 +- 4.0.1 + * Wed Jan 30 2008 Rex Dieter 4.0.0-4 - omit openssl patch (f9+ #429846) - respin (qt4) diff --git a/sources b/sources index 4015a49..2020132 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -79d0f83ca81fc4a135663943340c0b8f kdelibs-4.0.0.tar.bz2 +4a756aa3cc8926efba2ee0b8a5e078dd kdelibs-4.0.1.tar.bz2