rpms/openjpeg/devel openjpeg-1.3-libm.patch, NONE, 1.1 openjpeg.spec, 1.6, 1.7

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/openjpeg/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20530

Modified Files:
	openjpeg.spec 
Added Files:
	openjpeg-1.3-libm.patch 
Log Message:
* Fri Jun 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3-5
- libopenjpeg has undefined references (#467661)
- openjpeg.h is installed in a directory different from upstream's default (#484887)
- drop -O3
- add %check section
- %files: track libopenjpeg somajor (2)


openjpeg-1.3-libm.patch:

--- NEW FILE openjpeg-1.3-libm.patch ---
diff -up OpenJPEG_v1_3/codec/CMakeLists.txt.libm OpenJPEG_v1_3/codec/CMakeLists.txt
--- OpenJPEG_v1_3/codec/CMakeLists.txt.libm	2007-11-27 06:38:52.000000000 -0600
+++ OpenJPEG_v1_3/codec/CMakeLists.txt	2009-06-19 09:20:59.473980422 -0500
@@ -46,10 +46,6 @@ FOREACH(exe j2k_to_image image_to_j2k)
   ADD_TEST(${exe} ${EXECUTABLE_OUTPUT_PATH}/${exe})
   # calling those exe without option will make them fail always:
   SET_TESTS_PROPERTIES(${exe} PROPERTIES WILL_FAIL TRUE)
-  # On unix you need to link to the math library:
-  IF(UNIX)
-    TARGET_LINK_LIBRARIES(${exe} m)
-  ENDIF(UNIX)
   # Install exe
   INSTALL_TARGETS(/bin/ ${exe})
 ENDFOREACH(exe)
diff -up OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt
--- OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt.libm	2009-06-19 09:18:44.021229314 -0500
+++ OpenJPEG_v1_3/libopenjpeg/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -35,6 +35,11 @@ ADD_LIBRARY(${OPENJPEG_LIBRARY_NAME} ${O
 SET_TARGET_PROPERTIES(${OPENJPEG_LIBRARY_NAME} PROPERTIES
 	${OPENJPEG_LIBRARY_PROPERTIES})
 
+IF(UNIX)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} m)
+  TARGET_LINK_LIBRARIES(${OPENJPEG_LIBRARY_NAME} LINK_INTERFACE_LIBRARIES)
+ENDIF(UNIX)
+
 # Install library
 INSTALL(TARGETS ${OPENJPEG_LIBRARY_NAME}
 	DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff -up OpenJPEG_v1_3/mj2/CMakeLists.txt.libm OpenJPEG_v1_3/mj2/CMakeLists.txt
--- OpenJPEG_v1_3/mj2/CMakeLists.txt.libm	2007-09-12 04:04:03.000000000 -0500
+++ OpenJPEG_v1_3/mj2/CMakeLists.txt	2009-06-19 09:18:44.074248015 -0500
@@ -10,33 +10,21 @@ ADD_EXECUTABLE(frames_to_mj2
   compat/getopt.c 
   mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(frames_to_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(frames_to_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(mj2_to_frames
     mj2_to_frames.c
     compat/getopt.c mj2_convert.c mj2.c )
 TARGET_LINK_LIBRARIES(mj2_to_frames ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(mj2_to_frames m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(extract_j2k_from_mj2
     extract_j2k_from_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(extract_j2k_from_mj2 m)
-ENDIF(UNIX)
 
 ADD_EXECUTABLE(wrap_j2k_in_mj2
     wrap_j2k_in_mj2.c
     mj2.c )
 TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 ${OPJ_PREFIX}openjpeg)
-IF(UNIX)
-  TARGET_LINK_LIBRARIES(wrap_j2k_in_mj2 m)
-ENDIF(UNIX)
 
 INSTALL(TARGETS frames_to_mj2 mj2_to_frames extract_j2k_from_mj2 wrap_j2k_in_mj2
 	DESTINATION bin)


Index: openjpeg.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openjpeg/devel/openjpeg.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- openjpeg.spec	26 Feb 2009 08:32:42 -0000	1.6
+++ openjpeg.spec	19 Jun 2009 14:55:48 -0000	1.7
@@ -1,10 +1,9 @@
-
 # reset patch fuzz, rebasing patches will require delicate surgery -- Rex
 %define _default_patch_fuzz 2
 
 Name:    openjpeg
 Version: 1.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 Summary: OpenJPEG command line tools
 
 Group:     Applications/Multimedia
@@ -32,6 +31,10 @@ Patch26: openjpeg-20070821svn-t1-updatef
 Patch27: openjpeg-svn470-t1-flags-mmx.patch
 Patch28: openjpeg-20070719svn-mqc-more-optimize.patch
 
+## upstreamable patches
+# libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
+Patch50: openjpeg-1.3-libm.patch
+
 %description
 OpenJPEG is an open-source JPEG 2000 codec written in C language. It has been
 developed in order to promote the use of JPEG 2000, the new still-image
@@ -74,13 +77,13 @@ rm -rf libs
 %patch24 -p1
 %patch21 -p1
 %patch28 -p1
+%patch50 -p1 -b .libm
 
 %build
 mkdir build
 pushd build
-CFLAGS="%{optflags} -O3"
 %cmake .. -DBUILD_EXAMPLES:BOOL=ON
-make VERBOSE=1 %{?_smp_mflags}
+make %{?_smp_mflags}
 popd
 
 %install
@@ -89,6 +92,15 @@ pushd build
 make install DESTDIR="%{buildroot}"
 popd
 
+# HACK: until pkg-config support lands, temporarily provide
+# openjpeg.h header in legacy location
+ln -s openjpeg/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
+
+
+%check
+# mostly pointless without test images, but it's a start -- Rex
+make test -C build
+
 %clean
 rm -rf %{buildroot}
 
@@ -108,14 +120,22 @@ rm -rf %{buildroot}
 
 %files libs
 %defattr(-,root,root,-)
-%{_libdir}/libopenjpeg.so.*
+%{_libdir}/libopenjpeg.so.2*
 
 %files devel
 %defattr(-,root,root,-)
+%{_includedir}/openjpeg.h
 %{_includedir}/openjpeg/
 %{_libdir}/libopenjpeg.so
 
 %changelog
+* Fri Jun 19 2009 Rex Dieter <rdieter at fedoraproject.org> - 1.3-5
+- libopenjpeg has undefined references (#467661)
+- openjpeg.h is installed in a directory different from upstream's default (#484887)
+- drop -O3
+- add %%check section
+- %%files: track libopenjpeg somajor (2)
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild