Hello community,

here is the log from the commit of package jaxodraw for openSUSE:Factory 
checked in at 2019-09-11 10:41:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/jaxodraw (Old)
 and      /work/SRC/openSUSE:Factory/.jaxodraw.new.7948 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "jaxodraw"

Wed Sep 11 10:41:26 2019 rev:5 rq:730038 version:2.1.0

Changes:
--------
--- /work/SRC/openSUSE:Factory/jaxodraw/jaxodraw.changes        2019-02-24 
17:13:00.524476114 +0100
+++ /work/SRC/openSUSE:Factory/.jaxodraw.new.7948/jaxodraw.changes      
2019-09-11 10:42:00.619202775 +0200
@@ -1,0 +2,6 @@
+Tue Sep 10 15:06:24 UTC 2019 - Christophe Giboudeaux <[email protected]>
+
+- Fix the desktop categories and package group.
+- Use %suse_update_desktop_file
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ jaxodraw.spec ++++++
--- /var/tmp/diff_new_pack.f1GQ1f/_old  2019-09-11 10:42:01.175202675 +0200
+++ /var/tmp/diff_new_pack.f1GQ1f/_new  2019-09-11 10:42:01.175202675 +0200
@@ -25,7 +25,7 @@
 # The xslt files in the manual are Apache-2.0 licensed, GPL-2.0+ for 
everything else
 License:        GPL-2.0-or-later AND Apache-2.0
 Group:          Productivity/Scientific/Physics
-Url:            http://jaxodraw.sourceforge.net
+URL:            http://jaxodraw.sourceforge.net
 Source0:        
http://download.sourceforge.net/%{name}/%{name}-%{major}-%{minor}-src.tar.gz
 Source1:        
http://sourceforge.net/projects/jaxodraw/files/installer_files/installer-2.0-1.tar.gz
 Source2:        
http://downloads.sourceforge.net/%{name}/axodraw4j_2008_11_19.tar.gz
@@ -37,10 +37,10 @@
 # PATCH-FEATURE-OPENSUSE jaxodraw-set-default-viewers.patch 
[email protected] -- Set xdg-open as the default HTML and postscript viewers 
(can be changed by user)
 Patch0:         jaxodraw-set-default-viewers.patch
 BuildRequires:  ant
-BuildRequires:  desktop-file-utils
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.7.0
 BuildRequires:  javapackages-tools
+BuildRequires:  update-desktop-files
 BuildRequires:  tex(latex)
 Requires:       java >= 1.7.0
 Requires:       javapackages-tools
@@ -66,7 +66,7 @@
 %package javadoc
 Summary:        Javadocs for %{name}
 License:        GPL-2.0-or-later
-Group:          Documentation
+Group:          Documentation/Other
 Requires:       %{name} = %{version}
 Requires:       javapackages-tools
 
@@ -131,11 +131,9 @@
 install -m 755 %{name} %{buildroot}%{_bindir}/
 
 # INSTALL .desktop file and appstream file [taken from FEDORA]
-desktop-file-install \
-  --dir=%{buildroot}%{_datadir}/applications \
-  --remove-category='Physics;Science;' \
-  --add-category='Education;Science;' \
-  installer-2.0-1/OS/Linux/%{name}.desktop
+install -D -m 644 installer-2.0-1/OS/Linux/%{name}.desktop 
%{buildroot}%{_datadir}/applications/%{name}.desktop
+%suse_update_desktop_file -r %{name} Graphics 2DGraphics VectorGraphics 
Education Science DataVisualization
+
 install -D -p -m 644 installer-2.0-1/OS/Linux/%{name}.png 
%{buildroot}%{_datadir}/pixmaps/%{name}.png
 # Man page
 install -D -p -m 644 installer-2.0-1/OS/Linux/man/%{name}.1 
%{buildroot}%{_mandir}/man1/%{name}.1
@@ -151,12 +149,6 @@
 # Register as an application to be visible in the software center
 install -D -m 0644 %{SOURCE3} 
%{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 
-%post
-%desktop_database_post
-
-%postun
-%desktop_database_postun
-
 # POST SCRIPTS IMPORTED FROM texlive-specs-a SPECFILE
 %post latex
 mkdir -p %{_localstatedir}/run/texlive
@@ -189,7 +181,7 @@
 %{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/pixmaps/%{name}.png
-%{_mandir}/man1/%{name}.1%{ext_man}
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %files javadoc
 %{_javadocdir}/%{name}/


Reply via email to