From 9376aea9a8ebf1f1583e93e9e7430a7d5bdd6256 Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Jun 27 2012 11:12:34 +0000 Subject: 4.8.95 --- diff --git a/.gitignore b/.gitignore index 03b0de4..e04a740 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/audiocd-kio-4.8.90.tar.xz +/audiocd-kio-4.8.95.tar.xz diff --git a/audiocd-kio-4.8.90-cmake_oggvorbis.patch b/audiocd-kio-4.8.90-cmake_oggvorbis.patch deleted file mode 100644 index e9dac5b..0000000 --- a/audiocd-kio-4.8.90-cmake_oggvorbis.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up audiocd-kio-4.8.90/plugins/CMakeLists.txt.cmake_oggvorbis audiocd-kio-4.8.90/plugins/CMakeLists.txt ---- audiocd-kio-4.8.90/plugins/CMakeLists.txt.cmake_oggvorbis 2012-05-22 19:42:50.000000000 -0500 -+++ audiocd-kio-4.8.90/plugins/CMakeLists.txt 2012-06-13 08:52:00.512963773 -0500 -@@ -6,6 +6,9 @@ if (FLAC_FOUND) - add_subdirectory( flac ) - endif(FLAC_FOUND) - -+macro_optional_find_package(OggVorbis) -+macro_log_feature(OGGVORBIS_FOUND "OggVorbis" "Libraries for Ogg Vorbis general audio compression codec" "http://www.xiph.org" FALSE "" "Required for the AudioCD Ogg Vorbis plugin.") -+ - if (OGGVORBIS_FOUND) - add_subdirectory( vorbis ) - endif(OGGVORBIS_FOUND) -diff -up audiocd-kio-4.8.90/plugins/vorbis/encodervorbis.h.cmake_oggvorbis audiocd-kio-4.8.90/plugins/vorbis/encodervorbis.h ---- audiocd-kio-4.8.90/plugins/vorbis/encodervorbis.h.cmake_oggvorbis 2012-05-22 19:42:50.000000000 -0500 -+++ audiocd-kio-4.8.90/plugins/vorbis/encodervorbis.h 2012-06-13 08:52:11.382827881 -0500 -@@ -25,7 +25,6 @@ - #ifndef ENCODER_VORBIS_H - #define ENCODER_VORBIS_H - --#include - #include "ui_encodervorbisconfig.h" - #ifdef HAVE_VORBIS - diff --git a/audiocd-kio.spec b/audiocd-kio.spec index a1b07b7..2a20b74 100644 --- a/audiocd-kio.spec +++ b/audiocd-kio.spec @@ -1,8 +1,8 @@ Name: audiocd-kio Summary: Audiocd kio slave -Version: 4.8.90 -Release: 2%{?dist} +Version: 4.8.95 +Release: 1%{?dist} # code GPLv2+, handbook/docs GFDL License: GPLv2+ and GFDL @@ -16,8 +16,6 @@ URL: https://projects.kde.org/projects/kde/kdemultimedia/%{name} Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz ## upstream patches -# http://commits.kde.org/audiocd-kio/4097962ce47be1ecc4cc98576e57d49e02562c2e -Patch100: audiocd-kio-4.8.90-cmake_oggvorbis.patch BuildRequires: cdparanoia-devel cdparanoia BuildRequires: kdelibs4-devel >= %{version} @@ -63,8 +61,6 @@ Conflicts: kdemultimedia-devel < 6:4.8.80 %prep %setup -q -%patch100 -p1 -b .cmake_oggvorbis - %build mkdir -p %{_target_platform} @@ -115,6 +111,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Wed Jun 27 2012 Jaroslav Reznik - 4.8.95-1 +- 4.8.95 + * Wed Jun 13 2012 Rex Dieter 4.8.90-2 - License: GPLv2+ and GFDL diff --git a/sources b/sources index c30a452..9b0084d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a3ce8cc1ebd98ac3b853ccecda79dbbe audiocd-kio-4.8.90.tar.xz +45127698630e96da7fd83aa8e84805ba audiocd-kio-4.8.95.tar.xz