RPM: Don't include system lib dir in file list
This resolves a conflict between the RPM generated by the libjpeg-turbo build system and the Red Hat 'filesystem' RPM if CMAKE_INSTALL_LIBDIR=/usr/lib[64]. This code was largely borrowed from the VirtualGL RPM spec. (I can legally do that because I hold the copyright on VirtualGL's implementation.) Fixes #532
This commit is contained in:
@@ -21,6 +21,12 @@
|
|||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if "%{_bits}" == "64"
|
||||||
|
%define _syslibdir /usr/lib64
|
||||||
|
%else
|
||||||
|
%define _syslibdir /usr/lib
|
||||||
|
%endif
|
||||||
|
|
||||||
#-->%if 1
|
#-->%if 1
|
||||||
%if "%{_bits}" == "64"
|
%if "%{_bits}" == "64"
|
||||||
%define _libdir %{_exec_prefix}/lib64
|
%define _libdir %{_exec_prefix}/lib64
|
||||||
@@ -173,7 +179,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
%endif
|
%endif
|
||||||
%{_bindir}/rdjpgcom
|
%{_bindir}/rdjpgcom
|
||||||
%{_bindir}/wrjpgcom
|
%{_bindir}/wrjpgcom
|
||||||
|
%if "%{_libdir}" != "%{_syslibdir}"
|
||||||
%dir %{_libdir}
|
%dir %{_libdir}
|
||||||
|
%endif
|
||||||
%if "%{_enable_shared}" == "1"
|
%if "%{_enable_shared}" == "1"
|
||||||
%{_libdir}/libjpeg.so.@SO_MAJOR_VERSION@.@SO_AGE@.@SO_MINOR_VERSION@
|
%{_libdir}/libjpeg.so.@SO_MAJOR_VERSION@.@SO_AGE@.@SO_MINOR_VERSION@
|
||||||
%{_libdir}/libjpeg.so.@SO_MAJOR_VERSION@
|
%{_libdir}/libjpeg.so.@SO_MAJOR_VERSION@
|
||||||
|
|||||||
Reference in New Issue
Block a user