sysui/CustomTarget_share.mk | 1
sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml | 30 +++++++++
sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml | 24 +++++++
sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml | 29 +++++++++
sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml | 25 ++++++++
sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml | 31 ++++++++++
sysui/desktop/freedesktop/freedesktop-menus.spec | 7 --
sysui/desktop/share/create_tree.sh | 5 +
8 files changed, 147 insertions(+), 5 deletions(-)
New commits:
commit 1724f55432848b4177758389d2a9fc38b767ae31
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 14:27:51 2013 +0200
sysui: remove cruft from freedesktop-menus.spec
Change-Id: I0e4dc2145fe4ddcb7b3e4d4d0233987a8b70dd34
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 0217259..840e1f8 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -40,8 +40,7 @@ AutoReqProv: no
%description
%productname desktop integration for desktop-environments that implement
the menu- and mime-related specifications from http://www.freedesktop.org
-Install this package if you're using a distribution not covered by any of
-the other %pkgprefix-<distribution>-menus packages.
+These specifications are implemented by all current distributions.
%install
rm -rf $RPM_BUILD_ROOT
@@ -53,9 +52,6 @@ export NO_BRP_STALE_LINK_ERROR=yes
mkdir -p $RPM_BUILD_ROOT
-# FIXME: remove - only purpose is to create packages identical to OOF680 m8
-umask 0000
-
# set parameters for the create_tree script
export DESTDIR=$RPM_BUILD_ROOT
export KDEMAINDIR=/usr
commit 9663478df85655a3581bc97193a0ef92df1eae20
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Oct 1 14:26:03 2013 +0200
fdo#69210: sysui: add AppData to system-integration RPM/DEB
Change-Id: Ifabf7965c922d7f719201cea39827acbccb57937
diff --git a/sysui/CustomTarget_share.mk b/sysui/CustomTarget_share.mk
index 2783995..d191d8d 100644
--- a/sysui/CustomTarget_share.mk
+++ b/sysui/CustomTarget_share.mk
@@ -181,6 +181,7 @@ $(share_WORKDIR)/%/create_tree.sh: $(share_SRCDIR)/share/create_tree.sh $(share_
echo "PREFIX=$(UNIXFILENAME.$*)" >> $@
echo "ICON_PREFIX=$(UNIXFILENAME.$*)" >> $@
echo "ICON_SOURCE_DIR=$(SRCDIR)/sysui/desktop/icons" >> $@
+ echo "APPDATA_SOURCE_DIR=$(SRCDIR)/sysui/desktop/appstream-appdata" >> $@
echo "PRODUCTVERSION=$(PRODUCTVERSION)" >> $@
cat $< >> $@
chmod 774 $@
diff --git a/sysui/desktop/freedesktop/freedesktop-menus.spec b/sysui/desktop/freedesktop/freedesktop-menus.spec
index 5a1042b..0217259 100755
--- a/sysui/desktop/freedesktop/freedesktop-menus.spec
+++ b/sysui/desktop/freedesktop/freedesktop-menus.spec
@@ -413,3 +413,4 @@ done
/usr/share/icons/locolor/*/apps/*png
/usr/share/icons/locolor/*/mimetypes/*png
/usr/share/mime/packages/*
+/usr/share/appdata/*
diff --git a/sysui/desktop/share/create_tree.sh b/sysui/desktop/share/create_tree.sh
index 606f1a5..0843f2e 100755
--- a/sysui/desktop/share/create_tree.sh
+++ b/sysui/desktop/share/create_tree.sh
@@ -86,3 +86,8 @@ for i in `cat launcherlist`; do
ln -sf "${office_root}/share/xdg/${i}" "${DESTDIR}/usr/share/applications/${PREFIX}-${i}"
done
+mkdir -p "${DESTDIR}/usr/share/appdata"
+for i in base calc draw impress writer; do
+ cp "${APPDATA_SOURCE_DIR}/libreoffice-${i}.appdata.xml" "${DESTDIR}/usr/share/appdata/${PREFIX}-${i}.appdata.xml"
+done
+
commit ceb9e098fc6efcfb7e024057bfa46aa06a295d00
Author: Richard Hughes <richard at hughsie.com>
Date: Tue Oct 1 13:03:19 2013 +0200
fdo#69210: sysui: add some AppStream AppData files
Change-Id: I5c4af1c36290f0e1b3815058bd68b952f6005f4a
diff --git a/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
new file mode 100644
index 0000000..e40b769
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-base.appdata.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">libreoffice-base.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+Base is a powerful database manager, part of the LibreOffice productivity suite.
+It allows you to store, manage and maintain different collections of data.
+Base makes it easy to keep track of your finances, customers, invoices, or even
+just the contacts in your address book!
+</p>
+<p>
+For users that are new to databases, Base offeres helpful wizards to create tables,
+queries, forms and reports.
+It's a solution for people requiring an easy-to-understand, simple-to-use system.
+</p>
+<p>
+For power users and enterprise requirements, it provides native-support drivers
+for some of the most-widely employed multi-user database engines:
+MySQL, Adabas D, MS Access and PostgreSQL.
+In addition, the built-in support for JDBC- and ODBC-standard drivers allows you
+to connect to virtually any other existing database engine as well.
+</p>
+</description>
+<url type="homepage">http://www.libreoffice.org/features/base/</url>
+<screenshots>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Base/Screenshot-87.png</screenshot>
+</screenshots>
+<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
+</application>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
new file mode 100644
index 0000000..7652fa4
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-calc.appdata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">libreoffice-calc.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+Calc is a powerful and extensible spreadsheet program, part of the LibreOffice
+productivity suite.
+Newcomers find it intuitive and easy to learn.
+Professional data miners and number crunchers will appreciate the comprehensive
+range of advanced functions.
+</p>
+<p>
+LibreOffice supports opening and saving into a wide variety of formats, so you
+can easily share spreadsheets with users of other popular office suites without
+worrying about compatibility.
+</p>
+</description>
+<url type="homepage">http://www.libreoffice.org/features/calc/</url>
+<screenshots>
+<screenshot type="default">http://en.wikipedia.org/wiki/File:LibreOffice_Calc_4.0.1_screenshot.png </screenshot>
+</screenshots>
+<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
+</application>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
new file mode 100644
index 0000000..0bb1fb7
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-draw.appdata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">libreoffice-draw.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+LibreOffice Draw is an easy-to-use graphics editor, which empowers you to create
+anything from quick sketches to complex diagrams.
+It provides a powerful set of tools and shapes for producing technical drawings,
+charts, and much else.
+</p>
+<p>
+Draw allows you to create, manipulate and arrange different objects - it offers
+a number of tools for editing, resizing, rotating, grouping and styling them!
+It also provides smart connectors that make it easy for you to build charts and
+diagrams, and make beautiful drawings composed of different objects.
+</p>
+<p>
+LibreOffice supports opening and saving into a wide variety of formats, so you
+can easily share drawings with users of other popular office suites without
+worrying about compatibility.
+</p>
+</description>
+<url type="homepage">http://www.libreoffice.org/features/draw/</url>
+<screenshots>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Draw/Screenshot-68.png</screenshot>
+</screenshots>
+<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
+</application>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
new file mode 100644
index 0000000..04f8ffb
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-impress.appdata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">libreoffice-impress.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+Impress is a presentation program and part of the LibreOffice productivity suite.
+Impress is the fastest and easiest way to create effective multimedia presentations.
+Stunning animation and sensational special effects help you convince your audience.
+Create presentations that look even more professional than the standard
+presentations you commonly see at work. Get your colleagues’ and bosses’ attention
+by creating something a little bit different.
+</p>
+<p>
+LibreOffice supports opening and saving into a wide variety of formats, so you
+can easily share presentations with users of other popular office suites without
+worrying about compatibility.
+</p>
+</description>
+<url type="homepage">http://www.libreoffice.org/features/impress/</url>
+<screenshots>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Impress/Screenshot-46.png</screenshot>
+</screenshots>
+<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
+</application>
diff --git a/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
new file mode 100644
index 0000000..d96c5af
--- /dev/null
+++ b/sysui/desktop/appstream-appdata/libreoffice-writer.appdata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<application>
+<id type="desktop">libreoffice-writer.desktop</id>
+<licence>CC0</licence>
+<description>
+<p>
+Writer is the word processor inside LibreOffice productivity suite.
+Use it for everything, from dashing off a quick letter to producing an entire
+book with tables of contents, embedded illustrations, bibliographies and diagrams.
+The while-you-type auto-completion, auto-formatting and automatic spell-checking
+make difficult tasks easy (but are easy to disable if you prefer).
+Writer is powerful enough to tackle desktop publishing tasks such as creating
+multi-column newsletters and brochures. The only limit is your imagination.
+</p>
+<p>
+Based on the what-you-see-is-what-you-get principle, Writer allows you to apply
+various styles and formatting effects to your document and view the results
+immediately.
+</p>
+<p>
+LibreOffice supports opening and saving into a wide variety of formats, so you
+can easily share documents with users of other popular office suites without
+worrying about compatibility.
+</p>
+</description>
+<url type="homepage">http://www.libreoffice.org/features/writer/</url>
+<screenshots>
+<screenshot type="default">http://www.libreoffice.org/assets/Uploads/EN-Project_images/800x600/Writer/Screenshot-99.png</screenshot>
+</screenshots>
+<updatecontact>libreoffice_at_lists.freedesktop.org</updatecontact>
+</application>