[openjpeg] use soversion 3 (pending feedback from upstream)

Rex Dieter rdieter at fedoraproject.org
Mon Jan 3 21:46:46 UTC 2011


commit 25b4bad2eb58c4b8586236df0701653afb9a5ce2
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Jan 3 15:45:58 2011 -0600

    use soversion 3 (pending feedback from upstream)

 openjpeg-1.4-cmake_soversion_3.patch |   22 ++++++++++++++++++++++
 openjpeg.spec                        |    9 ++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/openjpeg-1.4-cmake_soversion_3.patch b/openjpeg-1.4-cmake_soversion_3.patch
new file mode 100644
index 0000000..1e9ebb6
--- /dev/null
+++ b/openjpeg-1.4-cmake_soversion_3.patch
@@ -0,0 +1,22 @@
+diff -up openjpeg_v1_4_sources_r697/CMakeLists.txt.soversion openjpeg_v1_4_sources_r697/CMakeLists.txt
+--- openjpeg_v1_4_sources_r697/CMakeLists.txt.soversion	2011-01-02 12:14:55.000000000 -0600
++++ openjpeg_v1_4_sources_r697/CMakeLists.txt	2011-01-03 15:41:02.739274204 -0600
+@@ -27,6 +27,7 @@ INCLUDE_REGULAR_EXPRESSION("^.*$")
+ 
+ #-----------------------------------------------------------------------------
+ # OPENJPEG version number, useful for packaging and doxygen doc:
++SET(OPENJPEG_SOVERSION 3)
+ SET(OPENJPEG_VERSION_MAJOR 1)
+ SET(OPENJPEG_VERSION_MINOR 4)
+ SET(OPENJPEG_VERSION_BUILD 0)
+@@ -37,8 +38,8 @@ SET(PACKAGE_VERSION
+ # This setting of SOVERSION assumes that any API change
+ # will increment either the minor or major version number of openjpeg
+ SET(OPENJPEG_LIBRARY_PROPERTIES
+-  VERSION   "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
+-  SOVERSION "${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}"
++  VERSION   "${OPENJPEG_SOVERSION}.${OPENJPEG_VERSION_MAJOR}.${OPENJPEG_VERSION_MINOR}.${OPENJPEG_VERSION_BUILD}"
++  SOVERSION "${OPENJPEG_SOVERSION}"
+ )
+ # You will also need to define a value for the following variables:
+ # OPENJPEG_INSTALL_BIN_DIR          - binary dir (executables)
diff --git a/openjpeg.spec b/openjpeg.spec
index 0d0b69b..46aa179 100644
--- a/openjpeg.spec
+++ b/openjpeg.spec
@@ -28,6 +28,9 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 ## upstreamable patches
 # libopenjpeg has undefined references, http://bugzilla.redhat.com/467661
 Patch50: openjpeg-1.4-no_undefined.patch
+# Use soversion 3 (instead of 1.4)
+# http://groups.google.com/group/openjpeg/browse_thread/thread/b9a1d1bfb6f8d09a
+Patch51: openjpeg-1.4-cmake_soversion_3.patch
 
 %description
 OpenJPEG is an open-source JPEG 2000 codec written in C. It has been
@@ -53,12 +56,12 @@ developing applications that use OpenJPEG.
 %prep
 %setup -q -n openjpeg_v1_4_sources_r697 %{?runcheck:-a 1}
 
-# Windows stuff, delete it, it slows down patch making
-rm -rf jp3d
 # Make sure we use system libraries
 rm -rf libs
 
 %patch50 -p1 -b .no_undefined
+%patch51 -p1 -b .cmake_soversion_3
+
 
 # fix permissions
 find . -type f -print0 | xargs -0 chmod a-x
@@ -125,7 +128,7 @@ rm -rf %{buildroot}
 %files libs
 %defattr(-,root,root,-)
 %doc CHANGES LICENSE 
-%{_libdir}/libopenjpeg.so.1.4*
+%{_libdir}/libopenjpeg.so.3*
 %{_libdir}/openjpeg-1.4/
 %{_mandir}/man3/libopenjpeg.3*
 


More information about the scm-commits mailing list