- try with any motif, some updates (lib64, netpbm); release 2 for Acauto/ac/gplot-4_3b2-2

Changed files:
    gplot.spec -> 1.10

1 files changed, 7 insertions, 9 deletions

diff --git a/gplot.spec b/gplot.spec
index 7997ff2..8e2a2bb 100644
--- a/gplot.spec
+++ b/gplot.spec
@@ -2,7 +2,7 @@ Summary:	GPLOT - CGM files processor
 Summary(pl):	GPLOT - narzędzie do przetwarzania plików CGM
 Name:		gplot
 Version:	4.3b2
-Release:	1
+Release:	2
 Group:		X11/Applications/Graphics
 License:	distributable if unchanged and without charge
 Source0:	ftp://ftp.psc.edu/pub/gplot/%{name}.tar.Z
@@ -12,12 +12,11 @@ Patch1:		%{name}-x.patch
 Patch2:		%{name}-rletocgm.patch
 Patch3:		%{name}-link.patch
 BuildRequires:	XFree86-devel
-BuildRequires:	lesstif-devel
-BuildRequires:	netpbm-devel
+BuildRequires:	motif-devel
+BuildRequires:	netpbm-devel >= 10.0
 BuildRequires:	urt-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 GPLOT is a CGM (Computer Graphics Metafile) processor. CGM files come
 in 3 flavours, Binary (dominant form), Clear Text (human readable),
@@ -44,7 +43,7 @@ GPLOT interpretuje pliki binarne i czysty tekst.
 	DRV_FLAGS="-Dincxws -Dincps -Dinccgmc -Dinccgmb -Dincxl" \
 	DRV_OBJ='ps.o cgmc.o cgmb.o xl.o $(XWS_OBJ)' \
 	CTR_OBJ="tty.o" \
-	XLIBS="-L/usr/X11R6/lib -lXmu -lXt -lX11" \
+	XLIBS="-L/usr/X11R6/%{_lib} -lXmu -lXt -lX11" \
 	MLIBS="-lXm -lXt -lX11" \
 	CFLAGS="%{rpmcflags} -I/usr/X11R6/include"
 
@@ -56,12 +55,11 @@ rm -f devices.o
 	CTR_OBJ="tty.o" \
 	CFLAGS="%{rpmcflags} -I/usr/X11R6/include"
 
-(cd drawcgm/rletocgm
+cd drawcgm/rletocgm
 %{__cc} %{rpmcflags} %{rpmldflags} -o pnmtocgm pnmtocgm.c -DUSE_UNIX -I.. \
-	../drawcgm.a -L/usr/X11R6/lib -lX11 -lXt -lXmu -lm -lpnm
+	../drawcgm.a -L/usr/X11R6/%{_lib} -lX11 -lXt -lXmu -lm -lnetpbm
 %{__cc} %{rpmcflags} %{rpmldflags} -o rletocgm rletocgm.c -DUSE_UNIX -I.. \
-	../drawcgm.a -L/usr/X11R6/lib -lX11 -lXt -lXmu -lm -lrle
-)
+	../drawcgm.a -L/usr/X11R6/%{_lib} -lX11 -lXt -lXmu -lm -lrle
 
 %install
 rm -rf $RPM_BUILD_ROOT