summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKalev Lember <klember@redhat.com>2020-02-04 15:37:46 +0100
committerKalev Lember <klember@redhat.com>2020-02-04 15:41:51 +0100
commitc9caff126dbe834464e71676aabc55870f72aff5 (patch)
treeed68224d4e985d15d898924e51e2c5c8276d1856
parentValidate appdata during the build (diff)
downloadlibrewolf-fedora-ff-c9caff126dbe834464e71676aabc55870f72aff5.tar.gz
librewolf-fedora-ff-c9caff126dbe834464e71676aabc55870f72aff5.tar.bz2
librewolf-fedora-ff-c9caff126dbe834464e71676aabc55870f72aff5.zip
Make sure the release tag in appdata is in sync with the package version
-rw-r--r--firefox.appdata.xml.in (renamed from firefox.appdata.xml)2
-rw-r--r--firefox.spec9
2 files changed, 7 insertions, 4 deletions
diff --git a/firefox.appdata.xml b/firefox.appdata.xml.in
index 4108449..4de0200 100644
--- a/firefox.appdata.xml
+++ b/firefox.appdata.xml.in
@@ -54,6 +54,6 @@
<screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png</screenshot>
</screenshots>
<releases>
- <release date="2019-11-13" version="3.34.0"/>
+ <release version="__VERSION__"/>
</releases>
</component>
diff --git a/firefox.spec b/firefox.spec
index a788d9a..f82103a 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -124,7 +124,7 @@ Source29: firefox-wayland.desktop
Source30: firefox-x11.sh.in
Source31: firefox-x11.desktop
Source32: node-stdout-nonblocking-wrapper
-Source33: firefox.appdata.xml
+Source33: firefox.appdata.xml.in
Source34: firefox-search-provider.ini
# Build patches
@@ -813,9 +813,11 @@ sed -i -e "s/\[Crash Reporter\]/[Crash Reporter]\nEnabled=1/" %{buildroot}/%{moz
%{__mkdir_p} %{buildroot}%{mozappdir}/distribution
%{__cp} %{SOURCE26} %{buildroot}%{mozappdir}/distribution
-# Install Gnome search provider files
+# Install appdata file
mkdir -p %{buildroot}%{_datadir}/metainfo
-%{__cp} %{SOURCE33} %{buildroot}%{_datadir}/metainfo
+%{__sed} -e 's/__VERSION__/%{version}/' %{SOURCE33} > %{buildroot}%{_datadir}/metainfo/firefox.appdata.xml
+
+# Install Gnome search provider files
mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers
%{__cp} %{SOURCE34} %{buildroot}%{_datadir}/gnome-shell/search-providers
@@ -941,6 +943,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 72.0.2-3
- Fix various issues with appdata, making the validation pass again
- Validate appdata during the build
+- Make sure the release tag in appdata is in sync with the package version
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 72.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
bgstack15