From: DRC <information@libjpeg-turbo.org>
Date: Wed, 13 Feb 2019 22:22:18 +0000 (-0600)
Subject: rpm.spec.in: Fix "File listed twice" warning/error
X-Git-Tag: 2.0.2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0d7818d1b629688a0343725462212ff8996b0cf5;p=libjpeg-turbo

rpm.spec.in: Fix "File listed twice" warning/error

%{_libdir}/pkgconfig is a directory and should thus be prefixed by
%{dir} (oops.)  This issue caused the debuginfo build under RHEL 8
(which is apparently now enabled by default-- regardless of whether the
RPM actually contains debug info, but that's another matter) to fail
with:

RPM build errors:
  File listed twice: /opt/libjpeg-turbo/lib64/pkgconfig/libjpeg.pc
  File listed twice: /opt/libjpeg-turbo/lib64/pkgconfig/libturbojpeg.pc
---

diff --git a/release/rpm.spec.in b/release/rpm.spec.in
index ce48c34..e5730e6 100644
--- a/release/rpm.spec.in
+++ b/release/rpm.spec.in
@@ -183,7 +183,7 @@ rm -rf $RPM_BUILD_ROOT
 %if "%{_enable_static}" == "1"
  %{_libdir}/libjpeg.a
 %endif
-%{_libdir}/pkgconfig
+%dir %{_libdir}/pkgconfig
 %{_libdir}/pkgconfig/libjpeg.pc
 %if "%{_with_turbojpeg}" == "1"
  %if "%{_enable_shared}" == "1" || "%{_with_java}" == "1"