From acc5e9cc49cc9d51c5c366cc7b6549c1223f1be9 Mon Sep 17 00:00:00 2001 From: Sangjung woo Date: Tue, 26 Sep 2017 10:47:54 +0900 Subject: [PATCH] packaging: use %{_libdir} instead of fixed path This patch uses the %{_libdir} instead of fixed path so that built result could be install in both 'lib' and 'lib64'. Signed-off-by: Sangjung woo Corrected subject format. Signed-off-by: Inki Dae --- packaging/glog.spec | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/packaging/glog.spec b/packaging/glog.spec index 5cb70e0..b4996d5 100644 --- a/packaging/glog.spec +++ b/packaging/glog.spec @@ -1,5 +1,4 @@ %define RELEASE 1 -# %define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE} %define prefix %{_prefix} %define NAME glog %define VERSION 0.3.5 @@ -13,9 +12,8 @@ URL: http://github.com/google/glog License: BSD Vendor: Google Packager: Google Inc. -Source: https://github.com/google/glog/archive/v%{VERSION}.tar.gz +Source: %{name}-%{version}.tar.gz Distribution: Redhat 7 and above. -Buildroot: %{_tmppath}/%{name}-root Prefix: %prefix %description @@ -46,7 +44,7 @@ make prefix=%prefix %install rm -rf $RPM_BUILD_ROOT -make prefix=$RPM_BUILD_ROOT%{prefix} install +make prefix=$RPM_BUILD_ROOT%{prefix} libdir=$RPM_BUILD_ROOT%{_libdir} install %clean rm -rf $RPM_BUILD_ROOT @@ -61,15 +59,14 @@ rm -rf $RPM_BUILD_ROOT ## dist_doc_DATA = AUTHORS COPYING ChangeLog INSTALL NEWS README %docdir %{prefix}/share/doc/%{NAME}-%{VERSION} %{prefix}/share/doc/%{NAME}-%{VERSION}/* - -%{prefix}/lib/libglog.so.0 -%{prefix}/lib/libglog.so.0.0.0 +%{_libdir}/libglog.so.0 +%{_libdir}/libglog.so.0.0.0 %files devel %defattr(-,root,root) -%{prefix}/include/glog -%{prefix}/lib/libglog.a -%{prefix}/lib/libglog.la -%{prefix}/lib/libglog.so -%{prefix}/lib/pkgconfig/libglog.pc +%{_includedir}/glog +%{_libdir}/libglog.a +%{_libdir}/libglog.la +%{_libdir}/libglog.so +%{_libdir}/pkgconfig/libglog.pc -- 2.34.1