commit 889f220807b2589f9f584eb71e6a04fb05536e4d Author: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur(a)gmail.com&gt; Date: Mon Feb 28 12:03:54 2022 +0000 regenerated rpmfusion-nonfree-appstream-data.spec | 5 +++- update-appdata-rpmfusion-nonfree.sh | 50 +++++++++++++++++++++-------------- 2 files changed, 34 insertions(+), 21 deletions(-) --- diff --git a/rpmfusion-nonfree-appstream-data.spec b/rpmfusion-nonfree-appstream-data.spec index 2473a5b..8d59d75 100644 --- a/rpmfusion-nonfree-appstream-data.spec +++ b/rpmfusion-nonfree-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 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> - 35-2 +- regenerated + * Fri Nov 05 2021 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 35-1 - Regenerated 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)