Hello community, here is the log from the commit of package calibre for openSUSE:Factory checked in at 2016-07-20 09:19:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/calibre (Old) and /work/SRC/openSUSE:Factory/.calibre.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "calibre" Changes: -------- --- /work/SRC/openSUSE:Factory/calibre/calibre.changes 2016-07-14 09:49:25.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.calibre.new/calibre.changes 2016-07-20 09:19:30.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Jul 15 20:02:55 UTC 2016 - [email protected] + +- Make calibre show up in Software Centres: + + Appdata file references calibre-gui.desktop; besides + .appdata.xml filename should necessarily match that of + .desktop file for the app to show up in Software Centres. + Rename .desktop file to achieve this. + + Remove all appdata.xml files but the main one, we do not + install the corresponding .desktop files, so these are vetoed + by appstream-builder anyway. + + Own appdata dir (/use/share/appdata) to prevent build failures + on openSUSE <= 13.2. +- Add calibre-appdata-add-name-summary.patch to add summary and + name fields to the appdata, calibre does not show up in software + centres otherwise. + +------------------------------------------------------------------- New: ---- calibre-appdata-add-name-summary.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ calibre.spec ++++++ --- /var/tmp/diff_new_pack.6xZPfD/_old 2016-07-20 09:19:32.000000000 +0200 +++ /var/tmp/diff_new_pack.6xZPfD/_new 2016-07-20 09:19:32.000000000 +0200 @@ -30,6 +30,8 @@ Patch3: calibre-no-update.diff # PATCH-FIX-TO-UPSTREAM: use reproducible list order Patch4: reproducible.patch +# PATCH-FIX-UPSTREAM calibre-appdata-add-name-summary.patch [email protected] -- Add summary and name fields to appdata +Patch5: calibre-appdata-add-name-summary.patch BuildRequires: fdupes BuildRequires: help2man BuildRequires: hicolor-icon-theme @@ -131,6 +133,7 @@ %patch2 -p1 %patch3 -p1 -b .no-update %patch4 -p1 +%patch5 -p1 # dos2unix newline conversion sed -i 's/\r//' src/calibre/web/feeds/recipes/* @@ -200,6 +203,12 @@ # add shebangs sed -i -e '1i#!/usr/bin/python' %{buildroot}%{_libdir}/%{name}/chardet/*.py +# appdata file references calibre-gui.desktop, and .appdata.xml file should necessarily have matching name with .desktop file in order for the app to show up in Software Centres +mv %{buildroot}%{_datadir}/applications/calibre.desktop %{buildroot}%{_datadir}/applications/calibre-gui.desktop + +# Remove all appdata.xml files but the main one, we do not install the corresponding .desktop files +rm %{buildroot}%{_datadir}/appdata/calibre-ebook-{edit,viewer}.appdata.xml + %post %desktop_database_post %icon_theme_cache_post @@ -213,13 +222,14 @@ %defattr(-,root,root) %{_bindir}/* %exclude %{_bindir}/calibre-uninstall -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/%{name}-gui.desktop %dir %{_datadir}/icons/hicolor/512x512 %dir %{_datadir}/icons/hicolor/512x512/apps %{_datadir}/icons/hicolor/*/apps/*.png %{_datadir}/%{name}/ %{_libdir}/%{name}/ -%{_datadir}/appdata/ +%dir %{_datadir}/appdata +%{_datadir}/appdata/%{name}-gui.appdata.xml %{_datadir}/bash-completion/completions/%{name} /usr/lib/python2.7/site-packages/init_calibre.py ++++++ calibre-appdata-add-name-summary.patch ++++++ Index: calibre-2.62.0/src/calibre/linux.py =================================================================== --- calibre-2.62.0.orig/src/calibre/linux.py +++ calibre-2.62.0/src/calibre/linux.py @@ -1074,6 +1074,8 @@ def write_appdata(key, entry, base, tran root = E.application( E.id(key + '.desktop', type='desktop'), E.licence('CC0'), + E.name('Calibre Ebook Reader'), + E.summary('The one stop solution to all your e-book needs'), E.description(), E.url('https://calibre-ebook.com', type='homepage'), E.screenshots(),
