- updated to 2.9.10

- added util-opt patch (use optflags in utils)

diff --git a/xpaint-util-opt.patch b/xpaint-util-opt.patch
new file mode 100644 (file)
index 0000000..fe64300
--- /dev/null
+++ b/xpaint-util-opt.patch
@@ -0,0 +1,16 @@
+--- xpaint-2.9.10/util/Makefile.orig   2012-02-05 15:14:24.000000000 +0100
++++ xpaint-2.9.10/util/Makefile        2014-07-22 17:02:25.404157758 +0200
+@@ -1,10 +1,10 @@
+-GCC = gcc
+-CPP = g++ -fpermissive
++GCC = @CC@ @CFLAGS@ @CPPFLAGS@
++CPP = @CXX@ @CXXFLAGS@ @CPPFLAGS@ -fpermissive
+ 
+ all: pdfconcat ppmtops pgf2pnm
+ 
+ pdfconcat:
+-      $(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
++      $(GCC) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat
+ 
+ ppmtops:
+       $(GCC) ppmtops.c -o ppmtops

diff --git a/xpaint.spec b/xpaint.spec
index 4cd2cea57c15b9f5cadd17e1f134662b3446d88d..1cf9cf27d02a96c2fdb2e10161e0f27606f6d215 100644 (file)
--- a/xpaint.spec
+++ b/xpaint.spec
@@ -6,25 +6,28 @@ Summary(pl.UTF-8):    Program do rysowania pod X Window
 Summary(pt_BR.UTF-8):  Programa de desenho para X
 Summary(tr.UTF-8):     X altında boyama programı
 Name:          xpaint
-Version:       2.9.9
-Release:       4
+Version:       2.9.10
+Release:       1
 License:       MIT
 Group:         X11/Applications/Graphics
-Source0:       http://dl.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
-# Source0-md5: 7a30a7855c32fdad84f6ee19297dd540
+Source0:       http://downloads.sourceforge.net/sf-xpaint/%{name}-%{version}.tar.bz2
+# Source0-md5: 8608e4e034aa6c09541070fcecc527e0
 Source1:       %{name}.desktop
 Source2:       %{name}.png
+Patch0:                %{name}-util-opt.patch
 URL:           http://sourceforge.net/projects/sf-xpaint/
-BuildRequires: libxaw3dxft-devel
+BuildRequires: libxaw3dxft-devel >= 1.6.2
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: libjpeg-devel
+BuildRequires: libpgf-devel
 BuildRequires: libpng-devel >= 2:1.4.0
 BuildRequires: libtiff-devel
 BuildRequires: openjpeg-devel
 BuildRequires: xorg-lib-libXaw-devel
 BuildRequires: xorg-lib-libXft-devel
 BuildRequires: xorg-lib-libXpm-devel >= 3.4c
+BuildRequires: zlib-devel
 Requires:      xorg-lib-libXt >= 1.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -72,6 +75,19 @@ bir programdır.
 
 %prep
 %setup -q
+%patch0 -p1
+
+# force regeneration and creation of xaw_incdir symlink
+%{__rm} version.h
+# kill prebuilt binaries
+%{__rm} util/{pdfconcat,ppmtops,pgf2pnm,*.o}
+
+%{__sed} -e 's#@CC@#%{__cc}#' \
+       -e 's#@CXX@#%{__cxx}#' \
+       -e 's#@CFLAGS@#%{rpmcflags}#' \
+       -e 's#@CXXFLAGS@#%{rpmcxxflags}#' \
+       -e 's#@CPPFLAGS@#%{rpmcppflags}#' \
+       -i util/Makefile
 
 %build
 %configure
@@ -90,6 +106,9 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
 
+# API not exported, library requires symbols from executable
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librw.*
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -99,6 +118,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/imgmerge
 %attr(755,root,root) %{_bindir}/xpaint
 %attr(755,root,root) %{_bindir}/pdfconcat
+%attr(755,root,root) %{_bindir}/pgf2pnm
+%attr(755,root,root) %{_bindir}/ppmtops
 %{_appdefsdir}/XPaint
 %lang(es) %{_appdefsdir}/XPaint_es
 %lang(fr) %{_appdefsdir}/XPaint_fr