From af57868a44f5cd12d8254a8e9d7a02bc929c1b73 Mon Sep 17 00:00:00 2001
From: Dominik Mierzejewski <rpm@greysector.net>
Date: Oct 18 2015 17:22:58 +0000
Subject: Clean up


- don't unpack the main source twice
- clean up obsolete specfile parts
- clean up some rpmlint warnings
- tighten file list
- install icons from debian patch
- update icon cache scriptlets

---

diff --git a/grace.png b/grace.png
deleted file mode 100644
index cefe64f..0000000
Binary files a/grace.png and /dev/null differ
diff --git a/grace.spec b/grace.spec
index f2bc0c2..bb255b5 100644
--- a/grace.spec
+++ b/grace.spec
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.25
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -11,16 +11,12 @@ License:        GPLv2+
 URL:            http://plasma-gate.weizmann.ac.il/Grace/
 Source0:        ftp://plasma-gate.weizmann.ac.il/pub/grace/src/grace5/%{name}-%{version}.tar.gz
 Source1:        %{name}.desktop
-Source2:        %{name}.png
 Source3:        cephes-license.email
 Source4:        LICENSE.cephes
 Source5:        http://ftp.de.debian.org/debian/pool/main/g/grace/grace_5.1.25-1.debian.tar.xz
 
 Patch0:         %{name}-detect-netcdf.diff
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Group:          Applications/Engineering
-
 BuildRequires:  libjpeg-devel, libpng-devel, netcdf-devel
 BuildRequires:  zlib-devel, fftw2-devel, t1lib-devel
 BuildRequires:  xbae-devel, gcc-gfortran, libXmu-devel
@@ -45,7 +41,6 @@ making figures for publications.
 
 %package devel
 Summary:        Files needed for grace development
-Group:          Development/Libraries
 License:        LGPLv2+
 Requires:       %{name} = %{version}-%{release}
 Provides:       %{name}-static = %{version}-%{release}
@@ -55,8 +50,7 @@ Install these files if you need to compile software that requires grace.
 
 
 %prep
-%setup -q
-%setup -D -a 5
+%setup -q -D -a 5
 
 %patch0
 # avoid duplicating debian patch
@@ -88,7 +82,6 @@ make %{?_smp_mflags}
 
 
 %install
-rm -rf %{buildroot}
 make install DESTDIR=%{buildroot}
 
 rm -f doc/*.1
@@ -125,7 +118,7 @@ ln -s ../../%{type1fontdir} fonts/type1
 mv fonts/FontDataBase %{buildroot}%{_sysconfdir}/%{name}
 ln -s ../../../../%{_sysconfdir}/%{name}/FontDataBase fonts/FontDataBase
 
-# regenerate %{_sysconfdir}/%{name}/FontDataBase based on what is in
+# regenerate %%{_sysconfdir}/%%{name}/FontDataBase based on what is in
 # type1fontdir and original FontDataBase content
 FontDataBaseFile=%{buildroot}%{_sysconfdir}/%{name}/FontDataBase
 rm -f $FontDataBaseFile.tmp
@@ -152,14 +145,14 @@ rm $FontDataBaseFile.tmp
 sed -i '/^$/d' $FontDataBaseFile
 
 install -pm 644 doc/*.1 %{buildroot}%{_mandir}/man1/
-# doc and example directories are removed from GRACE_HOME and put in %doc
+# doc and example directories are removed from GRACE_HOME and put in %%doc
 rm -rf doc examples
 ln -s %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}/{doc,examples} .
 
 # the convcal source file shouldn't be installed, it is removed here
 rm -f auxiliary/convcal.c
 
-# move config files to %{_sysconfdir} and do symlinks
+# move config files to %%{_sysconfdir} and do symlinks
 for conf in gracerc templates gracerc.user; do
     mv $conf %{buildroot}%{_sysconfdir}/%{name}
     ln -s ../../../%{_sysconfdir}/%{name}/$conf $conf
@@ -169,7 +162,10 @@ popd
 ##
 # Desktop stuff
 #
-install -pm 644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
+install -pm 644 debian/icons/grace.png %{buildroot}%{_datadir}/icons/hicolor/48x48/apps/
+for sz in 16 22 24 32; do
+    install -Dpm 644 debian/icons/grace${sz}.png %{buildroot}%{_datadir}/icons/hicolor/${sz}x${sz}/apps/grace.png
+done
 desktop-file-install \
     --dir %{buildroot}%{_datadir}/applications          \
     %{SOURCE1}
@@ -180,26 +176,21 @@ mkdir __dist_doc
 cp -a doc __dist_doc
 rm __dist_doc/doc/Makefile __dist_doc/doc/*.sgml
 
-%clean
-rm -rf %{buildroot}
-
-
 %post
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
-
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor || :
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
-   %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
-%defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
+%license LICENSE
 %doc ChangeLog CHANGES COPYRIGHT DEVELOPERS LICENSE README
 %doc cephes-license.email LICENSE.cephes
 %doc examples/ __dist_doc/doc/
@@ -208,20 +199,27 @@ fi
 %{_datadir}/%{name}
 %exclude %{_datadir}/%{name}/include
 %exclude %{_datadir}/%{name}/lib
-%{_datadir}/applications/*
-%{_datadir}/icons/hicolor/*/*/*
-%{_mandir}/man*/*
+%{_datadir}/applications/grace.desktop
+%{_datadir}/icons/hicolor/*/apps/grace.png
+%{_mandir}/man1/*.1*
 
 %files devel
-%defattr(-,root,root,-)
-%doc grace_np/LICENSE
-%{_includedir}/*
+%license grace_np/LICENSE
+%{_includedir}/grace_np.h
 %{_datadir}/%{name}/include
 %{_libdir}/libgrace_np.a
 %{_datadir}/%{name}/lib
 
 
 %changelog
+* Sun Oct 18 2015 Dominik Mierzejewski <rpm@greysector.net> - 5.1.25-4
+- don't unpack the main source twice
+- clean up obsolete specfile parts
+- clean up some rpmlint warnings
+- tighten file list
+- install icons from debian patch
+- update icon cache scriptlets
+
 * Fri Oct 16 2015 Kalev Lember <klember@redhat.com> - 5.1.25-3
 - Rebuilt for libXm soname bump