[csmock] install plug-ins to %{python2_sitelib}

Kamil Dudka kdudka at fedoraproject.org
Fri Aug 1 12:03:59 UTC 2014


commit e67d3385d7a577209fd40fc633703e7b9d3056eb
Author: Kamil Dudka <kdudka at redhat.com>
Date:   Fri Aug 1 14:01:45 2014 +0200

    install plug-ins to %{python2_sitelib}
    
    ... instead of %{python_sitearch}

 csmock.spec |   24 ++++++++++++++----------
 1 files changed, 14 insertions(+), 10 deletions(-)
---
diff --git a/csmock.spec b/csmock.spec
index 56dcc43..9db4704 100644
--- a/csmock.spec
+++ b/csmock.spec
@@ -9,7 +9,7 @@ URL:        https://git.fedorahosted.org/cgit/csmock.git
 Source0:    https://git.fedorahosted.org/cgit/csmock.git/snapshot/csmock-%{version}.tar.xz
 
 BuildRequires: help2man
-BuildRequires: python
+BuildRequires: python-devel
 %if !(0%{?fedora} >= 19 || 0%{?rhel} >= 7)
 BuildRequires: python-argparse
 %endif
@@ -46,7 +46,10 @@ Requires: csmock
 %description -n csmock-plugin-cppcheck
 Hihgly experimental, currently suitable only for development of csmock itself.
 
-%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%if 0%{?rhel} && 0%{?rhel} <= 6
+%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
 %prep
 %setup -q
@@ -58,7 +61,7 @@ mkdir -p bin man
 install -p -m0755 cov-{diff,mock}build bin/
 sed -e 's/rpm -qf .SELF/echo %{version}/' -i bin/cov-{diff,mock}build
 sed -e 's/@VERSION@/%{name}-%{version}-%{release}/' \
-    -e 's|@PLUGIN_DIR@|%{python_sitearch}/csmock/plugins|' \
+    -e 's|@PLUGIN_DIR@|%{python2_sitelib}/csmock/plugins|' \
     -i py/csmock
 
 help2man --no-info --section 1 --name \
@@ -79,9 +82,9 @@ install -m0755 -d \
     "$RPM_BUILD_ROOT%{_mandir}/man1" \
     "$RPM_BUILD_ROOT%{_datadir}/csmock" \
     "$RPM_BUILD_ROOT%{_datadir}/csmock/scripts" \
-    "$RPM_BUILD_ROOT%{python_sitearch}/" \
-    "$RPM_BUILD_ROOT%{python_sitearch}/csmock" \
-    "$RPM_BUILD_ROOT%{python_sitearch}/csmock/plugins"
+    "$RPM_BUILD_ROOT%{python2_sitelib}/" \
+    "$RPM_BUILD_ROOT%{python2_sitelib}/csmock" \
+    "$RPM_BUILD_ROOT%{python2_sitelib}/csmock/plugins"
 
 install -p -m0755 \
     cov-{diff,mock}build cov-dump-err rpmbuild-rawbuild py/csmock \
@@ -92,7 +95,7 @@ install -p -m0644 man/{csmock,cov-{diff,mock}build}.1 "$RPM_BUILD_ROOT%{_mandir}
 install -p -m0644 cov_checker_map.txt "$RPM_BUILD_ROOT%{_datadir}/csmock/cwe-map.csv"
 
 install -p -m0644 py/plugins/*.py \
-    "$RPM_BUILD_ROOT%{python_sitearch}/csmock/plugins"
+    "$RPM_BUILD_ROOT%{python2_sitelib}/csmock/plugins"
 
 install -p -m0755 scripts/*.sh \
     "$RPM_BUILD_ROOT%{_datadir}/csmock/scripts"
@@ -108,19 +111,20 @@ install -p -m0755 scripts/*.sh \
 %{_mandir}/man1/csmock.1*
 %{_datadir}/csmock/cwe-map.csv
 %{_datadir}/csmock/scripts/patch-rawbuild.sh
-%{python_sitearch}/csmock/plugins/gcc.py*
+%{python2_sitelib}/csmock/plugins/gcc.py*
 %doc COPYING
 
 %files -n csmock-plugin-clang
 %{_datadir}/csmock/scripts/fixups-clang.sh
-%{python_sitearch}/csmock/plugins/clang.py*
+%{python2_sitelib}/csmock/plugins/clang.py*
 
 %files -n csmock-plugin-cppcheck
-%{python_sitearch}/csmock/plugins/cppcheck.py*
+%{python2_sitelib}/csmock/plugins/cppcheck.py*
 
 %changelog
 * Fri Aug 01 2014 Kamil Dudka <kdudka at redhat.com> 1.3.1-1
 - update to latest upstream
+- install plug-ins to %%{python2_sitelib} instead of %%{python_sitearch}
 
 * Thu Jul 17 2014 Kamil Dudka <kdudka at redhat.com> 1.2.3-1
 - update to latest upstream


More information about the scm-commits mailing list