Accepting request 227572 from home:badshah400:branches:Publishing

Update to version 0.7.0; major packaging changes that should now install the full featured program incl. desktop file

OBS-URL: https://build.opensuse.org/request/show/227572
OBS-URL: https://build.opensuse.org/package/show/Publishing/equalx?expand=0&rev=5

equalx-0.6.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d1c11a4b9b6208a72573e6f49b51b2c9d31cf3db65b020ef99597b4f3ae8809f
-size 241570

equalx-0.7.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3d4e41e9d01d2719f344840f5007974c96aabe28e0b145fbc0abfbb316ef5fd7
+size 273600

equalx.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Mar 25 00:21:39 UTC 2014 - badshah400@gmail.com
+
+- Update to version 0.7.0:
+  + No list of changes from upstream
+- Add explicit Requires on ghostscript and poppler-tools (these
+  would have been pulled in by texlive-latex anyway, but just in
+  case)
+- Add Requires on libqt4-sql-sqlite: required for working history
+  and bookmark features
+- Do not package COPYING: file is no longer present in upstream
+  tarball
+- Also supply and package .desktop file and necessary icons:
+  introduces BuildRequires on desktop-file-utils and
+  hicolor-icon-theme (additionally, /usr/bin/convert is used to
+  generate some missing hi-res icons during %install, also needs
+  ghostscript fonts)
+- Package the resources dir in %{_datadir} so that equalx can find
+  the necessary resources (e.g. symbols) at runtime.
+
 -------------------------------------------------------------------
 Wed Jun 26 21:12:10 UTC 2013 - badshah400@gmail.com
 

equalx.desktop

@@ -0,0 +1,10 @@
+[Desktop Entry]
+Exec=equalx
+Terminal=false
+Type=Application
+StartupNotify=false
+Icon=equalx
+Categories=Office;WordProcessor;
+Name=EqualX
+GenericName=LaTeX Equation Editor
+Comment=Create equations in LaTeX

equalx.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package equalx
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products 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,16 +17,25 @@
 
 
 Name:           equalx
-Version:        0.6.0
+Version:        0.7.0
 Release:        0
 Summary:        Editor for writing and exporting TeX/LaTeX equations
 License:        GPL-3.0+
 Group:          Productivity/Publishing/TeX/Frontends
 Url:            http://equalx.sourceforge.net/
-Source:         http://downloads.sourceforge.net/equalx/%{name}-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/equalx/%{name}-%{version}.tar.gz
+Source1:        %{name}.desktop
+BuildRequires:  ImageMagick
+BuildRequires:  desktop-file-utils
+BuildRequires:  fdupes
+BuildRequires:  ghostscript
+BuildRequires:  hicolor-icon-theme
 BuildRequires:  libqt4-devel >= 4.8.0
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(exempi-2.0)
+Requires:       ghostscript
+Requires:       libqt4-sql-sqlite
+Requires:       poppler-tools
 Requires:       texlive-latex
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -49,15 +58,55 @@ sed -i 's/\r$//' LICENSE README
 
 %build
 qmake QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags"
-
+make %{?_smp_mflags}
-make
 
 %install
 make INSTALL_ROOT=%{buildroot} install
 
+# GENERATE HI-RES APPLICATION ICONS
+pushd resources/icons/equalx
+for i in 256 512;
+do
+  convert -density ${i}x -geometry ${i}x equalx.svg equalx-${i}x${i}.png
+done
+popd
+
+# INSTALL RESOURCES DIR
+mkdir -p %{buildroot}%{_datadir}/%{name}
+cp -pr resources %{buildroot}%{_datadir}/%{name}/
+
+# LINK ICON FILES TO HICOLOR ICON DIR
+for i in 22 24 32 48 64 128 256 512;
+do
+  mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps
+  ln -s %{_datadir}/%{name}/resources/icons/equalx/equalx-${i}x${i}.png \
+        %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/equalx.png
+done
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+ln -s %{_datadir}/%{name}/resources/icons/equalx/equalx.svg \
+      %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/equalx.svg
+
+desktop-file-install %{SOURCE1}
+
+%fdupes %{buildroot}%{_datadir}/%{name}
+
+%post
+%icon_theme_cache_post
+%desktop_database_post
+
+%postun
+%icon_theme_cache_postun
+%desktop_database_postun
+
 %files
 %defattr(-,root,root)
-%doc changelog README COPYING LICENSE
+%doc changelog README LICENSE
 %{_bindir}/%{name}
+# OWN THE 512x512 ICON DIR AS HICOLOR THEME DOES NOT PROVIDE IT YET
+%dir %{_datadir}/icons/hicolor/512x512
+%dir %{_datadir}/icons/hicolor/512x512/apps
+%{_datadir}/icons/hicolor/*/apps/%{name}.*
+%{_datadir}/applications/%{name}.desktop
+%{_datadir}/%{name}/
 
 %changelog