commit 9832f2e7c8f7dafeab208907cc3d4b342f6637ce Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com&gt; Date: Mon Feb 28 11:55:36 2022 +0000 feat: regenerate rpmfusion-nonfree-appstream-data.spec | 5 +++- sources | 4 +-- update-appdata-rpmfusion-nonfree.sh | 50 +++++++++++++++++++++-------------- 3 files changed, 36 insertions(+), 23 deletions(-) --- diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec index a95926d..a9d46f4 100644 --- a/rpmfusion-nonfree-appstream-data.spec +++ b/rpmfusion-nonfree-appstream-data.spec @@ -3,7 +3,7 @@ Name: %{reponame}-%{repoversion}-appstream-data Version: 36 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Appstream metadata for the RPM Fusion nonfree repository BuildArch: noarch @@ -39,6 +39,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> - 36-2 +- regenerate + * Fri Nov 05 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 36-1 - Regenerate for F36/rawhide diff --git a/sources b/sources index 0c70191..49360da 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (rpmfusion-nonfree-36-icons.tar.gz) = c727c55f4a793101e8ab3c162db7d08ddc8dc66cf2757b959171e75cc979d2c542bb2ee219017bd7d3fbe84cb4d805f719284830114e9f8cf51321093d3703f5 -SHA512 (rpmfusion-nonfree-36.xml.gz) = 675c3abfbfa7ef9dcd9cba3cff5faac79947fd55d691af10cad2f40b79dda5ae04b0cf15e04e4a2ac7df5e112fa0247685cbab790dc23a4cc602b7fb4ed0d5ac +SHA512 (rpmfusion-nonfree-36-icons.tar.gz) = 0a839a89fc7b0a78d71e457e2199046ab34f18dd358ca29b9a357b66c881b664ef57a5f5843637ef9c2dac06f999c63517946281598d9631a3836d210005020a +SHA512 (rpmfusion-nonfree-36.xml.gz) = 2cec47612c4bd3f9bd720b127ff32ad949a06e88c1cdb9132e93534ec7a599f5f532056d444c9fb58d35985460a70ddf247942133b11d78284447cb10ddb8270 diff --git a/update-appdata-rpmfusion-nonfree.sh b/update-appdata-rpmfusion-nonfree.sh index c2e912a..1b8bd9a 100755 --- a/update-appdata-rpmfusion-nonfree.sh +++ b/update-appdata-rpmfusion-nonfree.sh @@ -1,37 +1,46 @@ #!/bin/bash +RAWHIDE="37" RELEASE="" -URL="" -#URL1="" +URL_DEV="" +URL_RELEASE="" +TEMPDIR="rpmfusion-nonfree" main () { + rm -rf rpmfusion-nonfree mkdir rpmfusion-nonfree/ -pv cd rpmfusion-nonfree || exit -1 -# - if [ "$RELEASE" = "36" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/develo... - elif [ "$RELEASE" = "35" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/releas... - elif [ "$RELEASE" = "34" ]; then - URL="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/releas... - #URL1="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedora/updates/33/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/nonfree/fedora/de... + URL_RELEASE="rsync://download1.rpmfusion.org/rpmfusion/nonfree/fedor... + + 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 --delete "$URL" . -# rsync -avPh --delete --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/ \ + appstream-builder --verbose --include-failed --max-threads=6 --log-dir=./logs/ \ --packages-dir=./Packages/ --temp-dir=./tmp/ --output-dir=./appstream-data/ \ --basename="rpmfusion-nonfree-$RELEASE" --origin="rpmfusion-nonfree-$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-nonfree-${RELEASE}-icons.tar.gz ${TEMPDIR}/appstream-data/rpmfusion-nonfree-${RELEASE}.xml.gz" + } usage () @@ -39,7 +48,7 @@ usage () echo "$0 -r <release>" echo "- update appdata for rpmfusion nonfree repository" echo "options:" - echo "-r <release> one of 34, 35 and 36" + echo "-r <release> one of [$RAWHIDE, $((RAWHIDE -3))]" } @@ -54,6 +63,7 @@ do case $OPTION in r) RELEASE=$OPTARG + main ;; h)