80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

drop romversion since it is now in sync with release

Browse Source
This commit is contained in:
Robert de Rooy
2022-08-02 07:52:01 +02:00
parent 31fde716b7
commit 99b231b0a9
2 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bumpversion.sh
View File

@@ -17,10 +17,9 @@
# Parse arguments. # Parse arguments.
newversion="$1" newversion="$1"
romversion="$2"
if [ -z "$(echo "$newversion" | grep '\.')" ] if [ -z "$(echo "$newversion" | grep '\.')" ]
then then
echo '[!] Usage: bumpversion.sh x.y[.z] [romversion]' echo '[!] Usage: bumpversion.sh x.y[.z]'
exit 1 exit 1
fi fi
shift shift
@@ -32,13 +31,6 @@ newversion_patch=$(echo "$newversion" | cut -d. -f3)
[ -z "$newversion_patch" ] && newversion_patch=0 [ -z "$newversion_patch" ] && newversion_patch=0
if [ -z "${romversion}" ]; then
# Get the latest ROM release from the GitHub API.
romversion=$(curl --silent "https://api.github.com/repos/86Box/roms/releases/latest" |
grep '"tag_name":' |
sed -E 's/.*"([^"]+)".*/\1/')
fi
# Switch to the repository root directory. # Switch to the repository root directory.
cd "$(dirname "$0")" || exit cd "$(dirname "$0")" || exit
@@ -69,7 +61,6 @@ patch_file src/include_make/*/version.h EMU_VERSION_PATCH 's/(#\s*define\s+EMU_V
patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/' patch_file src/include_make/*/version.h COPYRIGHT_YEAR 's/(#\s*define\s+COPYRIGHT_YEAR\s+)[0-9]+/\1'"$(date +%Y)"'/'
patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/' patch_file src/include_make/*/version.h EMU_DOCS_URL 's/(#\s*define\s+EMU_DOCS_URL\s+"https:\/\/[^\/]+\/en\/v)[^\/]+/\1'"$newversion_maj.$newversion_min"'/'
patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/' patch_file src/unix/assets/*.spec Version 's/(Version:\s+)[0-9].+/\1'"$newversion"'/'
patch_file src/unix/assets/*.spec '%global romver' 's/(^%global\ romver\s+)[0-9]{8}/\1'"$romversion"'/'
patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/' patch_file src/unix/assets/*.spec 'changelog version' 's/(^[*]\s.*>\s+)[0-9].+/\1'"$newversion"-1'/'
patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/' patch_file src/unix/assets/*.spec 'changelog date' 's/(^[*]\s)[a-zA-Z]{3}\s[a-zA-Z]{3}\s[0-9]{2}\s[0-9]{4}/\1'"$(pretty_date)"'/'
patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/' patch_file src/unix/assets/*.metainfo.xml release 's/(<release version=")[^"]+(" date=")[^"]+/\1'"$newversion"'\2'"$(date +%Y-%m-%d)"'/'

10
src/unix/assets/86Box.spec
View File

@@ -12,8 +12,6 @@
# After a successful build, you can install the RPMs as follows: # After a successful build, you can install the RPMs as follows:
# sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms* # sudo dnf install RPMS/$(uname -m)/86Box-3* RPMS/noarch/86Box-roms*
%global romver 20220730
Name: 86Box Name: 86Box
Version: 3.7 Version: 3.7
Release: 1%{?dist} Release: 1%{?dist}
@@ -22,7 +20,7 @@ License: GPLv2+
URL: https://86box.net URL: https://86box.net
Source0: https://github.com/86Box/86Box/archive/refs/tags/v%%{version}.tar.gz Source0: https://github.com/86Box/86Box/archive/refs/tags/v%%{version}.tar.gz
Source1: https://github.com/86Box/roms/archive/refs/tags/%{romver}.tar.gz Source1: https://github.com/86Box/roms/archive/refs/tags/%{version}.tar.gz
BuildRequires: cmake BuildRequires: cmake
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@@ -57,7 +55,7 @@ It supports various models of PCs, graphics and sound cards, and CPUs.
%package roms %package roms
Summary: ROMs for use with 86Box Summary: ROMs for use with 86Box
Version: %{romver} Version: %{version}
License: Proprietary License: Proprietary
BuildArch: noarch BuildArch: noarch
@@ -98,7 +96,7 @@ cp src/unix/assets/net.86box.86Box.metainfo.xml %{buildroot}%{_metainfodir}
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.86box.86Box.metainfo.xml appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/net.86box.86Box.metainfo.xml
# install roms # install roms
pushd roms-%{romver} pushd roms-%{version}
mkdir -p %{buildroot}%{_datadir}/%{name}/roms mkdir -p %{buildroot}%{_datadir}/%{name}/roms
cp -a * %{buildroot}%{_datadir}/%{name}/roms/ cp -a * %{buildroot}%{_datadir}/%{name}/roms/
popd popd
@@ -113,7 +111,7 @@ popd
# files part of the rom package # files part of the rom package
%files roms %files roms
%license roms-%{romver}/LICENSE %license roms-%{version}/LICENSE
%{_datadir}/%{name}/roms %{_datadir}/%{name}/roms
%changelog %changelog