- drop automoc libsuffix patch, no longer needed

epel9
Kevin Kofler 17 years ago
parent f2992e8fd5
commit f5d75ded43

@ -1,12 +0,0 @@
diff -up phonon-4.2/cmake/FindAutomoc4.cmake.lib64 phonon-4.2/cmake/FindAutomoc4.cmake
--- phonon-4.2/cmake/FindAutomoc4.cmake.lib64 2008-06-04 17:07:53.000000000 -0500
+++ phonon-4.2/cmake/FindAutomoc4.cmake 2008-06-14 19:15:00.000000000 -0500
@@ -32,7 +32,7 @@ else("${KDESupport_SOURCE_DIR}" STREQUAL
PATH_SUFFIXES automoc4 lib/automoc4 lib64/automoc4
PATHS ${_env_CMAKE_PREFIX_PATH} ${CMAKE_PREFIX_PATH} ${CMAKE_SYSTEM_PREFIX_PATH}
${_env_CMAKE_LIBRARY_PATH} ${CMAKE_LIBRARY_PATH} ${CMAKE_SYSTEM_LIBRARY_PATH}
- ${CMAKE_INSTALL_PREFIX}/lib
+ ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX} ${CMAKE_INSTALL_PREFIX}/lib
NO_DEFAULT_PATH )
endif("${KDESupport_SOURCE_DIR}" STREQUAL "${CMAKE_SOURCE_DIR}")

@ -5,7 +5,7 @@
Summary: Multimedia framework api Summary: Multimedia framework api
Name: phonon Name: phonon
Version: 4.2 Version: 4.2
Release: 0.2.%{?beta_tag}%{?dist} Release: 0.3.%{?beta_tag}%{?dist}
Group: System Environment/Libraries Group: System Environment/Libraries
License: LGPLv2+ License: LGPLv2+
@ -15,9 +15,6 @@ URL: http://phonon.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/unstable/4.0.83/support/phonon-%{beta}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# patch needed for F-9/cmake-2.4
Patch1: phonon-4.2-automoc_libsuffix.patch
BuildRequires: automoc BuildRequires: automoc
BuildRequires: cmake BuildRequires: cmake
BuildRequires: glib2-devel BuildRequires: glib2-devel
@ -48,9 +45,6 @@ Requires: pkgconfig
%prep %prep
%setup -q -n phonon-%{beta} %setup -q -n phonon-%{beta}
# unconditionly apply this, should cause no harm. We'll sort this out upstream soonish
%patch1 -p1 -b .automoc_libsuffix
%build %build
mkdir -p %{_target_platform} mkdir -p %{_target_platform}
@ -99,6 +93,9 @@ rm -rf %{buildroot}
%changelog %changelog
* Tue Jul 01 2008 Kevin Kofler <Kevin@tigcc.ticalc.org> 4.2-0.3.beta2
- drop automoc libsuffix patch, no longer needed
* Fri Jun 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.2-0.2.beta2 * Fri Jun 20 2008 Rex Dieter <rdieter@fedoraproject.org> 4.2-0.2.beta2
- phonon 4.2beta2 (aka 4.1.83) - phonon 4.2beta2 (aka 4.1.83)

Loading…
Cancel
Save