From: Karol Lewandowski Date: Mon, 8 May 2017 16:12:14 +0000 (+0200) Subject: tizen: bump version to v1.2 X-Git-Tag: accepted/tizen/4.0/base/20170811.092652^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fupstream%2Flibunwind.git;a=commitdiff_plain;h=ba89fe8be55aca154e6184862a4cbaaed43318ea tizen: bump version to v1.2 This commit also adds .gbs.conf, which directs gbs to use original upstream tags to build correct version. --- diff --git a/.gbs.conf b/.gbs.conf new file mode 100644 index 0000000..99e7cc8 --- /dev/null +++ b/.gbs.conf @@ -0,0 +1,3 @@ +[general] +upstream_branch = upstream +upstream_tag = upstream/${upstreamversion} diff --git a/packaging/libunwind.spec b/packaging/libunwind.spec index 3e3d98c..479e18b 100644 --- a/packaging/libunwind.spec +++ b/packaging/libunwind.spec @@ -2,20 +2,20 @@ %define testsdir %{_libdir}/libunwind Name: libunwind -BuildRequires: gcc-c++ -BuildRequires: libtool -BuildRequires: pkg-config Url: http://savannah.nongnu.org/projects/libunwind/ Summary: Unwind Library License: MIT Group: System/Libraries -Version: 1.1 +Version: 1.2 Release: 0 -VCS: profile/base/libunwind#upstream/1.1-0-g0349587-dirty Source: libunwind-%{version}.tar.gz Source1001: libunwind.manifest ExclusiveArch: %ix86 x86_64 %arm aarch64 +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: pkg-config + %description A portable and efficient C programming interface (API) to determine the call chain of a program. @@ -24,7 +24,6 @@ call chain of a program. Summary: Unwind library Group: Development/Libraries Requires: libunwind = %{version}-%{release} -Provides: libunwind:%{_libdir}/libunwind.so %description devel A portable and efficient C programming interface (API) to determine the @@ -45,18 +44,12 @@ cp %{SOURCE1001} . %restore_fcommon %endif autoreconf -fi -export CFLAGS="%optflags -U_FORTIFY_SOURCE" %configure make %{?_smp_mflags} make -C tests test-ptrace - %install %make_install -mkdir -p $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_libdir}/libunwind.so.8 $RPM_BUILD_ROOT%{_libdir}/libunwind.so -# Check that ln did not create a dangling link -stat %{buildroot}/$(readlink -f "%{buildroot}/%{_libdir}/libunwind.so"); mkdir -p %{buildroot}%{testsdir} install -m 750 tests/.libs/test-ptrace %{buildroot}%{testsdir} @@ -71,24 +64,20 @@ install -m 750 tests/run-ptrace-misc %{buildroot}%{testsdir} %manifest %{name}.manifest %license COPYING %defattr(-, root, root) -%_libdir/lib* -%{_libdir}/lib*.so.* -%{_libdir}/libunwind.so +%{_libdir}/libunwind.so.* +%{_libdir}/libunwind-*.so.* %files devel %manifest %{name}.manifest %defattr(-, root, root) %{_prefix}/include/* -%{_libdir}/lib*.a -%{_libdir}/libunwind-*.so +%{_libdir}/libunwind*a +%{_libdir}/libunwind*so %{_libdir}/pkgconfig/libunwind-generic.pc %{_libdir}/pkgconfig/libunwind-ptrace.pc %{_libdir}/pkgconfig/libunwind-setjmp.pc %{_libdir}/pkgconfig/libunwind.pc -%ifarch %arm %ix86 x86_64 aarch64 %{_libdir}/pkgconfig/libunwind-coredump.pc -%endif -%doc %{_mandir}/man?/* %changelog