diff --git a/RELEASE.md b/RELEASE.md index 5a274cbb2fe494a172735b5c334bf8208d405571..761ea2cde71aba08669ba972123eb39e990c9191 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -8,7 +8,7 @@ This is step-by-step description on how to release new version of CopyQ. # Update Version and Changelog -Update CHANGES file. +Update `CHANGES.md` file. Bump version. diff --git a/utils/bump_version.sh b/utils/bump_version.sh index 94aad6053ac1fb2d9f58c3b2588063b1ed2ba84f..265dd40e81d37e8bec0463ff823bb8cd71160cf1 100755 --- a/utils/bump_version.sh +++ b/utils/bump_version.sh @@ -18,7 +18,7 @@ version=$1 version_file=version.cmake appdata_file=shared/com.github.hluk.copyq.appdata.xml itemwidget_file=src/item/itemwidget.h -changes_file=CHANGES +changes_file=CHANGES.md check_version_format() { if ! grep -q '^[0-9]\+\.[0-9]\+\.[0-9]\+$' <<< "$version"; then @@ -29,7 +29,7 @@ check_version_format() { check_changes() { last_changes_version=$(head -1 "$changes_file") - if [[ "$last_changes_version" != "v$version" ]]; then + if [[ "$last_changes_version" != "# v$version" ]]; then echo "Update $changes_file first" exit 1 fi diff --git a/utils/create_source_package.sh b/utils/create_source_package.sh index ed7501d7cb479dd78e06976578198dce1d509a41..9ec43bd616fbb1d17afb55835274976b48c0959d 100755 --- a/utils/create_source_package.sh +++ b/utils/create_source_package.sh @@ -10,7 +10,7 @@ die () { exit 1 } -grep -q '^v'"$version"'$' CHANGES || +grep -q '^# v'"$version"'$' "CHANGES.md" || die "CHANGES file doesn't contain changes for given version!" grep -q '"v'"$version"'"' "$version_header" || diff --git a/utils/fedora/copyq.spec b/utils/fedora/copyq.spec index 3e9216877f42e4caf2cfb9610d43724ecbd48529..6f138819651988637255054873297c17ee489a16 100644 --- a/utils/fedora/copyq.spec +++ b/utils/fedora/copyq.spec @@ -48,7 +48,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/com.github.hluk.%{ appstream-util validate-relax --nonet $RPM_BUILD_ROOT%{_datadir}/metainfo/com.github.hluk.%{name}.appdata.xml %files -f %{name}.lang -%doc AUTHORS CHANGES HACKING README.md +%doc AUTHORS CHANGES.md HACKING README.md %license LICENSE %{_bindir}/%{name} %{_libdir}/%{name}/