Hello community,
here is the log from the commit of package texmaker for openSUSE:Factory
checked in at 2016-08-03 11:43:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texmaker (Old)
and /work/SRC/openSUSE:Factory/.texmaker.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texmaker"
Changes:
--------
--- /work/SRC/openSUSE:Factory/texmaker/texmaker.changes 2015-11-08
11:27:00.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.texmaker.new/texmaker.changes 2016-08-03
11:43:22.000000000 +0200
@@ -1,0 +2,17 @@
+Tue Jul 26 02:50:25 UTC 2016 - badshah...@gmail.com
+
+- Add texmaker-appdata.patch to install an appstream metadata
+ file.
+- Remove references to %{buildroot} during the %build stage,
+ this is no loger required.
+- Pass METAINFODIR=%{_datadir}/appdata to install the metainfo
+ to openSUSE's currently preferred metainfo dir; the default
+ upstream specification for appdata recommends
+ /usr/share/metainfo instead, and is also the default metainfo
+ path set in texmaker-appdata.patch.
+- Run fdupes only inside the %{_datadir}/texmaker dir to prevent
+ /usr/share/pixmaps/texmaker.png from becoming a link; if this
+ happens, appstream generator fails to extract the icon and
+ promptly fails to generate the appdata.
+
+-------------------------------------------------------------------
New:
----
texmaker-appdata.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texmaker.spec ++++++
--- /var/tmp/diff_new_pack.pQrcT1/_old 2016-08-03 11:43:23.000000000 +0200
+++ /var/tmp/diff_new_pack.pQrcT1/_new 2016-08-03 11:43:23.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package texmaker
#
-# 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
@@ -26,6 +26,8 @@
Source: http://www.xm1math.net/texmaker/texmaker-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM texmaker-correct-doc-location.patch badshah...@gmail.com
-- Handle doc files in the spec file rather than placing them in %%{_datadir}
during compilation
Patch1: texmaker-correct-doc-location.patch
+# PATCH-FIX-UPSTREAM texmaker-appdata.patch badshah...@gmail.com -- Install
appstream metainfo file; patch sent upstream
+Patch2: texmaker-appdata.patch
BuildRequires: fdupes
BuildRequires: update-desktop-files
%if 0%{?suse_version} == 1315
@@ -58,6 +60,7 @@
%prep
%setup -q
%patch1 -p1
+%patch2 -p1
%build
%if 0%{?suse_version} == 1315
@@ -70,17 +73,20 @@
LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH
export QTDIR PATH LD_LIBRARY_PATH DYLD_LIBRARY_PATH
-PREFIX=%{buildroot}%{_prefix}
+PREFIX=%{_prefix}
+
%if 0%{?suse_version} == 1315
-qmake QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" -unix texmaker.pro
+qmake QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" \
+ METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro
%else
-qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" -unix texmaker.pro
+qmake-qt5 QMAKE_CXXFLAGS="%optflags -fvisibility=hidden
-fvisibility-inlines-hidden" \
+ METAINFODIR="%{_datadir}/appdata" -unix texmaker.pro
%endif
-make %{?_smp_mflags} INSTALL_ROOT=%{buildroot}
+make %{?_smp_mflags}
%install
make INSTALL_ROOT=%{buildroot} install
-%fdupes %{buildroot}%{_datadir}/
+%fdupes %{buildroot}%{_datadir}/%{name}/
%files
%defattr(-,root,root,-)
@@ -89,5 +95,7 @@
%{_datadir}/applications/texmaker.desktop
%{_datadir}/pixmaps/texmaker.png
%{_datadir}/texmaker/
+%dir %{_datadir}/appdata
+%{_datadir}/appdata/%{name}.appdata.xml
%changelog
++++++ texmaker-appdata.patch ++++++
Index: texmaker-4.5/utilities/texmaker.appdata.xml
===================================================================
--- /dev/null
+++ texmaker-4.5/utilities/texmaker.appdata.xml
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<component>
+ <id type="desktop">texmaker.desktop</id>
+ <metadata_license>CC0-1.0</metadata_license>
+ <name>Texmaker LaTeX Editor</name>
+ <project_license>GPL-2.0 and BSD-3-Clause</project_license>
+ <summary>Free cross-platform LaTeX editor</summary>
+ <url type="homepage">http://www.xm1math.net/texmaker/</url>
+ <description>
+ <p>Texmaker is a free LaTeX editor, that integrates many tools
+needed to develop documents with LaTeX, in just one application.
+Texmaker runs on unix, macosx and windows systems and is released
+under the GPL license .</p>
+ </description>
+ <screenshots>
+ <screenshot type="default">
+ <image height="900"
width="1600">http://www.xm1math.net/texmaker/texmakertop_big.png</image>
+ <caption>Source editor and PDF preview side by side</caption>
+ </screenshot>
+ <screenshot>
+ <image height="900"
width="1600">http://www.xm1math.net/texmaker/sidebyside_big.png</image>
+ <caption>Two documents side by side</caption>
+ </screenshot>
+ </screenshots>
+ <update_contact>pbrac...@xm1math.net</update_contact>
+</component>
Index: texmaker-4.5/texmaker.pro
===================================================================
--- texmaker-4.5.orig/texmaker.pro
+++ texmaker-4.5/texmaker.pro
@@ -323,6 +323,9 @@ isEmpty( DESKTOPDIR ) {
isEmpty( ICONDIR ) {
ICONDIR=/usr/share/pixmaps
}
+isEmpty( METAINFODIR ) {
+ METAINFODIR=/usr/share/metainfo
+}
DEFINES += PREFIX=\\\"$${PREFIX}\\\"
@@ -333,6 +336,7 @@ target.path = $${PREFIX}/bin
utilities.path = $${PREFIX}/share/texmaker
desktop.path = $${DESKTOPDIR}
icon.path = $${ICONDIR}
+metainfo.path = $${METAINFODIR}
INSTALLS = target
HEADERS += x11fontdialog.h
@@ -477,4 +481,7 @@ INSTALLS += desktop
icon.files = utilities/texmaker.png
INSTALLS += icon
+
+metainfo.files = utilities/texmaker.appdata.xml
+INSTALLS += metainfo
}
