[openjpeg] properly fix and use cmake create_symlink instead of symlinking by hand in the specfile

[Rex Dieter]

commit bcb700252ec0ca104dc34e6e188905882535747a
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jan 13 09:23:46 2011 -0600

    properly fix and use cmake create_symlink instead of symlinking by
    hand in the specfile

 openjpeg-1.4-cmake_pkgconfig.patch   |    2 +-
 openjpeg-1.4-cmake_symlink_fix.patch |   12 ++++++++++++
 openjpeg.spec                        |    5 +++--
 3 files changed, 16 insertions(+), 3 deletions(-)
---
diff --git a/openjpeg-1.4-cmake_pkgconfig.patch b/openjpeg-1.4-cmake_pkgconfig.patch
index 179e958..382f06f 100644
--- a/openjpeg-1.4-cmake_pkgconfig.patch
+++ b/openjpeg-1.4-cmake_pkgconfig.patch
@@ -12,7 +12,7 @@ diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.cmake_pkgconfig openjpeg_v1_4
 +  INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
 +# This piece doesn't seem to work, not sure why  -- Rex
 +  INSTALL( CODE
-+  "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg1.pc \$ENV{DESTDIR}\${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc)")
++  "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"libopenjpeg1.pc\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
 +#endif(NOT WIN32)
 +
  #-----------------------------------------------------------------------------
diff --git a/openjpeg-1.4-cmake_symlink_fix.patch b/openjpeg-1.4-cmake_symlink_fix.patch
new file mode 100644
index 0000000..ba01172
--- /dev/null
+++ b/openjpeg-1.4-cmake_symlink_fix.patch
@@ -0,0 +1,12 @@
+diff -up openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt.cmake_symlink_fix openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt
+--- openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt.cmake_symlink_fix	2011-01-13 09:13:08.077608144 -0600
++++ openjpeg_v1_4_sources_r697/libopenjpeg/CMakeLists.txt	2011-01-13 09:14:36.417405082 -0600
+@@ -47,7 +47,7 @@ INSTALL(FILES openjpeg.h
+   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir} COMPONENT Headers
+ )
+ INSTALL(CODE
+-  "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/${subdir}/openjpeg.h \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h)")
++  "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink \"${subdir}/openjpeg.h\" \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h\")")
+ 
+ # install man page of the library
+ INSTALL(
diff --git a/openjpeg.spec b/openjpeg.spec
index 76f323e..7dad39d 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -47,6 +47,8 @@ Patch52: openjpeg-1.4-autoconf.patch
 # fix cmake to install pkgconfig file(s)
 # http://groups.google.com/group/openjpeg/browse_thread/thread/545a90cf2b0e4af2
 Patch53: openjpeg-1.4-cmake_pkgconfig.patch
+# fix cmake create_symlink usage
+Patch54: openjpeg-1.4-cmake_symlink_fix.patch
 
 %description
 OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
@@ -79,6 +81,7 @@ rm -rf libs
 %if 0%{?cmake_build}
 %patch51 -p1 -b .cmake_soversion_3
 %patch53 -p1 -b .cmake_pkgconfig
+%patch54 -p1 -b .cmake_symlink_fix
 %else
 %patch52 -p1 -b .autoconf
 autoreconf -i -f
@@ -119,8 +122,6 @@ rm -rf %{buildroot}
 
 %if 0%{?cmake_build}
 make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
-ln -s openjpeg-1.4/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
-ln -s libopenjpeg1.pc %{buildroot}%{_libdir}/pkgconfig/libopenjpeg.pc
 %else
 make install DESTDIR=%{buildroot}
 %endif