[xpaint/f19] Updated to latest stable version, which requires libXaw3dXft.

[Paulo Roma Cavalcanti]

commit ce40bac1f104d26a72a943d2bcc2ae49cf5bd36c
Author: Paulo Roma Cavalcanti <promac at gmail.com>
Date:   Sat Sep 21 09:27:09 2013 -0300

    Updated to latest stable version, which requires libXaw3dXft.

 .gitignore  |    1 +
 sources     |    2 +-
 xpaint.spec |   45 ++++++++++++++++++++++++++-------------------
 3 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 27ce684..9004ef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ xpaint-2.9.2.tar.bz2
 /xpaint-2.9.8.tar.bz2
 /xpaint-2.9.8.1.tar.bz2
 /xpaint-2.9.8.3.tar.bz2
+/xpaint-2.9.9.4.tar.bz2
diff --git a/sources b/sources
index b19a5c1..e38c43b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38c643e9e8acec48e98e0abb2e1ce617  xpaint-2.9.8.3.tar.bz2
+c9d14260a095b96f82b1aa6292816db6  xpaint-2.9.9.4.tar.bz2
diff --git a/xpaint.spec b/xpaint.spec
index 161c138..1f0c1dd 100644
--- a/xpaint.spec
+++ b/xpaint.spec
@@ -1,11 +1,12 @@
 %bcond_without xaw3dxft
+%bcond_without libpgf
 %bcond_with Xaw3d
 %bcond_with neXtaw
 
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
-Version:        2.9.8.3
-Release:        7%{?dist}
+Version:        2.9.9.4
+Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
@@ -23,8 +24,9 @@ BuildRequires: libXaw-devel
 BuildRequires: libXdmcp-devel 
 BuildRequires: libXext-devel 
 BuildRequires: libXp-devel
-BuildRequires: libXft-devel
 BuildRequires: Xaw3d-devel
+BuildRequires: libXaw3dXft-devel
+%{?with_libpgf:BuildRequires: libpgf}
 %{?with_neXtaw:BuildRequires: neXtaw-devel}
 Requires: cups, gv, netpbm, psutils
 Requires(post): /sbin/ldconfig
@@ -56,11 +58,15 @@ some support for batch processing.
 
 %prep
 %setup -q
+
 sed -i -e 's|-lXext|-lXext -lfontconfig|g' Local.config
 sed -i -e 's|/lib |/%{_lib} |g' Local.config
 sed -i -e 's|@XPMDIR@|%{_prefix}|g' Local.config
 sed -i -e 's|/usr/lib|%{_libdir}|g' configure
-sed -i -e 's|CFLAGS="-O3 -s -DNDEBUG=1"|CFLAGS=$RPM_OPT_FLAGS|g' pdfconcat.c
+sed -i -e 's|/usr/lib|%{_libdir}|g' configure.old
+sed -i -e 's|ln -s xpaint|ln -sf xpaint|g' configure.old
+sed -i -e 's|CFLAGS="-O3 -s -DNDEBUG=1"|CFLAGS=$RPM_OPT_FLAGS|g' util/pdfconcat.c
+sed -i -e 's|@echo|echo|g' util/Makefile
 for f in ChangeLog README; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8
     touch -r $f $f.utf8
@@ -72,18 +78,20 @@ sed -i -e "s/\(XCOMM CDEBUGFLAGS =\)/CDEBUGFLAGS = $RPM_OPT_FLAGS\nCXXDEBUGFLAGS
 # this is for debugging, to save the temporary file Imakefile.c
 touch fake
 ln fake Imakefile.c
-./configure
+./configure.old --libdir=%{_libdir}
 
 # make %{?_smp_mflags} \
 # avoids laygram.h not found
 make \
-     %{?with_xaw3dxft:xaw3dxft.so} \
+     %{?with_xaw3dxft:xaw3dxft} \
      %{?with_Xaw3d:xaw3dg} \
      %{?with_neXtaw:nextaw}
 
+cd util
+make
+
 %install
 rm -rf %{buildroot}
-
 make \
         DESTDIR=%{buildroot} \
         BINDIR=%{_bindir} \
@@ -100,12 +108,6 @@ desktop-file-install --delete-original                  \
 mkdir -p %{buildroot}%{_datadir}/pixmaps
 cp -a $RPM_BUILD_DIR/%{name}-%{version}/icons/* %{buildroot}%{_datadir}/pixmaps
 
-# libs
-%if %{with xaw3dxft}
-mkdir -p %{buildroot}%{_libdir}
-cp -a $RPM_BUILD_DIR/%{name}-%{version}/Xaw3dxft/libXaw3dxft.* %{buildroot}%{_libdir}
-%endif
-
 # rpath
 chrpath --delete %{buildroot}%{_bindir}/xpaint
 
@@ -125,10 +127,11 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog GPL-3.0.txt README README.old README.PNG TODO Doc/sample.Xdefaults Doc/Operator.doc
+%doc ChangeLog README README.old README.PNG TODO Doc/sample.Xdefaults Doc/Operator.doc
 %{_bindir}/%{name}
-%{_bindir}/imgmerge
 %{_bindir}/pdfconcat
+%{_bindir}/ppmtops
+%{_bindir}/imgmerge
 %{_includedir}/%{name}
 %{_datadir}/X11/app-defaults/XPaint*
 %{_datadir}/applications/%{name}.desktop
@@ -136,11 +139,16 @@ rm -rf %{buildroot}
 %{_datadir}/pixmaps/%{name}*
 %{_datadir}/pixmaps/XPaintIcon*.png
 %{_mandir}/man1/%{name}.1x*
-%if %{with xaw3dxft}
-%{_libdir}/libXaw3dxft.*
-%endif
+%{_mandir}/man1/pdfconcat.1.gz
 
 %changelog
+
+* Sat Sep 21 2013 Paulo Roma <roma at lcg.ufrj.br> 2.9.9.4-1
+- Updated to 2.9.9.4
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.8.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.8.3-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
@@ -159,7 +167,6 @@ rm -rf %{buildroot}
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.9.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-
 * Tue Nov 15 2011 Paulo Roma <roma at lcg.ufrj.br> 2.9.8.3-1
 - Updated to 2.9.8.3