summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSangjung woo <sangjung.woo@samsung.com>2017-09-26 10:47:54 +0900
committerInki Dae <inki.dae@samsung.com>2018-03-13 15:37:24 +0900
commitacc5e9cc49cc9d51c5c366cc7b6549c1223f1be9 (patch)
treeec92a4c25270060c33b1dcc5888240f139bf90b5
parent41e8aa84943bb57f9ae8dbc40c920bfc0b7d6c83 (diff)
downloadglog-accepted/tizen_5.5_unified.tar.gz
glog-accepted/tizen_5.5_unified.tar.bz2
glog-accepted/tizen_5.5_unified.zip
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 <sangjung.woo@samsung.com> Corrected subject format. Signed-off-by: Inki Dae <inki.dae@samsung.com>
-rw-r--r--packaging/glog.spec21
1 files 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. <opensource@google.com>
-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