[portmidi] Moved the last cmake fix into the patch where it belongs

[Orcan Ogetbil]

commit 6849c37dffaeab78ef2d3a07bee81010c0bdc82a
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Thu Jun 23 22:40:24 2011 -0400

    Moved the last cmake fix into the patch where it belongs

 portmidi-cmake.patch |   32 ++++++++++++++++++++++++++++----
 portmidi.spec        |    3 ---
 2 files changed, 28 insertions(+), 7 deletions(-)
---
diff --git a/portmidi-cmake.patch b/portmidi-cmake.patch
index 149de6d..f638083 100644
--- a/portmidi-cmake.patch
+++ b/portmidi-cmake.patch
@@ -1,6 +1,6 @@
 diff -rupN portmidi.old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.txt
 --- portmidi.old/pm_common/CMakeLists.txt	2010-09-20 15:57:48.000000000 -0400
-+++ portmidi/pm_common/CMakeLists.txt	2010-10-09 01:14:53.000000000 -0400
++++ portmidi/pm_common/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
 @@ -120,8 +120,8 @@ set_target_properties(pmjni PROPERTIES E
  # install the libraries (Linux and Mac OS X command line)
  if(UNIX)
@@ -14,7 +14,7 @@ diff -rupN portmidi.old/pm_common/CMakeLists.txt portmidi/pm_common/CMakeLists.t
  #    DESTINATION /usr/local/include)
 diff -rupN portmidi.old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
 --- portmidi.old/pm_dylib/CMakeLists.txt	2009-11-20 00:41:09.000000000 -0500
-+++ portmidi/pm_dylib/CMakeLists.txt	2010-10-09 01:17:32.000000000 -0400
++++ portmidi/pm_dylib/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
 @@ -59,7 +59,7 @@ if(UNIX)
  
      set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
@@ -58,7 +58,31 @@ diff -rupN portmidi.old/pm_dylib/CMakeLists.txt portmidi/pm_dylib/CMakeLists.txt
  endif(UNIX)
 diff -rupN portmidi.old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
 --- portmidi.old/pm_java/CMakeLists.txt	2009-11-04 10:20:44.000000000 -0500
-+++ portmidi/pm_java/CMakeLists.txt	2010-10-09 01:18:10.000000000 -0400
++++ portmidi/pm_java/CMakeLists.txt	2011-06-23 22:35:54.000000000 -0400
+@@ -16,12 +16,12 @@ if(UNIX)
+         COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java
+ 	DEPENDS pmdefaults/PmDefaults.java
+-	WORKING_DIRECTORY pm_java)
++	)
+     add_custom_command(OUTPUT pmdefaults/PmDefaults.class
+         COMMAND javac -classpath . pmdefaults/PmDefaults.java
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.java
+ 	DEPENDS pmdefaults/PmDefaultsFrame.java
+-	WORKING_DIRECTORY pm_java)
++	)
+     add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
+         COMMAND	cp pmdefaults/portmusic_logo.png .
+         COMMAND	jar cmf pmdefaults/manifest.txt pmdefaults.jar
+@@ -32,7 +32,7 @@ if(UNIX)
+ 	COMMAND rm portmusic_logo.png
+ 	MAIN_DEPENDENCY pmdefaults/PmDefaults.class
+ 	DEPENDS ${PMDEFAULTS_ALL_CLASSES}
+-	WORKING_DIRECTORY pm_java)
++	)
+     add_custom_target(pmdefaults_target ALL 
+         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
+     # message(STATUS "add_custom_target: pmdefaults.jar")
 @@ -41,7 +41,7 @@ if(UNIX)
      INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
        DESTINATION /usr/share/java)
@@ -70,7 +94,7 @@ diff -rupN portmidi.old/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
  # In windows, use pm_java/make.bat
 diff -rupN portmidi.old/pm_test/CMakeLists.txt portmidi/pm_test/CMakeLists.txt
 --- portmidi.old/pm_test/CMakeLists.txt	2010-09-20 15:57:48.000000000 -0400
-+++ portmidi/pm_test/CMakeLists.txt	2010-10-09 02:36:31.000000000 -0400
++++ portmidi/pm_test/CMakeLists.txt	2011-06-23 22:35:41.000000000 -0400
 @@ -12,7 +12,7 @@ endif(WIN32)
  
  macro(make_a_test name)
diff --git a/portmidi.spec b/portmidi.spec
index 668c368..09a14f3 100644
--- a/portmidi.spec
+++ b/portmidi.spec
@@ -94,9 +94,6 @@ sed -i -e 's|^java|#!/bin/sh\njava \\\
    -e 's|/usr/share/java/|%{_libdir}/%{name}/|' \
    pm_java/pmdefaults/pmdefaults
 
-# Fix build against cmake-2.8.5
-sed -i 's|WORKING_DIRECTORY pm_java||' pm_java/CMakeLists.txt
-
 %build
 export JAVA_HOME=%{java_home}
 %cmake -DCMAKE_SKIP_BUILD_RPATH=1 -DCMAKE_CACHEFILE_DIR=%{_builddir}/%{name}/build -DVERSION=%{version} .