rpms/grace/F-13 grace.spec,1.30,1.31

[José Abílio Oliveira Matos]

Author: jamatos

Update of /cvs/pkgs/rpms/grace/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21416

Modified Files:
	grace.spec 
Log Message:
* Thu Apr  8 2010 José Matos <jamatos at fc.up.pt> - 5.1.22-7
- Fix overzealous fix for bug 504413 (fixes bug 568559).



Index: grace.spec
===================================================================
RCS file: /cvs/pkgs/rpms/grace/F-13/grace.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- grace.spec	19 Nov 2009 20:18:23 -0000	1.30
+++ grace.spec	8 Apr 2010 19:39:22 -0000	1.31
@@ -3,7 +3,7 @@
 
 Name:           grace
 Version:        5.1.22
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Numerical Data Processing and Visualization Tool
 
 License:        GPLv2+
@@ -109,23 +109,23 @@ mkdir -pm 755                           
 # Let's have some sanity
 #
 pushd %{buildroot}%{_datadir}/%{name}
+
 install -pm 755 bin/*   %{buildroot}%{_bindir}/
 rm -rf bin
-#ln -s %{_bindir} bin
 ln -s ../../bin bin
+
 cp -p lib/*   %{buildroot}%{_libdir}/
 rm -rf lib
-#ln -s %{_libdir} lib
 ln -s ../../%_lib lib
+
 install -pm 644 include/* %{buildroot}%{_includedir}/
 rm -rf include
-#ln -s %{_includedir} include
 ln -s ../../include include
+
 # use fonts from type1fontdir
 rm -rf fonts/type1
 ln -s ../../%{type1fontdir} fonts/type1
 mv fonts/FontDataBase %{buildroot}%{_sysconfdir}/%{name}
-#ln -s %{_sysconfdir}/%{name}/FontDataBase fonts/FontDataBase
 ln -s ../../../../%{_sysconfdir}/%{name}/FontDataBase fonts/FontDataBase
 
 # regenerate %{_sysconfdir}/%{name}/FontDataBase based on what is in
@@ -151,23 +151,22 @@ fontcount=`wc -l $FontDataBaseFile.tmp`
 echo $fontcount | sed 's:%{buildroot}.*::' > $FontDataBaseFile
 cat $FontDataBaseFile.tmp >> $FontDataBaseFile
 rm $FontDataBaseFile.tmp
-# remove last newline in file (fixes bug 504413)
-sed -i ':a;N;$!ba;s/\(.*\)\n/\1/' $FontDataBaseFile
+# remove empty lines in file (fixes bug 504413)
+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
 rm -rf doc
-#ln -s %{_docdir}/%{name}-%{version}/doc doc
 ln -s ../doc/%{name}-%{version}/doc doc
 rm -rf examples
-#ln -s %{_docdir}/%{name}-%{version}/examples examples
 ln -s ../doc/%{name}-%{version}/examples 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
 for conf in gracerc templates gracerc.user; do
     mv $conf %{buildroot}%{_sysconfdir}/%{name}
-    #ln -s %{_sysconfdir}/%{name}/$conf $conf
     ln -s ../../../%{_sysconfdir}/%{name}/$conf $conf
 done
 popd
@@ -228,6 +227,9 @@ fi
 
 
 %changelog
+* Thu Apr  8 2010 José Matos <jamatos at fc.up.pt> - 5.1.22-7
+- Fix overzealous fix for bug 504413 (fixes bug 568559).
+
 * Thu Nov 19 2009 José Matos <jamatos at fc.up.pt> - 5.1.22-6
 - Add compile option -fPIC (#508888)