[rpmfusion-free-appstream-data/f35] regenerate

commit 27841143a6be55c2babea6b467eb559faf9a168a Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com&gt; Date: Mon Feb 28 11:56:37 2022 +0000 regenerate rpmfusion-free-appstream-data.spec | 5 +++- sources | 2 +- update-appdata-rpmfusion-free.sh | 48 +++++++++++++++++++++----------------- 3 files changed, 32 insertions(+), 23 deletions(-) --- diff --git a/rpmfusion-free-appstream-data.spec b/rpmfusion-free-appstream-data.spec index c353c8c..4ffd4fd 100644 --- a/rpmfusion-free-appstream-data.spec +++ b/rpmfusion-free-appstream-data.spec @@ -3,7 +3,7 @@ Name: %{reponame}-%{repoversion}-appstream-data Version: 35 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Appstream metadata for the RPM Fusion free repository BuildArch: noarch @@ -40,6 +40,9 @@ DESTDIR=%{buildroot} appstream-util install %{SOURCE0} %{SOURCE1} %dir %{_datadir}/app-info/xmls %changelog +* Mon Feb 28 2022 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 35-2 +- regenerate + * Wed Nov 03 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 35-1 - Regenerate diff --git a/sources b/sources index 9955262..a377e10 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rpmfusion-free-35-icons.tar.gz) = 6161055c61f8aa6ddb8552c196c20175c06064f1db640ec0fb80ab8f630e687b8bb8d6d754b7693daae5e169a7f3655ccd20bf7191e41af73009680bfe0c11c3 +SHA512 (rpmfusion-free-35-icons.tar.gz) = 8dd19ffbcd9494e97ec70aa6252d6f00421a25a098e6f15c82d59732128df42199b5f233df441bec7c154a1fde8e3b4ad5bd0b222c0825cb76cd1ef5f9ea4d0b SHA512 (rpmfusion-free-35.xml.gz) = eaefada197f714b54de9552c340e891d005bc1e9ab828bdc425590289a4cbe31c68ae5eb5fd8e3f46e745247bf630b4645aad9f797b94f537af941585745f8ac diff --git a/update-appdata-rpmfusion-free.sh b/update-appdata-rpmfusion-free.sh index 9583870..5385e5b 100755 --- a/update-appdata-rpmfusion-free.sh +++ b/update-appdata-rpmfusion-free.sh @@ -1,41 +1,46 @@ #!/bin/bash +RAWHIDE="37" RELEASE="" -URL="" -#URL1="" +URL_DEV="" +URL_RELEASE="" +TEMPDIR="rpmfusion-free" main () { + rm -rf rpmfusion-free mkdir rpmfusion-free/ -pv cd rpmfusion-free || exit -1 - if [ "$RELEASE" = "36" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/developme... - elif [ "$RELEASE" = "35" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/releases/... - elif [ "$RELEASE" = "34" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/releases/... - #URL1="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/updates/32/x86_64/*" - elif [ "$RELEASE" = "33" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/releases/... - #URL1="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/updates/31/x86_64/*" + if [ $RELEASE -le $RAWHIDE ] && [ $RELEASE -ge $((RAWHIDE - 3)) ]; then + if [ "$RELEASE" = "$RAWHIDE" ]; then + RELEASE="rawhide" + fi + URL_DEV="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/devel... + URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/free/fedora/r... + + echo "Regenerating for $RELEASE" + rsync -avPh "$URL_RELEASE" . || rsync -avPh "$URL_DEV" . + else + echo "Please check if ${RELEASE} is currently supported. Rawhide is at ${RAWHIDE}." + exit -1 fi - rsync -avPh "$URL" . -# rsync -avPh --exclude debug "$URL1" ./Packages/ + if ! command -v appstream-builder > /dev/null + then + echo "appstream-builder not installed. Installing now." + sudo dnf install /usr/bin/appstream-builder -y + fi - rm -rf repo* -# rm -rf Packages/repo* -# createrepo -d Packages/ -# repomanage -o --space ./Packages/ | xargs rm -# rm -rf Packages/repo* -# appstream-builder --verbose --include-failed --max-threads=6 --log-dir=./logs/ \ --packages-dir=./Packages/ --temp-dir=./tmp/ --output-dir=./appstream-data/ \ --basename="rpmfusion-free-$RELEASE" --origin="rpmfusion-free-$RELEASE" \ --enable-hidpi --veto-ignore=missing-parents echo "Generated files are present in the appstream-data directory" + echo "To import new sources, run:" + echo "rfpkg new-sources ${TEMPDIR}/appstream-data/rpmfusion-free-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-free-${RELEASE}.xml.gz" + } usage () @@ -43,7 +48,7 @@ usage () echo "$0 -r <release>" echo "- update appdata for rpmfusion free repository" echo "options:" - echo "-r <release> one of 33, 34, 35 and 36" + echo "-r <release> one of [$RAWHIDE, $((RAWHIDE -3))]" } @@ -58,6 +63,7 @@ do case $OPTION in r) RELEASE=$OPTARG + main ;; h)