Browse code

Removed built-in python-six module and added dependency on python-six package in lldb. And also added separate python package for lldb.

Change-Id: I51f09b98aca02ea9123ea9146a0d6ceaf89a8b2c
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3148
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

dthaluru authored on 2017/07/06 04:00:15
Showing 1 changed files
... ...
@@ -1,7 +1,8 @@
1
+%{!?python2_sitelib: %define python2_sitelib %(python2 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
1 2
 Summary:        A next generation, high-performance debugger.
2 3
 Name:           lldb
3 4
 Version:        4.0.0
4
-Release:        1%{?dist}
5
+Release:        2%{?dist}
5 6
 License:        NCSA
6 7
 URL:            http://lldb.llvm.org
7 8
 Group:          Development/Tools
... ...
@@ -16,7 +17,6 @@ BuildRequires:  ncurses-devel
16 16
 BuildRequires:  swig
17 17
 BuildRequires:  zlib-devel
18 18
 BuildRequires:  libxml2-devel
19
-BuildRequires:  python2-devel
20 19
 Requires:       llvm = %{version}
21 20
 Requires:       clang = %{version}
22 21
 Requires:       ncurses
... ...
@@ -34,6 +34,15 @@ Requires:       %{name} = %{version}-%{release}
34 34
 The lldb-devel package contains libraries, header files and documentation
35 35
 for developing applications that use lldb.
36 36
 
37
+%package -n python-lldb
38
+Summary:        Python module for lldb
39
+Requires:       %{name} = %{version}-%{release}
40
+BuildRequires:  python2-devel
41
+Requires:       python-six
42
+
43
+%description -n python-lldb
44
+The package contains the LLDB Python module.
45
+
37 46
 %prep
38 47
 %setup -q -n %{name}-%{version}.src
39 48
 
... ...
@@ -55,6 +64,9 @@ make %{?_smp_mflags}
55 55
 cd build
56 56
 make DESTDIR=%{buildroot} install
57 57
 
58
+#Remove bundled python-six files
59
+rm -f %{buildroot}%{python2_sitelib}/six.*
60
+
58 61
 %post   -p /sbin/ldconfig
59 62
 %postun -p /sbin/ldconfig
60 63
 
... ...
@@ -67,7 +79,6 @@ rm -rf %{buildroot}/*
67 67
 %files
68 68
 %defattr(-,root,root)
69 69
 %{_bindir}/*
70
-%{_libdir}/python2.7/*
71 70
 %{_libdir}/liblldb.so.*
72 71
 
73 72
 %files devel
... ...
@@ -76,7 +87,13 @@ rm -rf %{buildroot}/*
76 76
 %{_libdir}/*.a
77 77
 %{_includedir}/*
78 78
 
79
+%files -n python-lldb
80
+%defattr(-,root,root)
81
+%{python2_sitelib}/*
82
+
79 83
 %changelog
84
+*   Wed Jul 5 2017 Divya Thaluru <dthaluru@vmware.com> 4.0.0-2
85
+-   Added python-lldb package
80 86
 *   Fri Apr 7 2017 Alexey Makhalov <amakhalov@vmware.com> 4.0.0-1
81 87
 -   Version update
82 88
 *   Wed Jan 11 2017 Xiaolin Li <xiaolinl@vmware.com>  3.9.1-1