Updated to latest version 2.9.8.1

.cvsignore

@@ -1 +0,0 @@
-xpaint-2.8.15.tar.bz2

.gitignore

@@ -0,0 +1,3 @@
+xpaint-2.8.19.tar.bz2
+xpaint-2.9.2.tar.bz2
+/xpaint-2.9.8.1.tar.bz2

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpaint
-# $Id$
-NAME := xpaint
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

import.log

@@ -1,8 +0,0 @@
-xpaint-2_8_7-1_fc10:HEAD:xpaint-2.8.7-1.fc10.src.rpm:1257558508
-xpaint-2_8_7_3-1_fc10:HEAD:xpaint-2.8.7.3-1.fc10.src.rpm:1258838139
-xpaint-2_8_13_1-1_fc12:HEAD:xpaint-2.8.13.1-1.fc12.src.rpm:1264778484
-xpaint-2_8_13_1-2_fc12:HEAD:xpaint-2.8.13.1-2.fc12.src.rpm:1264801021
-xpaint-2_8_13_1-3_fc12:HEAD:xpaint-2.8.13.1-3.fc12.src.rpm:1264843590
-xpaint-2_8_15-1_fc12:HEAD:xpaint-2.8.15-1.fc12.src.rpm:1265118127
-xpaint-2_8_15-2_fc12:HEAD:xpaint-2.8.15-2.fc12.src.rpm:1265451411
-xpaint-2_8_15-3_fc12:HEAD:xpaint-2.8.15-3.fc12.src.rpm:1266112388

sources

@@ -1 +1 @@
-13e2965b2c2fb4f24a475a309effd8bd  xpaint-2.8.15.tar.bz2
+c9fadeae981b89617c5a272efc8248a0  xpaint-2.9.8.1.tar.bz2

xpaint-2.8.15-text-ctrlH-segfault.patch

@@ -1,22 +0,0 @@
-*** xpaint-2.8.15/Paint.c	2010-01-19 22:46:59.000000000 +0100
---- xpaint-2.8.15.2/Paint.c	2010-02-03 09:51:57.579812096 +0100
-***************
-*** 1580,1587 ****
-  	      rect->x, rect->y, rect->width, rect->height,
-  	      rect->x, rect->y);
-  
-!     memcpy(pw->paint.current.alpha, pw->paint.undo->alphapix.alpha,
-!            rect->width * rect->height);
-      PwUpdate(w, rect, True);
-  }
-  
---- 1580,1588 ----
-  	      rect->x, rect->y, rect->width, rect->height,
-  	      rect->x, rect->y);
-  
-!     if (pw->paint.current.alpha && pw->paint.undo->alphapix.alpha)
-!         memcpy(pw->paint.current.alpha, pw->paint.undo->alphapix.alpha,
-!                rect->width * rect->height);
-      PwUpdate(w, rect, True);
-  }
-  

xpaint.spec

@@ -1,20 +1,21 @@
-%bcond_without Xaw3d
+%bcond_without xaw3dxft
+%bcond_with Xaw3d
 %bcond_with neXtaw
 
 Summary:        An X Window System image editing or paint program
 Name:           xpaint
-Version:        2.8.15
-Release:        3%{?dist}
+Version:        2.9.8.1
+Release:        1%{?dist}
 License:        GPLv3+
 Group:          Applications/Multimedia
 URL:            http://sourceforge.net/projects/sf-xpaint
 Source0:        http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-Patch0:         xpaint-2.8.15-text-ctrlH-segfault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: bison flex imake chrpath
 BuildRequires: desktop-file-utils
-BuildRequires: libjpeg-devel 
+BuildRequires: openjpeg-devel
+BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel 
 BuildRequires: libtiff-devel
 BuildRequires: libSM-devel 
@@ -22,9 +23,13 @@ BuildRequires: libXaw-devel
 BuildRequires: libXdmcp-devel 
 BuildRequires: libXext-devel 
 BuildRequires: libXp-devel
-%{?with_Xaw3d:BuildRequires: Xaw3d-devel}
+BuildRequires: libXft-devel
+BuildRequires: Xaw3d-devel
 %{?with_neXtaw:BuildRequires: neXtaw-devel}
 Requires: cups, gv, netpbm, psutils
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
 # The only way of compiling and linking plugins on the fly.
 Obsoletes: %{name}-devel < %{version}-%{release}
 Provides:  %{name}-devel = %{version}-%{release}
@@ -39,21 +44,22 @@ algorithms, scripting and batch jobs. XPaint allows the edition
 of multiple images simultaneously and supports a wide variety of 
 image formats, including: GIF, JPG, PNG, PPM, TIFF, XBM, XPM, etc.
 
-Xpaint supports the Xaw3d widget set for a nicer look, 
-and offers optional editing features based on programmable filters 
+xpaint is now fully UTF8 compliant, and is capable of using anti-aliased
+truetype fonts in its operations and in the menus (in particular,
+translating to oriental languages should now be quite easy - also
+the X core font protocol is no longer used anywhere.)
+
+xpaint also offers optional editing features based on programmable filters 
 and user defined procedures written as scripts in plain C. 
 The package includes a substantial list of examples and 
 some support for batch processing.
 
 %prep
 %setup -q
-%patch0 -p1
-sed -i -e 's|-lXpm|-lXpm -lX11 -lm -lXmu -lXt -lXext|g' Local.config
+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|strip|#strip|g' Imakefile
-sed -i -e 's|install -c -s pdfconcat|install -c pdfconcat|g' Imakefile
 sed -i -e 's|CFLAGS="-O3 -s -DNDEBUG=1"|CFLAGS=$RPM_OPT_FLAGS|g' pdfconcat.c
 for f in ChangeLog README; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8
@@ -66,9 +72,12 @@ 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
 
-make %{?_smp_mflags} \
+# make %{?_smp_mflags} \
+# avoids laygram.h not found
+make \
+     %{?with_xaw3dxft:xaw3dxft.so} \
      %{?with_Xaw3d:xaw3dg} \
      %{?with_neXtaw:nextaw}
 
@@ -91,6 +100,12 @@ 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
 
@@ -101,12 +116,16 @@ mkdir -p %{buildroot}%{_includedir}
 mv %{buildroot}%{_datadir}/%{name}/include %{buildroot}%{_includedir}/%{name}
 ln -s ../../include/%{name} %{buildroot}%{_datadir}/%{name}/include
 
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 %clean
 rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog GPL-3.0.txt README README.old README.PNG TODO Doc/sample.Xdefaults
+%doc ChangeLog GPL-3.0.txt README README.old README.PNG TODO Doc/sample.Xdefaults Doc/Operator.doc
 %{_bindir}/%{name}
 %{_bindir}/imgmerge
 %{_bindir}/pdfconcat
@@ -116,9 +135,37 @@ rm -rf %{buildroot}
 %{_datadir}/%{name}
 %{_datadir}/pixmaps/%{name}*
 %{_mandir}/man1/%{name}.1x*
+%if %{with xaw3dxft}
+%{_libdir}/libXaw3dxft.*
+%endif
 
 %changelog
 
+* Fri Dec 24 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.8.1-1
+- 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
+- Update to 2.9.8
+- Patched for gcc 4.5
+
+* Sat Nov 06 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.7-1
+- Update to 2.9.7
+
+* Sun Aug 01 2010 Paulo Roma <roma@lcg.ufrj.br> 2.9.2-1
+- Update to 2.9.2
+- Added BR openjpeg-devel.
+
+* Mon Mar 08 2010 Paulo Roma <roma@lcg.ufrj.br> 2.8.19-1
+- Update to 2.8.19
+- BRs: xaw/xaw3d are optional.
+- Added BR libXft-devel.
+
+* Sat 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.
+
 * Sat Feb 13 2010 Paulo Roma <roma@lcg.ufrj.br> 2.8.15-3
 - Fixed the ImplicitDSOLinking.