rdieter pushed to wxMaxima (f22). "15.04.0"

[notifications at fedoraproject.org]

>From 91ae0eeecbbb12a0f0e60a956d2b1718afc98017 Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Fri, 1 May 2015 23:55:41 -0500
Subject: 15.04.0


diff --git a/.gitignore b/.gitignore
index b7cd90b..c4dc852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/wxmaxima-14.09.0.tar.gz
+/wxmaxima-15.04.0.tar.gz
diff --git a/sources b/sources
index 28bf0aa..613e978 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-973e1d0815be9bc06d35b0ddb0c9da74  wxmaxima-14.09.0.tar.gz
+eb425513c269918fbcc253a7dc9ad283  wxmaxima-15.04.0.tar.gz
diff --git a/wxMaxima.spec b/wxMaxima.spec
index 1d64f49..f55fa0e 100644
--- a/wxMaxima.spec
+++ b/wxMaxima.spec
@@ -4,21 +4,24 @@
 
 Summary: Graphical user interface for Maxima 
 Name:    wxMaxima
-Version: 14.09.0
-Release: 3%{?dist}
+Version: 15.04.0
+Release: 1%{?dist}
 
 License: GPLv2+
 Group:   Applications/Engineering
 URL:     http://wxmaxima.sourceforge.net/
 Source0: http://downloads.sourceforge.net/wxmaxima/wxmaxima-%{version}.tar.gz
+# replace poor upstream one for now
+Source1: wxmaxima.desktop
 
 ExclusiveArch: %{ix86} x86_64 ppc sparcv9 %{arm} %{power64}
 
 BuildRequires: desktop-file-utils
-BuildRequires: wxGTK-devel
+BuildRequires: doxygen
+BuildRequires: wxGTK3-devel
+BuildRequires: libappstream-glib
 BuildRequires: libxml2-devel
 BuildRequires: ImageMagick
-BuildRequires: sed
 
 Provides: wxmaxima = %{version}-%{release}
 
@@ -33,11 +36,10 @@ Maxima using wxWidgets.
 %prep
 %setup -q -n wxmaxima-%{version}
 
-sed -i.orig -e "s|^Icon=wxmaxima.png|Icon=wxmaxima|" wxmaxima.desktop
-
 
 %build
-%configure
+%configure \
+  --with-wx-config=/usr/bin/wx-config-3.0
 
 make %{?_smp_mflags}
 
@@ -47,18 +49,29 @@ make install DESTDIR=%{buildroot}
 
 desktop-file-install --vendor="" \
   --dir %{buildroot}%{_datadir}/applications \
-  --add-category="Development" \
-  wxmaxima.desktop 
+  %{SOURCE1}
 
 # app icon
+install -p -D -m644 data/wxmaxima.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/wxmaxima.svg
 install -p -D -m644 data/wxmaxima.png %{buildroot}%{_datadir}/icons/hicolor/128x128/apps/wxmaxima.png
 convert -resize 48x48 data/wxmaxima.png data/wxmaxima-48x48.png
 install -p -D -m644 data/wxmaxima-48x48.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/wxmaxima.png
 
+# mime icons
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/
+install -p -m644 data/text-x-wx*.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/mimetypes/
+
 %find_lang wxMaxima 
 
 # Unpackaged files
 rm -fv %{buildroot}%{_datadir}/wxMaxima/{COPYING,README}
+rm -fv %{buildroot}%{_datadir}/applications/wxMaxima.desktop
+rm -fv %{buildroot}%{_datadir}/info/dir
+rm -rfv %{buildroot}%{_datadir}/pixmaps/
+
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/wxmaxima.appdata.xml ||:
 
 
 %post
@@ -66,27 +79,37 @@ touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-  update-desktop-database -q &> /dev/null
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+  update-desktop-database -q &> /dev/null
+  touch --no-create %{_datadir}/mime/packages &> /dev/null || :
+  update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 fi
 
 %posttrans
-update-desktop-database -q &> /dev/null
 gtk-update-icon-cache %{_datadir}/icons/hicolor &> /dev/null || :
+update-desktop-database -q &> /dev/null
+update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 %files -f wxMaxima.lang
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING README 
-# 0-length docs
-#doc ChangeLog NEWS
+%doc AUTHORS ChangeLog README
+%license COPYING
 %{_bindir}/wxmaxima
 %{_datadir}/wxMaxima/
 %{_datadir}/icons/hicolor/*/*/*
 %{_datadir}/applications/wxmaxima.desktop
+%{_datadir}/appdata/wxmaxima.appdata.xml
+%{_datadir}/info/wxmaxima.info*
+%{_datadir}/mime/packages/x-wxmathml.xml
+%{_datadir}/mime/packages/x-wxmaxima-batch.xml
+%{_docdir}/wxmaxima/
+%{_mandir}/man1/wxmaxima.1*
 
 
 %changelog
+* Fri May 01 2015 Rex Dieter <rdieter at fedoraproject.org> 15.04.0-1
+- 15.04.0
+
 * Tue Mar 03 2015 Rex Dieter <rdieter at fedoraproject.org> 14.09.0-3
 - rebuild for gcc5 (#1198392)
 
diff --git a/wxmaxima.desktop b/wxmaxima.desktop
new file mode 100644
index 0000000..86ff773
--- /dev/null
+++ b/wxmaxima.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=wxMaxima
+Comment=Perform symbolic and numeric calculations using Maxima
+Comment[uk]=Виконання аналітичних перетворень та обчислень за допомогою Maxima
+Exec=wxmaxima %f
+Icon=wxmaxima
+Terminal=false
+Type=Application
+Categories=Education;Science;Math;Development;
+MimeType=text-x-wxmathml;text/x-wxmaxima-batch;
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/wxMaxima.git/commit/?h=f22&id=91ae0eeecbbb12a0f0e60a956d2b1718afc98017