- phonon-4.4.4

.gitignore

@@ -6,4 +6,4 @@
 /hi48-phonon-gstreamer.png
 /hi64-phonon-gstreamer.png
 /phonon-4.4.3.tar.bz2
-/phonon-4.4.4-20110104.tar.bz2
+/phonon-4.4.4.tar.bz2

phonon-4.4.4-no_rpath.patch

@@ -1,21 +1,12 @@
 diff -up phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath phonon-4.4.4/cmake/FindPhononInternal.cmake
---- phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath	2011-01-03 12:22:10.000000000 -0600
-+++ phonon-4.4.4/cmake/FindPhononInternal.cmake	2011-01-04 12:18:57.923070047 -0600
-@@ -232,8 +232,8 @@ endif(APPLE)
+--- phonon-4.4.4/cmake/FindPhononInternal.cmake.no_rpath	2011-01-19 13:20:00.000000000 -0600
++++ phonon-4.4.4/cmake/FindPhononInternal.cmake	2011-01-21 07:55:03.464702040 -0600
+@@ -232,7 +232,7 @@ endif(APPLE)
  # These two options below make it set the RPATH of the installed targets to all
  # RPATH directories outside the current CMAKE_BINARY_DIR and also the library 
  # install directory. Alex
 -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
--set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  TRUE)
-+#set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
++#set(CMAKE_INSTALL_RPATH_USE_LINK_PATH  FALSE)
+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
  
  
- # Uninstall Target
-@@ -435,4 +435,4 @@ if(MSVC)
-         # to avoid a lot of deprecated warnings
-         add_definitions( -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -D_SCL_SECURE_NO_WARNINGS )
-     endif(CMAKE_COMPILER_2005)
--endif(MSVC)
-\ No newline at end of file
-+endif(MSVC)

phonon.spec

@@ -1,5 +1,5 @@
 
-%define snap 20110104
+#define snap 20110104
 # not worth using much yet
 #define phonon_build_tests -DPHONON_BUILD_TESTS:BOOL=ON
 
@@ -9,14 +9,14 @@
 Summary: Multimedia framework api
 Name:    phonon
 Version: 4.4.4
-Release: 0.1.%{snap}%{?dist}
+Release: 1%{?dist}
 Group:   System Environment/Libraries
 License: LGPLv2+
 URL:     http://phonon.kde.org/
 %if 0%{?snap}
 Source0: phonon-%{version}-%{snap}.tar.bz2
 %else
-Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/phonon-%{version}.tar.bz2
+Source0: ftp://ftp.kde.org/pub/kde/stable/phonon/%{version}/src/phonon-%{version}.tar.bz2
 %endif
 Source1: phonon_snapshot.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -93,7 +93,9 @@ Includes experimental and unstable apis.
 %setup -q 
 
 %patch1 -p1 -b .no_rpath
-%patch53 -p1 -b .phonon-allow-stop-empty-source
+# gonna hold this one, pending feedback from coling why this
+# isn't upstreamed
+#patch53 -p1 -b .phonon-allow-stop-empty-source
 
 
 %build
@@ -180,6 +182,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Fri Jan 21 2011 Rex Dieter <rdieter@fedoraproject.org> 4.4.4-1
+- phonon-4.4.4
+
 * Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> - 4.4.4-0.1.20110104
 - Requires: phonon-backend
 

sources

@@ -1 +1 @@
-25933de62a59bc444929f7a5f176412d  phonon-4.4.4-20110104.tar.bz2
+1deb14ecb2185e1f2fe2741a0bd46852  phonon-4.4.4.tar.bz2