diff --git a/deja-dup-34.2-appdata.patch b/deja-dup-34.2-appdata.patch new file mode 100644 index 0000000..c784105 --- /dev/null +++ b/deja-dup-34.2-appdata.patch @@ -0,0 +1,85 @@ +diff -Nur deja-dup-34.2.orig/deja-dup/CMakeLists.txt deja-dup-34.2/deja-dup/CMakeLists.txt +--- deja-dup-34.2.orig/deja-dup/CMakeLists.txt 2015-11-21 20:42:58.000000000 -0700 ++++ deja-dup-34.2/deja-dup/CMakeLists.txt 2016-04-23 12:33:23.811552454 -0600 +@@ -39,10 +39,10 @@ + + deja_merge_po(desktop deja-dup.desktop "${CMAKE_INSTALL_FULL_DATADIR}/applications") + +-deja_merge_po(xml deja-dup.appdata.xml "${CMAKE_INSTALL_FULL_DATADIR}/appdata") ++deja_merge_po(xml deja-dup-preferences.appdata.xml "${CMAKE_INSTALL_FULL_DATADIR}/appdata") + find_program(APPSTREAM_UTIL appstream-util) + if(APPSTREAM_UTIL) +- add_test(validate-deja-dup.appdata.xml appstream-util --nonet validate-relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup.appdata.xml") ++ add_test(validate-deja-dup-preferences.appdata.xml appstream-util --nonet validate-relax "${CMAKE_CURRENT_BINARY_DIR}/deja-dup-preferences.appdata.xml") + endif() + + install(DIRECTORY ui DESTINATION "${PKG_DATADIR}") +diff -Nur deja-dup-34.2.orig/deja-dup/deja-dup.appdata.xml.in deja-dup-34.2/deja-dup/deja-dup.appdata.xml.in +--- deja-dup-34.2.orig/deja-dup/deja-dup.appdata.xml.in 2014-06-09 07:45:50.000000000 -0600 ++++ deja-dup-34.2/deja-dup/deja-dup.appdata.xml.in 1969-12-31 17:00:00.000000000 -0700 +@@ -1,24 +0,0 @@ +- +- +- +- deja-dup.desktop +- CC-BY-SA +- <_name>Déjà Dup Backup Tool +- <_summary>Keep your important documents safe from disaster +- +- <_p>Déjà Dup is a simple backup tool. It hides the complexity of backing up the Right Way (encrypted, off-site, and regular) and uses duplicity as the backend. +- +- +- https://launchpad.net/deja-dup +- deja-dup-list@gnome.org +- +- https://launchpad.net/deja-dup/@SERIES@/@VERSION@/+download/screenshot-1.png +- https://launchpad.net/deja-dup/@SERIES@/@VERSION@/+download/screenshot-2.png +- +- +diff -Nur deja-dup-34.2.orig/deja-dup/deja-dup-preferences.appdata.xml.in deja-dup-34.2/deja-dup/deja-dup-preferences.appdata.xml.in +--- deja-dup-34.2.orig/deja-dup/deja-dup-preferences.appdata.xml.in 1969-12-31 17:00:00.000000000 -0700 ++++ deja-dup-34.2/deja-dup/deja-dup-preferences.appdata.xml.in 2016-04-23 12:33:23.812552465 -0600 +@@ -0,0 +1,24 @@ ++ ++ ++ ++ deja-dup-preferences.desktop ++ CC-BY-SA ++ <_name>Déjà Dup Backup Tool ++ <_summary>Keep your important documents safe from disaster ++ ++ <_p>Déjà Dup is a simple backup tool. It hides the complexity of backing up the Right Way (encrypted, off-site, and regular) and uses duplicity as the backend. ++ ++ ++ https://launchpad.net/deja-dup ++ deja-dup-list@gnome.org ++ ++ https://launchpad.net/deja-dup/@SERIES@/@VERSION@/+download/screenshot-1.png ++ https://launchpad.net/deja-dup/@SERIES@/@VERSION@/+download/screenshot-2.png ++ ++ +diff -Nur deja-dup-34.2.orig/deja-dup/preferences/deja-dup-preferences.desktop.in deja-dup-34.2/deja-dup/preferences/deja-dup-preferences.desktop.in +--- deja-dup-34.2.orig/deja-dup/preferences/deja-dup-preferences.desktop.in 2016-02-17 10:24:15.000000000 -0700 ++++ deja-dup-34.2/deja-dup/preferences/deja-dup-preferences.desktop.in 2016-04-23 13:11:36.836138455 -0600 +@@ -19,9 +19,6 @@ + # These keywords are used when searching for applications in dashes, etc. + _Keywords=déjà;deja;dup; + +-X-AppInstall-Ignore=true +-X-AppStream-Ignore=true +- + Actions=BackUpNow; + + [Desktop Action BackUpNow] diff --git a/deja-dup.spec b/deja-dup.spec index 37a54df..0c07ea3 100644 --- a/deja-dup.spec +++ b/deja-dup.spec @@ -1,12 +1,13 @@ Name: deja-dup Version: 34.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Simple backup tool and frontend for duplicity Group: Applications/Archiving License: GPLv3+ URL: https://launchpad.net/deja-dup Source0: http://launchpad.net/%{name}/34/%{version}/+download/%{name}-%{version}.tar.xz +Patch0: deja-dup-34.2-appdata.patch BuildRequires: cmake BuildRequires: gettext desktop-file-utils intltool scrollkeeper BuildRequires: yelp-tools pango-devel cairo-devel vala-devel @@ -15,6 +16,7 @@ BuildRequires: libpeas-devel BuildRequires: nautilus-devel libsecret-devel BuildRequires: gtk3-devel itstool BuildRequires: PackageKit-glib-devel +BuildRequires: libappstream-glib Requires: duplicity >= 0.6.23 Requires: python-cloudfiles Requires: python-gobject-base @@ -59,6 +61,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/deja-dup.desktop desktop-file-validate %{buildroot}/%{_datadir}/applications/deja-dup-preferences.desktop desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/deja-dup-monitor.desktop +appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml + %find_lang %{name} --with-gnome %post @@ -91,7 +95,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/deja-dup/ %{_datadir}/applications/deja-dup.desktop %{_datadir}/deja-dup/ -%{_datadir}/appdata/deja-dup.appdata.xml +%{_datadir}/appdata/deja-dup-preferences.appdata.xml %{_datadir}/icons/hicolor/*/apps/deja-dup.png %{_datadir}/icons/hicolor/scalable/apps/deja-dup-symbolic.svg %{_datadir}/icons/hicolor/scalable/devices/deja-dup-cloud.svg @@ -100,6 +104,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libdir}/nautilus/extensions-3.0/libdeja-dup.so %changelog +* Sat Apr 23 2016 Kevin Fenzi - 34.2-2 +- Fix appstream data. Fixes bug #1237364 + * Mon Apr 11 2016 Jon Ciesla - 34.2-1 - Latest upstream, BZ 1325550