 |
simply adding Release: <CI_CNT>.<B_CNT>%{?dist} to the spec file does not work when using OBS Source Service "Updates version in spec and dsc files", because the script /usr/lib/obs/service/set_version does replace anything in the spec files Release tag before the first % character with "0" by sed -r -i "s,^Release:(\s*)[^%]*,Release:\10," "$MYOUTDIR/$FILE" || exit 1 http://en.opensuse.org/openSUSE:Build_Service_Tips_and_Tricks#How_to_control_a_Release_number_of_resulted_packages suggests to add something like "Release: %%{?release_prefix}.<CI_CNT>.<B_CNT>" to the OBS Project Configuration. For this case, it works when adding the following to the Project Configuration: Release: <CI_CNT>.<B_CNT>%%{?dist} Like this, OBS always sets the Relase Tag appropietaly and adding %{?dist}, for example: [ 95s] I have the following modifications for bareos.spec: [ 95s] 44c44 [ 95s] < Release: 0%{?dist} [ 95s] --- [ 95s] > Release: 6.1%{?dist} It does not matter if the original spec file has %{?dist} in the Relase Tag or not. The %{?dist} will be added in both cases. Like this it works for all Fedora, RHEL and CentOS 6, but notfor CentOS 5 because https://build.opensuse.org/project/prjconf?project=CentOS%3ACentOS-5 does not define the macro %dist It would be possible to add the following to spec file befor the Release: line as a workaround: %if 0%{?centos_version} == 505 %define dist .el5 %endif But this does not really belong in the spec file. It should be done by OBS project configuration. I tested the following in prjconf but it does not work: %if 0%{?centos_version} == 505 %define dist .el5 %endif Because the normal prjconf definition are only use for the spec file processing, they don't go though to the build itself. This is only the case for the Macros: section in prjconf, but: Also trying to set Macros after the Macros:-Tag in the prjconf (see http://en.opensuse.org/openSUSE:Build_Service_prjconf) won't work because everything there the define statement is implicit and %if ... can't be used because it expands to %define if ... which does not make sense and breaks everything. |
|
|
Finally found out, that adding the following addition to our OBS prjconf would work and would not require any changes in the .spec file: # dist tag for Fedora, RHEL, CentOS. No effect on any other. Release: <CI_CNT>.<B_CNT>%%{?dist} # fix missing dist definition in openSUSE.org:CentOS:CentOS-5 prjconf %if 0%{?centos_version} >= 500 && 0%{?centos_version} <= 599 Release: <CI_CNT>.<B_CNT>.el5 %endif The second part can be removed once openSUSE.org OBS defines the dist for CentOS 5 in their prjconf. On my home project I verified that it works fine. |
|
|
Philipp agreed to implement it like proposed. Verified on bareos:master, works. Also changed the bareos prjconf in OBS now. |
|
|
Fedora, CentOS and RHEL packages now get dist tag added to RPM Release Field. |
- Anonymous
