[openjpeg] 1.5.1

Thu Sep 13 14:47:18 UTC 2012

commit 385bf1a6fd18ae329487f24a69da3731625e747c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Sep 13 09:34:30 2012 -0500

    1.5.1

 .gitignore                                |    1 +
 openjpeg-1.5.0-cmake_Config.patch         |   20 --------------
 openjpeg-1.5.0-cmake_header_symlink.patch |   14 ----------
 openjpeg-1.5.0-cmake_libdir.patch         |   21 ---------------
 openjpeg-1.5.0-pkgconfig_includedir.patch |   24 -----------------
 openjpeg-1.5.1-cmake_libdir.patch         |   12 ++++++++
 openjpeg-1.5.1-soname.patch               |   12 ++++++++
 openjpeg.spec                             |   41 +++++++++++++++--------------
 sources                                   |    2 +-
 9 files changed, 47 insertions(+), 100 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 8979db5..9d8a0e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /j2kp4files_v1_5.zip
 /openjpeg_v1_4_sources_r697.tgz
 /openjpeg-1.5.0.tar.gz
+/openjpeg-1.5.1.tar.gz
diff --git a/openjpeg-1.5.1-cmake_libdir.patch b/openjpeg-1.5.1-cmake_libdir.patch
new file mode 100644
index 0000000..73da9e8
--- /dev/null
+++ b/openjpeg-1.5.1-cmake_libdir.patch
@@ -0,0 +1,12 @@
+diff -up openjpeg-1.5.1/CMakeLists.txt.cmake_libdir openjpeg-1.5.1/CMakeLists.txt
+--- openjpeg-1.5.1/CMakeLists.txt.cmake_libdir	2012-09-13 02:58:39.000000000 -0500
++++ openjpeg-1.5.1/CMakeLists.txt	2012-09-13 08:55:59.493257595 -0500
+@@ -183,7 +183,7 @@ IF(UNIX)
+     ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+   INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+   \"libopenjpeg1.pc\"
+-  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig/libopenjpeg.pc\")")
++  \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+ ENDIF(UNIX)
+ 
+ #-----------------------------------------------------------------------------
diff --git a/openjpeg-1.5.1-soname.patch b/openjpeg-1.5.1-soname.patch
new file mode 100644
index 0000000..ad587ac
--- /dev/null
+++ b/openjpeg-1.5.1-soname.patch
@@ -0,0 +1,12 @@
+diff -up openjpeg-1.5.1/CMakeLists.txt.soname openjpeg-1.5.1/CMakeLists.txt
+--- openjpeg-1.5.1/CMakeLists.txt.soname	2012-09-13 09:20:46.726091979 -0500
++++ openjpeg-1.5.1/CMakeLists.txt	2012-09-13 09:21:01.831906609 -0500
+@@ -50,7 +50,7 @@ SET(PACKAGE_VERSION
+ # you can specify your own OPENJPEG_SOVERSION at cmake configuration time:
+ # cmake -DOPENJPEG_SOVERSION:STRING=42 /path/to/openjpeg
+ if(NOT OPENJPEG_SOVERSION)
+-  SET(OPENJPEG_SOVERSION 5)
++  SET(OPENJPEG_SOVERSION 1)
+ endif(NOT OPENJPEG_SOVERSION)
+ SET(OPENJPEG_LIBRARY_PROPERTIES
+   VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
diff --git a/openjpeg.spec b/openjpeg.spec
index 3a40a10..6f4c5b9 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -8,8 +8,8 @@
 #define runcheck 1
 
 Name:    openjpeg
-Version: 1.5.0
-Release: 4%{?dist}
+Version: 1.5.1
+Release: 1%{?dist}
 Summary: JPEG 2000 command line tools
 
 Group:   Applications/Multimedia
@@ -23,6 +23,14 @@ Source0: http://openjpeg.googlecode.com/files/openjpeg-%{version}.tar.gz
 Source1: data.tar.xz
 %endif
 
+# revert soname bump compared to 1.5.0 release (for now)
+Patch1: openjpeg-1.5.1-soname.patch
+
+## upstreamable patches
+Patch50: openjpeg-1.5.1-cmake_libdir.patch
+
+## upstream patches:
+
 %if 0%{?cmake_build}
 BuildRequires: cmake 
 %else
@@ -36,15 +44,6 @@ BuildRequires: pkgconfig(zlib)
 
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
-## upstreamable patches
-Patch50: openjpeg-1.5.0-cmake_libdir.patch
-Patch51: openjpeg-1.5.0-cmake_header_symlink.patch
-Patch52: openjpeg-1.5.0-cmake_Config.patch
-
-## upstream patches:
-# http://code.google.com/p/openjpeg/issues/detail?id=118
-Patch100: openjpeg-1.5.0-pkgconfig_includedir.patch
-
 %description
 OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
 developed in order to promote the use of JPEG 2000, the new still-image
@@ -70,16 +69,13 @@ developing applications that use OpenJPEG.
 %prep
 %setup -q %{?runcheck:-a 1}
 
+%patch1 -p1 -b .soname
 %if 0%{?cmake_build}
 %patch50 -p1 -b .cmake_libdir
-%patch51 -p1 -b .cmake_header_symlink
-%patch52 -p1 -b .cmake_Config
 %else
 autoreconf -i -f
 %endif
 
-%patch100 -p1 -b .pkgconfig_includedir
-
 
 %build
 
@@ -93,10 +89,7 @@ pushd %{_target_platform}
   -DBUILD_SHARED_LIBS:BOOL=ON \
   %{?runcheck:-DBUILD_TESTING:BOOL=ON} \
   -DCMAKE_BUILD_TYPE=Release \
-  -DOPENJPEG_INSTALL_BIN_DIR:PATH=%{_bindir} \
-  -DOPENJPEG_INSTALL_DATA_DIR:PATH=%{_datadir} \
-  -DOPENJPEG_INSTALL_INCLUDE_DIR:PATH=%{_includedir} \
-  -DOPENJPEG_INSTALL_LIB_DIR:PATH=%{_libdir} \
+  -DOPENJPEG_INSTALL_LIB_DIR:PATH=%{_lib} \
    ..
 popd
 
@@ -120,6 +113,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
 make install DESTDIR=%{buildroot}
 %endif
 
+# continue to ship compat header symlink
+ln -s openjpeg-1.5/openjpeg.h %{buildroot}%{_includedir}/openjpeg.h
+
 ## unpackaged files
 # we use %%doc in -libs below instead
 rm -rfv %{buildroot}%{_docdir}/openjpeg-1.5/
@@ -127,9 +123,10 @@ rm -fv  %{buildroot}%{_libdir}/lib*.la
 
 
 %check
+test -f %{buildroot}%{_includedir}/openjpeg.h
 ## known failures (on rex's f16/x86_64 box anyway)
 %if 0%{?runcheck}
-make test -C %{_target_platform} ||:
+make test -C %{_target_platform}
 %endif
 
 
@@ -152,6 +149,7 @@ make test -C %{_target_platform} ||:
 %files devel
 %doc %{?cmake_build:%{_target_platform}/}doc/html/
 %{_includedir}/openjpeg-1.5/
+# fedora-only compat symlink
 %{_includedir}/openjpeg.h
 %{_libdir}/libopenjpeg.so
 %{_libdir}/pkgconfig/libopenjpeg.pc
@@ -162,6 +160,9 @@ make test -C %{_target_platform} ||:
 
 
 %changelog
+* Thu Sep 13 2012 Rex Dieter <rdieter at fedoraproject.org> 1.5.1-1
+- 1.5.1
+
 * Fri Jul 20 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a3a4ef4..8cf5e0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5d66193ddfa59a87da1eb08ea86293b  openjpeg-1.5.0.tar.gz
+b5f74cec2688fb918331bb014061be6f  openjpeg-1.5.1.tar.gz
