[packages/grace] - updated to 5.1.25 - updated FHS patch

[qboosh]

commit b0c100da95f4b8816011555344532461a8516fd2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun May 13 22:08:23 2018 +0200

    - updated to 5.1.25
    - updated FHS patch

 grace-FHS.patch | 14 +++++---------
 grace.spec      |  8 ++++----
 2 files changed, 9 insertions(+), 13 deletions(-)
---
diff --git a/grace.spec b/grace.spec
index 8c24beb..893ec89 100644
--- a/grace.spec
+++ b/grace.spec
@@ -1,12 +1,12 @@
 Summary:	Numerical Data Processing and Visualization Tool (grace)
 Summary(pl.UTF-8):	Narzędzie do numerycznej obróbki i wizualizacji danych
 Name:		grace
-Version:	5.1.23
-Release:	3
+Version:	5.1.25
+Release:	1
 License:	GPL v2+
 Group:		Applications/Math
 Source0:	ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/%{name}-%{version}.tar.gz
-# Source0-md5:	e2b28ebe31288952d899fbb5c97858ae
+# Source0-md5:	c0482b1f18b113192946a96f5ff35a4d
 Source1:	%{name}.desktop
 Patch0:		%{name}-FHS.patch
 Patch1:		%{name}-home_etc.patch
@@ -78,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/grace/doc/{*.dvi,*.1} \
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/grace/doc/*.1 \
 	$RPM_BUILD_ROOT%{_datadir}/grace/examples/dotest
 
 install -D %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
diff --git a/grace-FHS.patch b/grace-FHS.patch
index 6a0c8fb..79483bf 100644
--- a/grace-FHS.patch
+++ b/grace-FHS.patch
@@ -67,19 +67,15 @@ diff -Nur grace-5.1.9.orig/auxiliary/Makefile grace-5.1.9/auxiliary/Makefile
  
  tests : dummy
  
-diff -Nur grace-5.1.9.orig/doc/Makefile grace-5.1.9/doc/Makefile
---- grace-5.1.9.orig/doc/Makefile	Sat Jun 22 13:40:21 2002
-+++ grace-5.1.9/doc/Makefile	Sun Aug 11 01:15:28 2002
-@@ -85,10 +85,10 @@
+--- grace-5.1.25/doc/Makefile.orig	2018-05-13 21:39:05.260435364 +0200
++++ grace-5.1.25/doc/Makefile	2018-05-13 21:40:37.127100982 +0200
+@@ -87,8 +87,10 @@
  	$(RM) $(DVIDOCS) $(PSDOCS) $(PDFDOCS) $(HTMLDOCS)
  
- install : $(HTMLS) $(HTMLDOCS) $(DVIDOCS) $(TUTDATA) $(MANPAGES)
+ install : $(HTMLS) $(HTMLDOCS) $(PDFDOCS) $(TUTDATA) $(MANPAGES)
 -	$(MKINSTALLDIRS) $(DESTDIR)$(GRACE_HOME)/doc
--	for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/doc; done
--	cd $(DESTDIR)$(GRACE_HOME)/doc; \
--	for i in $(MANLINKS); do $(RM) $$i; $(LN_S) $(GRACEMAN) $$i; done
 +	$(MKINSTALLDIRS) $(DESTDIR)$(DATADIR)/grace/doc $(DESTDIR)$(MANDIR)/man1
-+	for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(DATADIR)/grace/doc; done
+ 	for i in $?; do $(INSTALL_DATA) $$i $(DESTDIR)$(GRACE_HOME)/doc; done
 +	install $(MANPAGES) $(DESTDIR)$(MANDIR)/man1
 +	for i in $(MANLINKS); do echo ".so $(GRACEMAN)" > $(DESTDIR)$(MANDIR)/man1/$$i; done
  
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/grace.git/commitdiff/b0c100da95f4b8816011555344532461a8516fd2