From c92ebd1f3b287d18d2366e6ea08f957e1ace69a4 Mon Sep 17 00:00:00 2001 From: Alexander Wilms Date: Sun, 14 Jan 2024 04:05:51 +0000 Subject: [PATCH] Change AppStream metainfo file extension and path The legacy /usr/share/appdata/*.appdata.xml path has been superseded by /usr/share/metainfo/*.metainfo.xml https://freedesktop.org/software/appstream/docs/chap-Metadata.html#spec-component-location Signed-off-by: Alexander Wilms --- CMakeLists.txt | 4 ++-- {appdata => metainfo}/diveplanner.png | Bin {appdata => metainfo}/main.png | Bin .../subsurface.metainfo.xml.in | 4 ++-- packaging/OBS/subsurfacedaily.spec | 8 ++++---- packaging/copr/subsurface.spec | 4 ++-- ...ion-to-appdata.sh => add-version-to-metainfo.sh} | 2 +- scripts/build.sh | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) rename {appdata => metainfo}/diveplanner.png (100%) rename {appdata => metainfo}/main.png (100%) rename appdata/subsurface.appdata.xml.in => metainfo/subsurface.metainfo.xml.in (96%) rename scripts/{add-version-to-appdata.sh => add-version-to-metainfo.sh} (83%) diff --git a/CMakeLists.txt b/CMakeLists.txt index cac18e93e..7a7bdb3f0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -721,8 +721,8 @@ elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux") endif() install(FILES subsurface.debug DESTINATION bin) install(FILES subsurface.desktop DESTINATION share/applications) - install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/scripts/add-version-to-appdata.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})") - install(FILES appdata/subsurface.appdata.xml DESTINATION share/metainfo) + install(CODE "execute_process(COMMAND sh ${CMAKE_SOURCE_DIR}/scripts/add-version-to-metainfo.sh WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})") + install(FILES metainfo/subsurface.metainfo.xml DESTINATION share/metainfo) install(FILES icons/subsurface-icon.svg DESTINATION share/icons/hicolor/scalable/apps) install(DIRECTORY Documentation/images DESTINATION share/subsurface/Documentation) install(FILES ${DOCFILES} DESTINATION share/subsurface/Documentation) diff --git a/appdata/diveplanner.png b/metainfo/diveplanner.png similarity index 100% rename from appdata/diveplanner.png rename to metainfo/diveplanner.png diff --git a/appdata/main.png b/metainfo/main.png similarity index 100% rename from appdata/main.png rename to metainfo/main.png diff --git a/appdata/subsurface.appdata.xml.in b/metainfo/subsurface.metainfo.xml.in similarity index 96% rename from appdata/subsurface.appdata.xml.in rename to metainfo/subsurface.metainfo.xml.in index 6953d7ac5..1c3767f8f 100644 --- a/appdata/subsurface.appdata.xml.in +++ b/metainfo/subsurface.metainfo.xml.in @@ -21,10 +21,10 @@ - https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/main.png + https://raw.githubusercontent.com/Subsurface/subsurface/master/metainfo/main.png - https://raw.githubusercontent.com/Subsurface/subsurface/master/appdata/diveplanner.png + https://raw.githubusercontent.com/Subsurface/subsurface/master/metainfo/diveplanner.png https://subsurface-divelog.org diff --git a/packaging/OBS/subsurfacedaily.spec b/packaging/OBS/subsurfacedaily.spec index 8f3975658..5a861c85e 100644 --- a/packaging/OBS/subsurfacedaily.spec +++ b/packaging/OBS/subsurfacedaily.spec @@ -127,11 +127,11 @@ mkdir -p %{buildroot}/%{_libdir} (cd googlemaps/build ; make install_target INSTALL_ROOT=$RPM_BUILD_ROOT ) (cd subsurface-build ; make VERBOSE=1 install ) install subsurface.debug %{buildroot}%{_bindir} -install appdata/subsurface.appdata.xml %{buildroot}%{_datadir}/metainfo +install metainfo/subsurface.metainfo.xml %{buildroot}%{_datadir}/metainfo %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desktop -cat %{buildroot}%{_datadir}/metainfo/subsurface.appdata.xml -appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/subsurface.appdata.xml +cat %{buildroot}%{_datadir}/metainfo/subsurface.metainfo.xml +appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/subsurface.metainfo.xml %else %suse_update_desktop_file -r subsurface Utility DesktopUtility %endif @@ -152,7 +152,7 @@ appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/subsurfac %{_libdir}/qt5/plugins/geoservices/libqtgeoservices_googlemaps.so %{_datadir}/applications/subsurface.desktop %dir %{_datadir}/metainfo -%{_datadir}/metainfo/subsurface.appdata.xml +%{_datadir}/metainfo/subsurface.metainfo.xml %{_datadir}/icons/hicolor/*/apps/subsurface-icon.* %{_datadir}/subsurface/ diff --git a/packaging/copr/subsurface.spec b/packaging/copr/subsurface.spec index e86f3c326..3064e1071 100644 --- a/packaging/copr/subsurface.spec +++ b/packaging/copr/subsurface.spec @@ -96,7 +96,7 @@ mkdir -p %{buildroot}/%{_libdir} ( cd googlemaps/build ; make install_target INSTALL_ROOT=%{buildroot} ) %cmake_install install subsurface.debug %{buildroot}%{_bindir} -install appdata/subsurface.appdata.xml %{buildroot}%{_datadir}/metainfo +install metainfo/subsurface.metainfo.xml %{buildroot}%{_datadir}/metainfo desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desktop %fdupes %{buildroot} @@ -116,7 +116,7 @@ desktop-file-install --dir=%{buildroot}/%{_datadir}/applications subsurface.desk %{_libdir}/qt5/plugins/geoservices/libqtgeoservices_googlemaps.so %{_datadir}/applications/subsurface.desktop %dir %{_datadir}/metainfo -%{_datadir}/metainfo/subsurface.appdata.xml +%{_datadir}/metainfo/subsurface.metainfo.xml %{_datadir}/icons/hicolor/*/apps/subsurface-icon.* %{_datadir}/subsurface/ diff --git a/scripts/add-version-to-appdata.sh b/scripts/add-version-to-metainfo.sh similarity index 83% rename from scripts/add-version-to-appdata.sh rename to scripts/add-version-to-metainfo.sh index e4b03c73c..639068034 100755 --- a/scripts/add-version-to-appdata.sh +++ b/scripts/add-version-to-metainfo.sh @@ -10,4 +10,4 @@ DATE=$(git log -1 --format="%ct" | xargs -I{} date -d @{} +%Y-%m-%d) if [ "$DATE" = "" ] ; then DATE=$(cat "$SCRIPT_DIR"/../.gitdate) fi -sed -e "s|||" appdata/subsurface.appdata.xml.in > appdata/subsurface.appdata.xml +sed -e "s|||" metainfo/subsurface.metainfo.xml.in > metainfo/subsurface.metainfo.xml diff --git a/scripts/build.sh b/scripts/build.sh index 4ac362367..6a282bfad 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -661,7 +661,7 @@ for (( i=0 ; i < ${#BUILDS[@]} ; i++ )) ; do mkdir -p appdir/usr/share/metainfo mkdir -p appdir/usr/share/icons/hicolor/256x256/apps cp -r ./install-root/* ./appdir/usr - cp ${SRC_DIR}/appdata/subsurface.appdata.xml appdir/usr/share/metainfo/ + cp ${SRC_DIR}/metainfo/subsurface.metainfo.xml appdir/usr/share/metainfo/ cp ${SRC_DIR}/icons/subsurface-icon.png appdir/usr/share/icons/hicolor/256x256/apps/ fi fi