From 2889cc154f5ffdcfe7e562b1851a91c0c9db8cf9 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 7 Dec 2015 14:04:34 +0100 Subject: [PATCH] fix appstream metadata --- ...ream-files-to-most-recent-version-of.patch | 138 ++++++++++++++++++ libreoffice.spec | 1 + 2 files changed, 139 insertions(+) create mode 100644 0001-update-the-appstream-files-to-most-recent-version-of.patch diff --git a/0001-update-the-appstream-files-to-most-recent-version-of.patch b/0001-update-the-appstream-files-to-most-recent-version-of.patch new file mode 100644 index 0000000..18592fb --- /dev/null +++ b/0001-update-the-appstream-files-to-most-recent-version-of.patch @@ -0,0 +1,138 @@ +From 2b5d5ab9aeeff082025d25b2bfe897e2aeee4c99 Mon Sep 17 00:00:00 2001 +From: David Tardon +Date: Mon, 7 Dec 2015 12:55:11 +0100 +Subject: [PATCH] update the appstream files to most recent version of the spec + +Change-Id: I6b23be2af3ab28431266075da389b62372508961 +(cherry picked from commit 8d7d3469da772d6ffcc0ed4fc69ea28e1813b407) +--- + sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml | 4 ++-- + sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml | 4 ++-- + sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml | 4 ++-- + sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 4 ++-- + sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 4 ++-- + 5 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml +index 6338a37..2ca8a8f 100644 +--- a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml ++++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml +@@ -1,9 +1,10 @@ + + + libreoffice-base.desktop ++CC0-1.0 + MPL-2.0 + LibreOffice Base +-database manaager part of the LibreOffice productivity suite ++Database manaager part of the LibreOffice productivity suite + +

+ Base is a powerful database manager, part of the LibreOffice productivity suite. +@@ -29,7 +30,6 @@ to connect to virtually any other existing database engine as well. + http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-78.png + http://www.libreoffice.org/assets/Uploads/Screenshots/Base/Screenshot-80.png + +-The Document Foundation + The Document Foundation + libreoffice_at_lists.freedesktop.org + +diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml +index b8beb71..836f100 100644 +--- a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml ++++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml +@@ -1,9 +1,10 @@ + + + libreoffice-calc.desktop ++CC0-1.0 + MPL-2.0 + LibreOffice Calc +-

spreadsheet program of the LibreOffice productivity suite ++Spreadsheet program of the LibreOffice productivity suite + +

+ Calc is a powerful and extensible spreadsheet program, part of the LibreOffice +@@ -22,7 +23,6 @@ worrying about compatibility. + + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Calc-02-exemple-ods.png + +-The Document Foundation + The Document Foundation + libreoffice_at_lists.freedesktop.org + +diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml +index 2868598..4888653 100644 +--- a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml ++++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml +@@ -1,9 +1,10 @@ + + + libreoffice-draw.desktop ++CC0-1.0 + MPL-2.0 + LibreOffice Draw +-

graphics editor part of the LibreOffice productivity suite ++Graphics editor part of the LibreOffice productivity suite + +

+ LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create +@@ -28,7 +29,6 @@ worrying about compatibility. + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-02-Tiger-fdo82219.png + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Draw-03-Square-fdo75097.png + +-The Document Foundation + The Document Foundation + libreoffice_at_lists.freedesktop.org + +diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml +index ccb0e92..6174a0865 100644 +--- a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml ++++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml +@@ -1,9 +1,10 @@ + + + libreoffice-impress.desktop ++CC0-1.0 + MPL-2.0 + LibreOffice Impress +-

presentation program of the LibreOffice productivity suite ++Presentation program of the LibreOffice productivity suite + +

+ Impress is a presentation program and part of the LibreOffice productivity suite. +@@ -23,7 +24,6 @@ worrying about compatibility. + + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Impress-01-Blank.png + +-The Document Foundation + The Document Foundation + libreoffice_at_lists.freedesktop.org + +diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml +index fbd09a7..7e4b07f 100644 +--- a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml ++++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml +@@ -1,9 +1,10 @@ + + + libreoffice-writer.desktop ++CC0-1.0 + MPL-2.0 + LibreOffice Writer +-

word processor part of the LibreOffice productivity suite ++Word processor part of the LibreOffice productivity suite + +

+ Writer is the word processor inside LibreOffice productivity suite. +@@ -30,7 +31,6 @@ worrying about compatibility. + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-02-Table-of-Contents-Getting-Started-Guide-4-2.png + http://www.libreoffice.org/assets/Uploads/Discover/Screenshots/_resampled/ResizedImage400300-Writer-03-Technical-Doc-fdo83524.png + +-The Document Foundation + The Document Foundation + libreoffice_at_lists.freedesktop.org + +-- +2.5.0 + diff --git a/libreoffice.spec b/libreoffice.spec index 0e0d01b..3c122fe 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -323,6 +323,7 @@ Patch16: 0001-disable-PSD-import-test-which-deadlocks-on-ARM.patch Patch17: 0001-Resolves-rhbz-1285380-get-menus-working-under-waylan.patch Patch18: 0001-gtk3-wayland-wrong-dialog-sizes.patch Patch19: 0001-fix-powerpc-build.patch +Patch20: 0001-update-the-appstream-files-to-most-recent-version-of.patch %define instdir %{_libdir} %define baseinstdir %{instdir}/libreoffice