commit 7151c101cfeb5c27855a32993bef3eda3b023e57 Author: Rex Dieter rdieter@fedoraproject.org Date: Mon Jan 31 15:05:07 2011 -0700
- fix OpenJPEGConfig.cmake (#669425)
openjpeg-1.4-OpenJPEGConfig.patch | 12 ++++++++++++ openjpeg.spec | 7 ++++++- 2 files changed, 18 insertions(+), 1 deletions(-) --- diff --git a/openjpeg-1.4-OpenJPEGConfig.patch b/openjpeg-1.4-OpenJPEGConfig.patch new file mode 100644 index 0000000..9f02db3 --- /dev/null +++ b/openjpeg-1.4-OpenJPEGConfig.patch @@ -0,0 +1,12 @@ +diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.OpenJPEGConfig openjpeg_v1_4_sources_r697/CMakeLists.txt +--- openjpeg_v1_4_sources_r697/CMakeLists.txt.OpenJPEGConfig 2011-01-31 14:58:21.281717282 -0700 ++++ openjpeg_v1_4_sources_r697/CMakeLists.txt 2011-01-31 15:01:53.052718693 -0700 +@@ -47,6 +47,8 @@ SET(OPENJPEG_LIBRARY_PROPERTIES + # OPENJPEG_INSTALL_DATA_DIR - share dir (say, examples, data, etc) + # OPENJPEG_INSTALL_INCLUDE_DIR - include dir (headers) + ++# Used in OpenJPEGConfig.cmake ++SET(OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARY_NAME}) + + # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security + # warnings diff --git a/openjpeg.spec b/openjpeg.spec index 7dad39d..7e73040 100644 --- a/openjpeg.spec +++ b/openjpeg.spec @@ -12,7 +12,7 @@
Name: openjpeg Version: 1.4 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JPEG 2000 command line tools
Group: Applications/Multimedia @@ -49,6 +49,8 @@ Patch52: openjpeg-1.4-autoconf.patch Patch53: openjpeg-1.4-cmake_pkgconfig.patch # fix cmake create_symlink usage Patch54: openjpeg-1.4-cmake_symlink_fix.patch +# fix OpenJPEGConfig.cmake, https://bugzilla.redhat.com/show_bug.cgi?id=669425 +Patch55: openjpeg-1.4-OpenJPEGConfig.patch
%description OpenJPEG is an open-source JPEG 2000 codec written in C. It has been @@ -180,6 +182,9 @@ rm -rf %{buildroot}
%changelog +* Mon Jan 31 2011 Rex Dieter rdieter@fedoraproject.org - 1.4-3 +- fix OpenJPEGConfig.cmake (#669425) + * Thu Jan 13 2011 Rex Dieter rdieter@fedoraproject.org - 1.4-2 - -devel: %%_includedir/openjpeg/ symlink - add pkgconfig support (to cmake build)
scm-commits@lists.fedoraproject.org