From 0d5229d4c37af4596ec34a7a333169f193de42f5 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter@gmail.com>
Date: Thu, 19 Jul 2018 09:53:41 -0500
Subject: [PATCH] cleanup cmake usage, move to %build %build: explicitly
 disable doc generation kill hard-coded rpath -libs: explicit soname so bumps
 aren't a surprise use %license, %make_build, 'make install/fast'

---
 jasper-2.0.14-rpath.patch | 12 ++++++++++
 jasper.spec               | 47 +++++++++++++++++++--------------------
 2 files changed, 35 insertions(+), 24 deletions(-)
 create mode 100644 jasper-2.0.14-rpath.patch

diff --git a/jasper-2.0.14-rpath.patch b/jasper-2.0.14-rpath.patch
new file mode 100644
index 0000000..23aba06
--- /dev/null
+++ b/jasper-2.0.14-rpath.patch
@@ -0,0 +1,12 @@
+diff -up jasper-2.0.14/CMakeLists.txt.rpath jasper-2.0.14/CMakeLists.txt
+--- jasper-2.0.14/CMakeLists.txt.rpath	2017-09-14 18:20:10.000000000 -0500
++++ jasper-2.0.14/CMakeLists.txt	2018-07-19 09:48:53.035815377 -0500
+@@ -347,7 +347,7 @@ if (JAS_ENABLE_SHARED)
+ 	# (but later on when installing)
+ 	set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+ 
+-	set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++	#set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ 
+ 	# add the automatically determined parts of the RPATH
+ 	# which point to directories outside the build tree to the install RPATH
diff --git a/jasper.spec b/jasper.spec
index f18faaf..2d68bf3 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -6,13 +6,15 @@
 Summary: Implementation of the JPEG-2000 standard, Part 1
 Name:    jasper
 Version: 2.0.14
-Release: 6%{?dist}
+Release: 7%{?dist}
 
 License: JasPer
 URL:     http://www.ece.uvic.ca/~frodo/jasper/
 Source0: http://www.ece.uvic.ca/~frodo/jasper/software/jasper-%{version}.tar.gz
 
 Patch1: jasper-2.0.14-CVE-2016-9396.patch
+# skip hard-coded prefix/lib rpath
+Patch2: jasper-2.0.14-rpath.patch
 # architecture related patches
 Patch100: jasper-2.0.2-test-ppc64-disable.patch
 Patch101: jasper-2.0.2-test-ppc64le-disable.patch
@@ -61,6 +63,7 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %setup -q -n %{name}-%{version}
 
 %patch1 -p1 -b .CVE-2016-9396
+%patch2 -p1 -b .rpath
 # Need to disable one test to be able to build it on ppc64 arch
 # At ppc64 this test just stuck (nothing happend - no exception or error)
 
@@ -76,41 +79,29 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 %endif
 
 
-mkdir -p builder
-
-%cmake -G "Unix Makefiles" \
-       -H%{_builddir}/%{name}-%{version} \
-       -B%{_builddir}/%{name}-%{version}/builder
-
-
 %build
+mkdir builder
 pushd builder
-make clean all
-
+%cmake .. \
+  -DJAS_ENABLE_DOC:BOOL=OFF
 popd
 
-%install
-pushd builder
-make install DESTDIR=%{buildroot}
+%make_build -C builder
 
-#%if "%{_arch}" != "arm" && "%{_arch}" != "i386"
-#	mv %{buildroot}/usr/lib %{buildroot}/usr/lib64
-#%endif
+
+%install
+make install/fast DESTDIR=%{buildroot} -C builder
 
 # Unpackaged files
 rm -f doc/README
 rm -f %{buildroot}%{_libdir}/lib*.la
-popd
+
 
 %check
-pushd builder
-make test
-
-popd
+make test -C builder
 
 %ldconfig_scriptlets libs
 
-
 %files
 %{_bindir}/imgcmp
 %{_bindir}/imginfo
@@ -126,8 +117,9 @@ popd
 %{_libdir}/pkgconfig/jasper.pc
 
 %files libs
-%doc COPYRIGHT LICENSE README
-%{_libdir}/libjasper.so*
+%doc README
+%license COPYRIGHT LICENSE
+%{_libdir}/libjasper.so.4*
 
 %files utils
 %{_bindir}/jiv
@@ -135,6 +127,13 @@ popd
 
 
 %changelog
+* Thu Jul 19 2018 Rex Dieter <rdieter@fedoraproject.org> - 2.0.14-7
+- cleanup cmake usage, move to %%build
+- %%build: explicitly disable doc generation
+- kill hard-coded rpath
+- -libs: explicit soname so bumps aren't a surprise
+- use %%license, %%make_build, 'make install/fast'
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.14-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild