Remove unused relprefix and prerel macros that break rpmdev-bumpspec logic
During mass rebuilds NVR is bumped by rpmdev-bumpspec. But it can't handle complex Release: fields such as ours, that has %{prerel} and %{relprefix} macros. It adds .1 after the %{dist} macro instead of increasing the release number. The issue for rpmdev-bumpspec is unsolved since 2012: https://pagure.io/rpmdevtools/issue/18 These macros are unused by us and only cause issues when NVR is bumped. So let's remove them.
This commit is contained in:
parent
0853e355f9
commit
0aaf5d460b
@ -5,13 +5,6 @@
|
|||||||
# Exclude i686 bit arches
|
# Exclude i686 bit arches
|
||||||
ExcludeArch: i686
|
ExcludeArch: i686
|
||||||
|
|
||||||
# for a pre-release, define the prerel field e.g. .a1 .rc2 - comment out for official release
|
|
||||||
# also remove the space between % and global - this space is needed because
|
|
||||||
# fedpkg verrel stupidly ignores comment lines
|
|
||||||
#% global prerel .rc3
|
|
||||||
# also need the relprefix field for a pre-release e.g. .0 - also comment out for official release
|
|
||||||
#% global relprefix 0.
|
|
||||||
|
|
||||||
# If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
|
# If perl-Socket-2.000 or newer is available, set 0 to use_Socket6.
|
||||||
%global use_Socket6 0
|
%global use_Socket6 0
|
||||||
|
|
||||||
@ -54,7 +47,7 @@ ExcludeArch: i686
|
|||||||
Summary: 389 Directory Server (base)
|
Summary: 389 Directory Server (base)
|
||||||
Name: 389-ds-base
|
Name: 389-ds-base
|
||||||
Version: 2.1.1
|
Version: 2.1.1
|
||||||
Release: %{?relprefix}1%{?prerel}%{?dist}
|
Release: 1%{?dist}
|
||||||
License: GPLv3+ and (ASL 2.0 or MIT) and MIT and (Unlicense or MIT) and MPLv2.0 and BSD and ASL 2.0 and (ASL 2.0 or Boost)
|
License: GPLv3+ and (ASL 2.0 or MIT) and MIT and (Unlicense or MIT) and MPLv2.0 and BSD and ASL 2.0 and (ASL 2.0 or Boost)
|
||||||
URL: https://www.port389.org
|
URL: https://www.port389.org
|
||||||
Conflicts: selinux-policy-base < 3.9.8
|
Conflicts: selinux-policy-base < 3.9.8
|
||||||
@ -265,7 +258,7 @@ Requires: perl-sigtrap
|
|||||||
|
|
||||||
Obsoletes: %{name} <= 1.4.4
|
Obsoletes: %{name} <= 1.4.4
|
||||||
|
|
||||||
Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}%{?prerel}.tar.bz2
|
Source0: https://releases.pagure.org/389-ds-base/%{name}-%{version}.tar.bz2
|
||||||
# 389-ds-git.sh should be used to generate the source tarball from git
|
# 389-ds-git.sh should be used to generate the source tarball from git
|
||||||
Source1: %{name}-git.sh
|
Source1: %{name}-git.sh
|
||||||
Source2: %{name}-devel.README
|
Source2: %{name}-devel.README
|
||||||
@ -375,10 +368,10 @@ A cockpit UI Plugin for configuring and administering the 389 Directory Server
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -v -n %{name}-%{version}%{?prerel}
|
%autosetup -p1 -v -n %{name}-%{version}
|
||||||
|
|
||||||
%if %{bundle_jemalloc}
|
%if %{bundle_jemalloc}
|
||||||
%setup -q -n %{name}-%{version}%{?prerel} -T -D -b 3
|
%setup -q -n %{name}-%{version} -T -D -b 3
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
cp %{SOURCE2} README.devel
|
cp %{SOURCE2} README.devel
|
||||||
@ -459,10 +452,10 @@ pushd ./src/lib389
|
|||||||
popd
|
popd
|
||||||
# argparse-manpage dynamic man pages have hardcoded man v1 in header,
|
# argparse-manpage dynamic man pages have hardcoded man v1 in header,
|
||||||
# need to change it to v8
|
# need to change it to v8
|
||||||
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsconf.8
|
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsconf.8
|
||||||
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsctl.8
|
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsctl.8
|
||||||
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dsidm.8
|
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dsidm.8
|
||||||
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}%{?prerel}/src/lib389/man/dscreate.8
|
sed -i "1s/\"1\"/\"8\"/" %{_builddir}/%{name}-%{version}/src/lib389/man/dscreate.8
|
||||||
|
|
||||||
# Generate symbolic info for debuggers
|
# Generate symbolic info for debuggers
|
||||||
export XCFLAGS=$RPM_OPT_FLAGS
|
export XCFLAGS=$RPM_OPT_FLAGS
|
||||||
@ -484,7 +477,7 @@ find %{buildroot}%{_datadir}/cockpit/389-console -type f | sed -e "s@%{buildroot
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Copy in our docs from doxygen.
|
# Copy in our docs from doxygen.
|
||||||
cp -r %{_builddir}/%{name}-%{version}%{?prerel}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3
|
cp -r %{_builddir}/%{name}-%{version}/man/man3 $RPM_BUILD_ROOT/%{_mandir}/man3
|
||||||
|
|
||||||
# lib389
|
# lib389
|
||||||
pushd src/lib389
|
pushd src/lib389
|
||||||
@ -509,8 +502,8 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libsvrcore.la
|
|||||||
%if %{bundle_jemalloc}
|
%if %{bundle_jemalloc}
|
||||||
pushd ../%{jemalloc_name}-%{jemalloc_ver}
|
pushd ../%{jemalloc_name}-%{jemalloc_ver}
|
||||||
make DESTDIR="$RPM_BUILD_ROOT" install_lib install_bin
|
make DESTDIR="$RPM_BUILD_ROOT" install_lib install_bin
|
||||||
cp -pa COPYING ../%{name}-%{version}%{?prerel}/COPYING.jemalloc
|
cp -pa COPYING ../%{name}-%{version}/COPYING.jemalloc
|
||||||
cp -pa README ../%{name}-%{version}%{?prerel}/README.jemalloc
|
cp -pa README ../%{name}-%{version}/README.jemalloc
|
||||||
popd
|
popd
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user