From 835d1d5af7ff00fde0888501e33a9116ff516610473d7df35fd20fa171b1ab56 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 12 Oct 2020 10:08:17 +0000 Subject: [PATCH] Accepting request 841241 from home:dimstar:Factory - %{suffix} is an rpm internal macro that extracts a suffix (extension) from a filename. With RPM 4.16, it verifies that a filename is passed (e.g. %{suffix:filename.spec}); earlier versions returned "", meaning we can just strip it from the install command, as we rely on an empty return value. OBS-URL: https://build.opensuse.org/request/show/841241 OBS-URL: https://build.opensuse.org/package/show/Java:packages/jna?expand=0&rev=10 --- jna.changes | 9 +++++++++ jna.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/jna.changes b/jna.changes index b920dbe..3751d66 100644 --- a/jna.changes +++ b/jna.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 12 10:02:30 UTC 2020 - Dominique Leuenberger + +- %{suffix} is an rpm internal macro that extracts a suffix + (extension) from a filename. With RPM 4.16, it verifies that a + filename is passed (e.g. %{suffix:filename.spec}); earlier + versions returned "", meaning we can just strip it from the + install command, as we rely on an empty return value. + ------------------------------------------------------------------- Thu Jun 4 06:38:27 UTC 2020 - Fridrich Strba diff --git a/jna.spec b/jna.spec index 2932005..bd29e52 100644 --- a/jna.spec +++ b/jna.spec @@ -106,7 +106,7 @@ install -m 755 build/native*/libjnidispatch*.so %{buildroot}%{_libdir}/%{name}/ install -d -m 755 %{buildroot}%{_jnidir}/%{name} install -d -m 755 %{buildroot}%{_javadir}/%{name} -install -p -m 644 build%{suffix}/jna-min.jar %{buildroot}%{_jnidir}/%{name}.jar +install -p -m 644 build/jna-min.jar %{buildroot}%{_jnidir}/%{name}.jar ln -sf ../%{name}.jar %{buildroot}%{_jnidir}/%{name}/%{name}.jar ln -sf %{_jnidir}/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar install -p -m 644 ./contrib/platform/dist/jna-platform.jar %{buildroot}%{_javadir}/%{name}-platform.jar