rpms/protobuf
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Reduce macro indirection in the spec file

Browse Source
This commit is contained in:
Benjamin A. Beasley 2023-04-26 14:32:43 -04:00
parent 9ffe6d4b3c
commit 5f2bb87c55
1 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
protobuf.spec
View File

@ -47,7 +47,7 @@ Release: 3%{?dist}
# conformance/third_party/jsoncpp/jsoncpp.cpp # conformance/third_party/jsoncpp/jsoncpp.cpp
License: BSD-3-Clause License: BSD-3-Clause
URL: https://github.com/protocolbuffers/protobuf URL: https://github.com/protocolbuffers/protobuf
Source0: %{url}/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz Source0: %{url}/archive/v%{version}%{?rcver}/protobuf-%{version}%{?rcver}-all.tar.gz
Source1: ftdetect-proto.vim Source1: ftdetect-proto.vim
Source2: protobuf-init.el Source2: protobuf-init.el
@ -105,11 +105,11 @@ BuildRequires: emacs
BuildRequires: zlib-devel BuildRequires: zlib-devel
%ifnarch %{java_arches} %ifnarch %{java_arches}
Obsoletes: %{name}-java-util < 3.19.4-4 Obsoletes: protobuf-java-util < 3.19.4-4
Obsoletes: %{name}-javadoc < 3.19.4-4 Obsoletes: protobuf-javadoc < 3.19.4-4
Obsoletes: %{name}-parent < 3.19.4-4 Obsoletes: protobuf-parent < 3.19.4-4
Obsoletes: %{name}-bom < 3.19.4-4 Obsoletes: protobuf-bom < 3.19.4-4
Obsoletes: %{name}-javalite < 3.19.4-4 Obsoletes: protobuf-javalite < 3.19.4-4
%endif %endif
%description %description
@ -127,7 +127,7 @@ breaking deployed programs that are compiled against the "old" format.
%package compiler %package compiler
Summary: Protocol Buffers compiler Summary: Protocol Buffers compiler
Requires: %{name} = %{version}-%{release} Requires: protobuf = %{version}-%{release}
%description compiler %description compiler
This package contains Protocol Buffers compiler for all programming This package contains Protocol Buffers compiler for all programming
@ -135,8 +135,8 @@ languages
%package devel %package devel
Summary: Protocol Buffers C++ headers and libraries Summary: Protocol Buffers C++ headers and libraries
Requires: %{name} = %{version}-%{release} Requires: protobuf = %{version}-%{release}
Requires: %{name}-compiler = %{version}-%{release} Requires: protobuf-compiler = %{version}-%{release}
Requires: zlib-devel Requires: zlib-devel
%description devel %description devel
@ -144,8 +144,8 @@ This package contains Protocol Buffers compiler for all languages and
C++ headers and libraries C++ headers and libraries
%package static %package static
Summary: Static development files for %{name} Summary: Static development files for protobuf
Requires: %{name}-devel = %{version}-%{release} Requires: protobuf-devel = %{version}-%{release}
%description static %description static
Static libraries for Protocol Buffers Static libraries for Protocol Buffers
@ -162,8 +162,8 @@ lacks descriptors, reflection, and some other features.
%package lite-devel %package lite-devel
Summary: Protocol Buffers LITE_RUNTIME development libraries Summary: Protocol Buffers LITE_RUNTIME development libraries
Requires: %{name}-devel = %{version}-%{release} Requires: protobuf-devel = %{version}-%{release}
Requires: %{name}-lite = %{version}-%{release} Requires: protobuf-lite = %{version}-%{release}
%description lite-devel %description lite-devel
This package contains development libraries built with This package contains development libraries built with
@ -174,8 +174,8 @@ which only depends libprotobuf-lite, which is much smaller than libprotobuf but
lacks descriptors, reflection, and some other features. lacks descriptors, reflection, and some other features.
%package lite-static %package lite-static
Summary: Static development files for %{name}-lite Summary: Static development files for protobuf-lite
Requires: %{name}-devel = %{version}-%{release} Requires: protobuf-devel = %{version}-%{release}
%description lite-static %description lite-static
This package contains static development libraries built with This package contains static development libraries built with
@ -186,21 +186,21 @@ which only depends libprotobuf-lite, which is much smaller than libprotobuf but
lacks descriptors, reflection, and some other features. lacks descriptors, reflection, and some other features.
%if %{with python} %if %{with python}
%package -n python3-%{name} %package -n python3-protobuf
Summary: Python bindings for Google Protocol Buffers Summary: Python bindings for Google Protocol Buffers
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: python3dist(setuptools) BuildRequires: python3dist(setuptools)
BuildRequires: python3dist(wheel) BuildRequires: python3dist(wheel)
%if %{with python_cpp} %if %{with python_cpp}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: protobuf%{?_isa} = %{version}-%{release}
%else %else
BuildArch: noarch BuildArch: noarch
%endif %endif
Conflicts: %{name}-compiler > %{version} Conflicts: protobuf-compiler > %{version}
Conflicts: %{name}-compiler < %{version} Conflicts: protobuf-compiler < %{version}
Provides: %{name}-python3 = %{version}-%{release} Provides: protobuf-python3 = %{version}-%{release}
%description -n python3-%{name} %description -n python3-protobuf
This package contains Python libraries for Google Protocol Buffers This package contains Python libraries for Google Protocol Buffers
%endif %endif
@ -232,9 +232,9 @@ BuildRequires: mvn(org.apache.maven.plugins:maven-antrun-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin)
BuildRequires: mvn(org.easymock:easymock) BuildRequires: mvn(org.easymock:easymock)
Conflicts: %{name}-compiler > %{version} Conflicts: protobuf-compiler > %{version}
Conflicts: %{name}-compiler < %{version} Conflicts: protobuf-compiler < %{version}
Obsoletes: %{name}-javanano < 3.6.0 Obsoletes: protobuf-javanano < 3.6.0
%description java %description java
This package contains Java Protocol Buffers runtime library. This package contains Java Protocol Buffers runtime library.
@ -255,11 +255,11 @@ Utilities to work with protos. It contains JSON support
as well as utilities to work with proto3 well-known types. as well as utilities to work with proto3 well-known types.
%package javadoc %package javadoc
Summary: Javadoc for %{name}-java Summary: Javadoc for protobuf-java
BuildArch: noarch BuildArch: noarch
%description javadoc %description javadoc
This package contains the API documentation for %{name}-java. This package contains the API documentation for protobuf-java.
%package parent %package parent
Summary: Protocol Buffer Parent POM Summary: Protocol Buffer Parent POM
@ -288,7 +288,7 @@ This package contains syntax highlighting for Google Protocol Buffers
descriptions in the Emacs editor. descriptions in the Emacs editor.
%prep %prep
%setup -q -n %{name}-%{version}%{?rcver} -a 3 %setup -q -n protobuf-%{version}%{?rcver} -a 3
%ifarch %{ix86} %ifarch %{ix86}
# IoTest.LargeOutput fails on 32bit arches # IoTest.LargeOutput fails on 32bit arches
# https://github.com/protocolbuffers/protobuf/issues/8082 # https://github.com/protocolbuffers/protobuf/issues/8082
@ -300,7 +300,7 @@ descriptions in the Emacs editor.
%patch4 -p1 -b .python311 %patch4 -p1 -b .python311
# Copy in the needed gtest/gmock implementations. # Copy in the needed gtest/gmock implementations.
%setup -q -T -D -b 3 -n %{name}-%{version}%{?rcver} %setup -q -T -D -b 3 -n protobuf-%{version}%{?rcver}
rm -rvf 'third_party/googletest' rm -rvf 'third_party/googletest'
mv '../%{gtest_dir}' 'third_party/googletest' mv '../%{gtest_dir}' 'third_party/googletest'
@ -324,7 +324,7 @@ find -name '*.java' | xargs sed -ri \
%pom_xpath_inject "pom:configuration/pom:instructions" "<Import-Package>sun.misc;resolution:=optional,*</Import-Package>" java/core %pom_xpath_inject "pom:configuration/pom:instructions" "<Import-Package>sun.misc;resolution:=optional,*</Import-Package>" java/core
# Backward compatibility symlink # Backward compatibility symlink
%mvn_file :protobuf-java:jar: %{name}/%{name}-java %{name} %mvn_file :protobuf-java:jar: protobuf/protobuf-java protobuf
%endif %endif
rm -f src/solaris/libstdc++.la rm -f src/solaris/libstdc++.la
@ -387,9 +387,9 @@ install -p -m 644 -D editors/proto.vim %{buildroot}%{_datadir}/vim/vimfiles/synt
%mvn_install %mvn_install
%endif %endif
mkdir -p %{buildroot}%{_emacs_sitelispdir}/%{name} mkdir -p %{buildroot}%{_emacs_sitelispdir}/protobuf
install -p -m 0644 editors/protobuf-mode.el %{buildroot}%{_emacs_sitelispdir}/%{name} install -p -m 0644 editors/protobuf-mode.el %{buildroot}%{_emacs_sitelispdir}/protobuf
install -p -m 0644 editors/protobuf-mode.elc %{buildroot}%{_emacs_sitelispdir}/%{name} install -p -m 0644 editors/protobuf-mode.elc %{buildroot}%{_emacs_sitelispdir}/protobuf
mkdir -p %{buildroot}%{_emacs_sitestartdir} mkdir -p %{buildroot}%{_emacs_sitestartdir}
install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir} install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
@ -415,7 +415,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
%files emacs %files emacs
%license LICENSE %license LICENSE
%{_emacs_sitelispdir}/%{name}/ %{_emacs_sitelispdir}/protobuf/
%{_emacs_sitestartdir}/protobuf-init.el %{_emacs_sitestartdir}/protobuf-init.el
%files static %files static
@ -485,6 +485,7 @@ install -p -m 0644 %{SOURCE2} %{buildroot}%{_emacs_sitestartdir}
- Remove an obsolete workaround for failing Java tests - Remove an obsolete workaround for failing Java tests
- Remove conditionals for retired 32-bit ARM architecture - Remove conditionals for retired 32-bit ARM architecture
- Remove a slow-test workaround on s390x - Remove a slow-test workaround on s390x
- Reduce macro indirection in the spec file
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2 * Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild