rpms/openjpeg/devel openjpeg-1.3-libm.patch, 1.1, 1.2 openjpeg.spec, 1.10, 1.11

[Rex Dieter]

Author: rdieter

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

Modified Files:
	openjpeg-1.3-libm.patch openjpeg.spec 
Log Message:
* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3-7
- FTBFS openjpeg-1.3-6.fc12: ImplicitDSOLinking (#564783)


openjpeg-1.3-libm.patch:
 codec/CMakeLists.txt       |    4 ----
 libopenjpeg/CMakeLists.txt |    5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

Index: openjpeg-1.3-libm.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openjpeg/devel/openjpeg-1.3-libm.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openjpeg-1.3-libm.patch	19 Jun 2009 14:55:48 -0000	1.1
+++ openjpeg-1.3-libm.patch	14 Feb 2010 19:19:44 -0000	1.2
@@ -27,40 +27,3 @@ diff -up OpenJPEG_v1_3/libopenjpeg/CMake
  # 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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- openjpeg.spec	6 Jan 2010 15:39:04 -0000	1.10
+++ openjpeg.spec	14 Feb 2010 19:19:44 -0000	1.11
@@ -3,7 +3,7 @@
 
 Name:    openjpeg
 Version: 1.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: OpenJPEG command line tools
 
 Group:     Applications/Multimedia
@@ -83,14 +83,14 @@ rm -rf libs
 mkdir build
 pushd build
 %cmake .. -DBUILD_EXAMPLES:BOOL=ON
-make %{?_smp_mflags}
 popd
 
+make %{?_smp_mflags} -C build
+
+
 %install
 rm -rf %{buildroot}
-pushd build
-make install DESTDIR="%{buildroot}"
-popd
+make install/fast DESTDIR="%{buildroot}" -C build
 
 # HACK: until pkg-config support lands, temporarily provide
 # openjpeg.h header in legacy location
@@ -129,6 +129,9 @@ rm -rf %{buildroot}
 %{_libdir}/libopenjpeg.so
 
 %changelog
+* Sun Feb 14 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.3-7
+- FTBFS openjpeg-1.3-6.fc12: ImplicitDSOLinking (#564783)
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild