Updated to xpaint-2.9.10.3

.gitignore

@@ -4,3 +4,5 @@ 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
+/xpaint-2.9.10.3.tar.bz2

sources

@@ -1 +1 @@
-38c643e9e8acec48e98e0abb2e1ce617  xpaint-2.9.8.3.tar.bz2
+75bf66eb1d547f223bb87b166f2f0ab4  xpaint-2.9.10.3.tar.bz2

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:        8%{?dist}
+Version:        2.9.10.3
+Release:        2%{?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 >= 1.6.2d
+%{?with_libpgf:BuildRequires: libpgf}
 %{?with_neXtaw:BuildRequires: neXtaw-devel}
 Requires: cups, gv, netpbm, psutils
 Requires(post): /sbin/ldconfig
@@ -56,11 +58,12 @@ 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
@@ -68,22 +71,24 @@ for f in ChangeLog README; do
 done
 
 %build
-sed -i -e "s/\(XCOMM CDEBUGFLAGS =\)/CDEBUGFLAGS = $RPM_OPT_FLAGS\nCXXDEBUGFLAGS = $RPM_OPT_FLAGS/g" Local.config
+sed -i -e "s|XCOMM CDEBUGFLAGS =|CDEBUGFLAGS = $RPM_OPT_FLAGS\nCXXDEBUGFLAGS = $RPM_OPT_FLAGS|g" Local.config
 # 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 +105,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 +124,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 +136,25 @@ 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
+* Fri May 15 2015 Paulo Roma <roma@lcg.ufrj.br> - 2.9.10.3-2
+- Removed some deprecated sed replacements.
+
+* Sun May 10 2015 Paulo Roma <roma@lcg.ufrj.br> - 2.9.10.3-1
+- Update to 2.9.10.3
+
+* Mon Aug 18 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.9.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.9.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+
+* Sat Sep 21 2013 Paulo Roma <roma@lcg.ufrj.br> 2.9.9.4-1
+- Updated to 2.9.9.4
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.9.8.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -162,7 +176,6 @@ rm -rf %{buildroot}
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@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@lcg.ufrj.br> 2.9.8.3-1
 - Updated to 2.9.8.3
 
@@ -174,7 +187,7 @@ rm -rf %{buildroot}
 - Updated to 2.9.8.1
 - Removed deprecated gcc 4.5 patch.
 
-* Sat Nov 07 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.8-1
+* Sun Nov 07 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.8-1
 - Update to 2.9.8
 - Patched for gcc 4.5
 
@@ -190,7 +203,7 @@ rm -rf %{buildroot}
 - BRs: xaw/xaw3d are optional.
 - Added BR libXft-devel.
 
-* Sat Feb 14 2010 Paulo Roma <roma@lcg.ufrj.br> 2.8.16-1
+* Sun Feb 14 2010 Paulo Roma <roma@lcg.ufrj.br> 2.8.16-1
 - Update to 2.8.16
 - Removed obsolete patch text-ctrlH-segfault.
 - Source is no longer stripped by default.
@@ -216,10 +229,10 @@ rm -rf %{buildroot}
 - Updated to 2.8.13.1
 - Removed emacs dependency: #BUG 542967
 
-* Wed Nov 19 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.7.3-1
+* Thu Nov 19 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.7.3-1
 - Updated to 2.8.7.3
 
-* Wed Nov 16 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.7.2-1
+* Mon Nov 16 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.7.2-1
 - Updated to 2.8.7.2
 
 * Wed Nov 04 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.7-1
@@ -236,7 +249,7 @@ rm -rf %{buildroot}
 - Updated to 2.8.6.1
 - Added devel subpackage as noarch.
 
-* Wed Oct 22 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.5-8
+* Thu Oct 22 2009 Paulo Roma <roma@lcg.ufrj.br> 2.8.5-8
 - Updated to 2.8.5
 - Using %%configure.
 - Removed rpath.