]> granicus.if.org Git - libjpeg-turbo/commitdiff
rpm.spec.in: Fix "File listed twice" warning/error
authorDRC <information@libjpeg-turbo.org>
Wed, 13 Feb 2019 22:22:18 +0000 (16:22 -0600)
committerDRC <information@libjpeg-turbo.org>
Wed, 13 Feb 2019 23:04:46 +0000 (17:04 -0600)
%{_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

release/rpm.spec.in

index ce48c34bbaa25eda68893ca0b8466693bdb2ecbc..e5730e6c6e0e2359fc913b44e11f5b8a762f4960 100644 (file)
@@ -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"