Hello community, here is the log from the commit of package xournal for openSUSE:Factory checked in at 2016-08-09 22:14:47 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-12 22:52:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xournal.new/xournal.changes 2016-08-09 22:14:49.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Aug 5 18:55:16 UTC 2016 - r...@fthiessen.de + +- Some cleanup on the spec-file. + +------------------------------------------------------------------- +Fri Aug 5 06:44:40 UTC 2016 - badshah...@gmail.com + +- Add xournal-appdata.patch to add, translate and install appdata + file for application, this makes xournal show up in appstores + like GNOME Software and KDE Discover; run intltoolize to + translate appdata file. + +------------------------------------------------------------------- New: ---- xournal-appdata.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xournal.spec ++++++ --- /var/tmp/diff_new_pack.C99xdb/_old 2016-08-09 22:14:50.000000000 +0200 +++ /var/tmp/diff_new_pack.C99xdb/_new 2016-08-09 22:14:50.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package xournal # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,31 +17,30 @@ Name: xournal -Url: http://math.mit.edu/~auroux/software/xournal/ Version: 0.4.8 Release: 0 Summary: An application for notetaking, sketching, and keeping a journal using a stylus License: GPL-2.0+ Group: Productivity/Office/Other +Url: http://math.mit.edu/~auroux/software/xournal/ Source: %{name}-%{version}.tar.gz Patch0: %{name}-implicit-funcs.patch -#reported already upstream -> is fixed in git +# PATCH-FIX-UPSTREAM xournal-german-translation.patch -- https://sourceforge.net/p/xournal/bugs/152/ -> is fixed in git Patch1: %{name}-german-translation.patch +# PATCH-FIX-UPSTREAM xournal-Improve-window-title.patch -- https://sourceforge.net/p/xournal/patches/79/ Patch2: %{name}-Improve-window-title.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build +# PATCH-FIX-UPSTREAM xournal-appdata.patch badshah...@gmail.com -- Add, translate and install appdata file +Patch3: xournal-appdata.patch BuildRequires: automake >= 1.11.2 BuildRequires: fdupes BuildRequires: gtk2-devel BuildRequires: hicolor-icon-theme BuildRequires: inkscape +BuildRequires: intltool BuildRequires: libgnomecanvas-devel -%if 0%{?suse_version} BuildRequires: libpoppler-glib-devel BuildRequires: update-desktop-files -%else -# E.g. Fedora etc. use other package name -BuildRequires: poppler-glib-devel -%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Xournal is an application for notetaking, sketching, keeping a journal @@ -51,18 +50,20 @@ Gournal. %prep -%setup +%setup -q %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -fi +intltoolize --force %configure -make %{_smp_mflags} +make %{?_smp_mflags} %install -make DESTDIR=%{buildroot} install +make %{?_smp_mflags} DESTDIR=%{buildroot} install make DESTDIR=%{buildroot} desktop-install # GENERATE AND INSTALL HIRES ICONS IN HICOLOR ICON DIR @@ -76,12 +77,12 @@ -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} install -D -m 0644 %{name}.xml %{buildroot}%{_datadir}/mime/application/x-xoj.xml +mkdir -p %{buildroot}%{_docdir}/%{name} +install -m 0644 -t %{buildroot}%{_docdir}/%{name} AUTHORS COPYING ChangeLog NEWS README %fdupes %{buildroot}%{_datadir} @@ -97,20 +98,20 @@ %files -f %{name}.lang %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc %{_docdir}/%{name} %{_bindir}/%{name} -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/%{name} +%{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/applications/%{name}.desktop -%{_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 +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/icons/hicolor/*/mimetypes/*xoj.* +%{_datadir}/mime/packages/xournal.xml +%{_datadir}/mime/application/x-xoj.xml %dir %{_datadir}/mimelnk %dir %{_datadir}/mimelnk/application -%{_datadir}/mimelnk/application/*.desktop +%{_datadir}/mimelnk/application/x-xoj.desktop +%if 0%{?suse_version} < 1320 +%dir %{_datadir}/appdata +%endif %changelog ++++++ xournal-appdata.patch ++++++ Index: xournal-0.4.8/xournal.appdata.xml.in =================================================================== --- /dev/null +++ xournal-0.4.8/xournal.appdata.xml.in @@ -0,0 +1,24 @@ +<?xml version='1.0' encoding='UTF-8'?> +<component> + <id type="desktop">xournal.desktop</id> + <metadata_license>CC0-1.0</metadata_license> + <_name>Xournal</_name> + <project_license>GPL-2.0+</project_license> + <_summary>Application for notetaking, sketching, and keeping a journal using a stylus</_summary> + <url type="homepage">http://xournal.sourceforge.net</url> + <description> + <_p>Xournal is an application for notetaking, sketching, keeping a journal +using a stylus. It is free software (GNU GPL) and runs on Linux (recent +distributions) and other GTK+/Gnome platforms. It is similar to +Microsoft Windows Journal or to other alternatives such as Jarnal and +Gournal.</_p> + </description> + <screenshots> + <screenshot type="default"> + <image height="351" width="640">https://a.fsdn.com/con/app/proj/xournal/screenshots/64904.jpg</image> + <caption>Xournal interface</caption> + </screenshot> + </screenshots> + <update_contact>xournal-de...@lists.sourceforge.net</update_contact> + <translation type="gettext">xournal</translation> +</component> Index: xournal-0.4.8/Makefile.am =================================================================== --- xournal-0.4.8.orig/Makefile.am +++ xournal-0.4.8/Makefile.am @@ -2,10 +2,16 @@ SUBDIRS = src po +appdatadir = $(datadir)/appdata +appdata_in_files = xournal.appdata.xml.in +appdata_DATA = $(appdata_in_files:.appdata.xml.in=.appdata.xml) +@INTLTOOL_XML_RULE@ + EXTRA_DIST = \ autogen.sh \ xournal.glade xournal.gladep \ - xournal.xml x-xoj.desktop xournal.desktop + xournal.xml x-xoj.desktop xournal.desktop \ + $(appdata_in_files) install-data-local: @$(NORMAL_INSTALL) Index: xournal-0.4.8/po/POTFILES.in =================================================================== --- xournal-0.4.8.orig/po/POTFILES.in +++ xournal-0.4.8/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. +xournal.appdata.xml.in src/main.c src/xo-interface.c src/xo-callbacks.c Index: xournal-0.4.8/configure.in =================================================================== --- xournal-0.4.8.orig/configure.in +++ xournal-0.4.8/configure.in @@ -4,6 +4,7 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(xournal, 0.4.8) AC_CONFIG_HEADERS(config.h) AM_MAINTAINER_MODE +IT_PROG_INTLTOOL([0.35.0]) AC_ISC_POSIX AC_PROG_CC
