Hello community, here is the log from the commit of package xournal for openSUSE:Factory checked in at 2015-07-12 22:52:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xournal (Old) and /work/SRC/openSUSE:Factory/.xournal.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xournal" Changes: -------- --- /work/SRC/openSUSE:Factory/xournal/xournal.changes 2015-04-25 11:25:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2015-07-12 22:52:12.000000000 +0200 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Mon Jul 6 01:42:22 UTC 2015 - [email protected] + +- Use upstream command to install desktop entries, mimetypes + and icons. +- Generate and install hires icons into hicolor directory (needed + on HiDPI displays). +- Use appropriate post-scripts to update desstop menu database, + mime cache and icon-theme. +- Drop external .desktop file and icon, and use upstream bundled + ones. + Old: ---- xournal.desktop xournal.png ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xournal.spec ++++++ --- /var/tmp/diff_new_pack.eFHqlF/_old 2015-07-12 22:52:13.000000000 +0200 +++ /var/tmp/diff_new_pack.eFHqlF/_new 2015-07-12 22:52:13.000000000 +0200 @@ -24,15 +24,16 @@ License: GPL-2.0+ Group: Productivity/Office/Other Source: %{name}-%{version}.tar.gz -Source1: %{name}.desktop -Source2: %{name}.png Patch0: %{name}-implicit-funcs.patch #reported already upstream -> is fixed in git Patch1: %{name}-german-translation.patch Patch2: %{name}-Improve-window-title.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: automake >= 1.11.2 +BuildRequires: fdupes BuildRequires: gtk2-devel +BuildRequires: hicolor-icon-theme +BuildRequires: inkscape BuildRequires: libgnomecanvas-devel %if 0%{?suse_version} BuildRequires: libpoppler-glib-devel @@ -62,15 +63,37 @@ %install make DESTDIR=%{buildroot} install -install -D -m 0644 %{SOURCE1} %{buildroot}/%{_datadir}/applications/%{name}.desktop -install -D -m 0644 %{SOURCE2} %{buildroot}/%{_datadir}/pixmaps/%{name}.png +make DESTDIR=%{buildroot} desktop-install + +# GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR +for i in 24 32 48 64 128 256 +do + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes + inkscape -w ${i} -C pixmaps/%{name}.svg \ + -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/%{name}.png + inkscape -w ${i} -C pixmaps/xoj.svg \ + -e %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/mimetypes/application-x-xoj.png +done + %if 0%{?suse_version} %suse_update_desktop_file %{name} %endif %find_lang %{name} -%clean -rm -rf %buildroot +install -D -m 0644 %{name}.xml %{buildroot}%{_datadir}/mime/application/x-xoj.xml + +%fdupes %{buildroot}%{_datadir} + +%post +%desktop_database_post +%icon_theme_cache_post +%mime_database_post + +%postun +%desktop_database_postun +%icon_theme_cache_postun +%mime_database_postun %files -f %{name}.lang %defattr(-, root, root) @@ -79,6 +102,15 @@ %dir %{_datadir}/%{name} %{_datadir}/%{name}/* %{_datadir}/applications/%{name}.desktop -%{_datadir}/pixmaps/%{name}.png +%{_datadir}/icons/hicolor/*/apps/%{name}.png +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/icons/hicolor/*/mimetypes/*.png +%{_datadir}/icons/hicolor/scalable/mimetypes/*.svg +%{_datadir}/icons/hicolor/scalable/mimetypes/xoj.svg +%{_datadir}/mime/packages/*.xml +%{_datadir}/mime/application/*.xml +%dir %{_datadir}/mimelnk +%dir %{_datadir}/mimelnk/application +%{_datadir}/mimelnk/application/*.desktop %changelog
