Browse code
Copy libraries and add a patch for path regarding %check for libtalloc
Change-Id: I854d58ca26e3837e7cb53565cffd273ad99e93ae
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/3413
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Rongrong Qiu <rqiu@vmware.com>
changpil authored on 2017/08/04 10:03:14Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Talloc is a hierarchical, reference counted memory pool system |
| 2 | 2 |
Name: libtalloc |
| 3 | 3 |
Version: 2.1.9 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: LGPLv3+ |
| 6 | 6 |
URL: https://talloc.samba.org |
| 7 | 7 |
Group: System Environment/Libraries |
| ... | ... |
@@ -9,6 +9,7 @@ Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: https://www.samba.org/ftp/talloc/talloc-2.1.9.tar.gz |
| 11 | 11 |
%define sha1 talloc=e1e79fec4c0b6bd92be904a9c03b0a168478711a |
| 12 |
+Patch0: wscript-test_magic_differs.patch |
|
| 12 | 13 |
BuildRequires: libxslt |
| 13 | 14 |
BuildRequires: docbook-xsl |
| 14 | 15 |
|
| ... | ... |
@@ -41,6 +42,7 @@ Development libraries for python-talloc |
| 41 | 41 |
|
| 42 | 42 |
%prep |
| 43 | 43 |
%setup -q -n talloc-%{version}
|
| 44 |
+%patch0 -p1 |
|
| 44 | 45 |
|
| 45 | 46 |
%build |
| 46 | 47 |
%configure --disable-rpath \ |
| ... | ... |
@@ -57,6 +59,8 @@ rm -f %{buildroot}/%{_libdir}/libtalloc.a
|
| 57 | 57 |
rm -f %{buildroot}/usr/share/swig/*/talloc.i
|
| 58 | 58 |
|
| 59 | 59 |
%check |
| 60 |
+cp %{buildroot}/usr/lib/libtalloc.so.2 /usr/lib/
|
|
| 61 |
+cp %{buildroot}/usr/lib/libpytalloc-util.so.2 /usr/lib/
|
|
| 60 | 62 |
make check |
| 61 | 63 |
|
| 62 | 64 |
%post -p /sbin/ldconfig |
| ... | ... |
@@ -81,5 +85,7 @@ make check |
| 81 | 81 |
%{_libdir}/libpytalloc-util.so
|
| 82 | 82 |
|
| 83 | 83 |
%changelog |
| 84 |
+* Thu Aug 03 2017 Chang Lee <changlee@vmware.com> 2.1.9-2 |
|
| 85 |
+- Copy libraries and add a patch for path regarding %check |
|
| 84 | 86 |
* Wed Apr 05 2017 Anish Swaminathan <anishs@vmware.com> 2.1.9-1 |
| 85 | 87 |
- Initial packaging |
| 86 | 88 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,11 @@ |
| 0 |
+--- a/wscript 2017-08-04 00:21:24.741655672 +0000 |
|
| 1 |
+@@ -163,6 +163,8 @@ |
|
| 2 |
+ magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper') |
|
| 3 |
+ magic_cmd = os.path.join(srcdir, 'lib', 'talloc', |
|
| 4 |
+ 'test_magic_differs.sh') |
|
| 5 |
++ if not os.path.exists(magic_cmd): |
|
| 6 |
++ magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh') |
|
| 7 |
+ |
|
| 8 |
+ magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd) |
|
| 9 |
+ print("magic differs test returned %d" % magic_ret)
|