From 52d98154507fb7db9ea0928778d791ca24491959 Mon Sep 17 00:00:00 2001 From: Ahmed Zetao Yang Date: Sat, 18 Aug 2018 23:04:40 +0800 Subject: [PATCH] Some Fixes for updating to v0.6.0 (#317) * Fix name specification of packages * Update rpm .spec file * Update to v0.6.0 --- .travis.yml | 2 +- appveyor.yml | 6 +++--- rpm/flameshot.spec | 23 ++++++++--------------- travis/linux_after_success.sh | 12 ++++++------ travis/linux_script.sh | 12 ++++++------ 5 files changed, 24 insertions(+), 31 deletions(-) diff --git a/.travis.yml b/.travis.yml index ff8aa633..dab7762b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ env: global: # Environment variables for packpack - PRODUCT=flameshot - - VERSION=0.5.1 + - VERSION=0.6.0 - RELEASE=1 - ARCH=x86_64 # - DOCKER_REPO=packpack/packpack diff --git a/appveyor.yml b/appveyor.yml index 0f9a24bb..8692d352 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,6 +1,6 @@ image: Visual Studio 2015 -version: 0.5.{build}.0 +version: 0.6.{build}.0 # Major_Version_Number.Minor_Version_Number.Build_Number.Revision_Number branches: @@ -61,8 +61,8 @@ after_build: - if "%PLATFORM%" EQU "X64" (xcopy "openssl-utils.git\win64\*.dll" "distrib\flameshot") - if "%PLATFORM%" EQU "x86" (xcopy "openssl-utils.git\win32\*.dll" "distrib\flameshot") - cd distrib - - 7z a flameshot_win_%PLATFORM%_portable_%flameshot_version%.zip flameshot - - curl --upload-file ./flameshot_win_%PLATFORM%_portable_%flameshot_version%.zip https://transfer.sh/flameshot_win_%PLATFORM%_portable_%flameshot_version%.zip + - 7z a flameshot_%flameshot_version%_win_%PLATFORM%.zip flameshot + - curl --upload-file ./flameshot_%flameshot_version%_win_%PLATFORM%.zip https://transfer.sh/flameshot_%flameshot_version%_win_%PLATFORM%.zip # artifacts: diff --git a/rpm/flameshot.spec b/rpm/flameshot.spec index bdaa3e2c..6c799e5d 100644 --- a/rpm/flameshot.spec +++ b/rpm/flameshot.spec @@ -1,5 +1,5 @@ Name: flameshot -Version: 0.5.0 +Version: 0.6.0 Release: 1%{?dist} Summary: Powerful yet simple to use screenshot software Summary(eu-ES): Potente pero simple de usar software de capturas @@ -57,17 +57,10 @@ make %{?_smp_mflags} %{_datadir}/icons/hicolor %changelog -* Tue Jan 09 2018 Zetao Yang - 0.5.0-1 -- Updated for flameshot 0.5.0 -- Catalan translation. -- Debian package configuration. -- Add --raw flag: prints the raw bytes of the png after the capture. -- Bash completion. -- Blur tool. -- Preview draw size on mouse pointer after tool selection. -- App Launcher tool: choose an app to open the capture. -- Travis integration -- Configuration import, export and reset. -- Experimental Wayland support (Plasma & Gnome) -* Tue Jan 09 2018 Zetao Yang - 0.5.0-1 -- Initial package +* Sat Aug 18 2018 Zetao Yang - 0.6.0-1 +- Updated for flameshot 0.6.0 +- - More details, please see https://flameshot.js.org/#/changelog?id=v060 +* Tue Jan 09 2018 Zetao Yang - 0.5.0-1 +- Initial package for flameshot 0.5.0 +- More details, please see https://flameshot.js.org/#/changelog?id=v051 + diff --git a/travis/linux_after_success.sh b/travis/linux_after_success.sh index 4a2e2711..2e33b091 100755 --- a/travis/linux_after_success.sh +++ b/travis/linux_after_success.sh @@ -7,21 +7,21 @@ DIST_PATH=dist if [[ "${DIST}" == "trusty" ]]; then travis_retry curl \ --upload-file \ - "${DIST_PATH}"/flameshot_${ARCH}_${VERSION}.${EXTEN} \ - "https://transfer.sh/flameshot_${ARCH}_${VERSION}.${EXTEN}" + "${DIST_PATH}"/flameshot_${VERSION}_${ARCH}.${EXTEN} \ + "https://transfer.sh/flameshot_${VERSION}_${ARCH}.${EXTEN}" else case "${OS}" in "ubuntu"|"debian") travis_retry curl \ --upload-file \ - "${DIST_PATH}"/flameshot_${VERSION}-${DIST}-${ARCH}_${ARCH}.${EXTEN} \ - "https://transfer.sh/flameshot_${VERSION}-${DIST}-${ARCH}_${ARCH}.${EXTEN}" + "${DIST_PATH}"/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN} \ + "https://transfer.sh/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN}" ;; "fedora") travis_retry curl \ --upload-file \ - "${DIST_PATH}"/flameshot_${VERSION}-fedora${DIST}-${ARCH}_${ARCH}.${EXTEN} \ - "https://transfer.sh/flameshot_${VERSION}-fedora${DIST}-${ARCH}_${ARCH}.${EXTEN}" + "${DIST_PATH}"/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN} \ + "https://transfer.sh/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN}" ;; esac fi diff --git a/travis/linux_script.sh b/travis/linux_script.sh index 40f9f7c6..aa0a1f5a 100755 --- a/travis/linux_script.sh +++ b/travis/linux_script.sh @@ -104,14 +104,14 @@ if [[ "${DIST}" == "trusty" ]]; then # Rename AppImage and move AppImage to DIST_PATH cd "${APPIMAGE_DST_PATH}" - mv Flameshot-${VERSION}-${ARCH}.AppImage flameshot_${ARCH}_${VERSION}.AppImage + mv Flameshot-${VERSION}-${ARCH}.AppImage flameshot_${VERSION}_${ARCH}.AppImage cd .. cp \ - "${APPIMAGE_DST_PATH}"/flameshot_${ARCH}_${VERSION}.AppImage \ - "${DIST_PATH}"/flameshot_${ARCH}_${VERSION}.${EXTEN} + "${APPIMAGE_DST_PATH}"/flameshot_${VERSION}_${ARCH}.AppImage \ + "${DIST_PATH}"/flameshot_${VERSION}_${ARCH}.${EXTEN} pwd else - travis_retry git clone https://github.com/packpack/packpack.git + travis_retry git clone https://github.com/flameshotapp/packpack.git travis_retry packpack/packpack pwd && ls @@ -120,12 +120,12 @@ else # copy deb to dist path for distribution cp \ build/flameshot_*_*.deb \ - "${DIST_PATH}"/flameshot_${VERSION}-${DIST}-${ARCH}_${ARCH}.${EXTEN} + "${DIST_PATH}"/flameshot_${VERSION}_${DIST}_${ARCH}.${EXTEN} ;; "fedora") cp \ build/flameshot-${VERSION}-${RELEASE}.*.${ARCH}.rpm \ - "${DIST_PATH}"/flameshot_${VERSION}-fedora${DIST}-${ARCH}_${ARCH}.${EXTEN} + "${DIST_PATH}"/flameshot_${VERSION}_fedora${DIST}_${ARCH}.${EXTEN} ;; esac fi