From 7a6091e770eec67918d6a6df79484ffa3d907c7c Mon Sep 17 00:00:00 2001 From: Cao Jingbo Date: Fri, 30 Dec 2022 18:00:57 +0800 Subject: [PATCH] Use version macro replace the number --- thrift.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/thrift.spec b/thrift.spec index ad90cd4..871d516 100644 --- a/thrift.spec +++ b/thrift.spec @@ -38,7 +38,7 @@ %global lua_configure --without-lua Name: thrift Version: 0.14.0 -Release: 4 +Release: 5 Summary: Software framework for cross-language services development License: ASL 2.0 and BSD and zlib URL: https://thrift.apache.org/ @@ -94,8 +94,8 @@ The thrift-qt package contains GLib bindings for thrift. Summary: Python 3 support for thrift BuildRequires: python3-devel python3-setuptools Requires: thrift%{?_isa} = %{version}-%{release} python3 -Obsoletes: python-thrift < 0.10.0-1% -Obsoletes: python2-thrift < 0.10.0-14% +Obsoletes: python-thrift < 0.10.0-1 +Obsoletes: python2-thrift < 0.10.0-14 %description -n python3-thrift The python3-thrift package contains Python bindings for thrift. @@ -184,7 +184,7 @@ mkdir libthrift_dir cp %{SOURCE1} ./libthrift_dir/pom.xml cp %{SOURCE3} ./libthrift_dir pushd libthrift_dir - jar -xvf libthrift-0.14.0-sources.jar + jar -xvf libthrift-%{version}-sources.jar popd %build @@ -234,7 +234,7 @@ find %{buildroot} -name \*.py -exec grep -q /usr/bin/env {} \; -print | xargs -r install -d -m 755 %{buildroot}%{_datadir}/java/libthrift install -d -m 755 %{buildroot}%{_datadir}/maven-poms/libthrift -cp libthrift_dir/target/libthrift-0.14.0.jar %{buildroot}%{_datadir}/java/libthrift/libthrift.jar +cp libthrift_dir/target/libthrift-%{version}.jar %{buildroot}%{_datadir}/java/libthrift/libthrift.jar cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift.pom %add_maven_depmap libthrift/libthrift.pom libthrift/libthrift.jar -f "libthrift" @@ -299,6 +299,9 @@ cp libthrift_dir/pom.xml %{buildroot}%{_datadir}/maven-poms/libthrift/libthrift. %endif %changelog +* Fri Dec 30 2022 Cao Jingbo - 0.14.0-5 +- Use version macro relpace version number text. + * Wed Dec 28 2022 Cao Jingbo - 0.14.0-4 - THRIFT-5348: Update debian/copyright [skip ci] Patch: Jihoon Seo -- Gitee