SPECS: netpbm.spec - fix linking with -lX11

[glen]

Author: glen                         Date: Tue Jan  9 15:46:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix linking with -lX11

---- Files affected:
SPECS:
   netpbm.spec (1.77 -> 1.78) 

---- Diffs:

================================================================
Index: SPECS/netpbm.spec
diff -u SPECS/netpbm.spec:1.77 SPECS/netpbm.spec:1.78
--- SPECS/netpbm.spec:1.77	Mon Nov 13 16:01:54 2006
+++ SPECS/netpbm.spec	Tue Jan  9 16:46:07 2007
@@ -23,6 +23,7 @@
 # Source2-md5:	2d6a3965d493def21edfbc3e1aa262e9
 Patch0:		%{name}-make.patch
 URL:		http://netpbm.sourceforge.net/
+BuildRequires:	XFree86-devel
 BuildRequires:	flex
 BuildRequires:	jbigkit-devel
 BuildRequires:	libjpeg-devel
@@ -197,6 +198,7 @@
 	JPEGHDR_DIR=%{_includedir} \
 	PNGHDR_DIR=%{_includedir} \
 	TIFFHDR_DIR=%{_includedir} \
+	X11LIB=%{_x_libraries}/libX11.so \
 	JBIGLIB=/usr/%{_lib}/libjbig.so << EOF
 
 gnu
@@ -212,9 +214,9 @@
 
 libz.so
 
-libX11.so
+%{_x_libraries}/libX11.so
 
-%if !%{with svga}
+%if %{without svga}
 none
 %else
 %if "%{_lib}" != "lib"
@@ -230,8 +232,9 @@
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},%{_includedir},%{_mandir}/man{1,3,5}}
 
+rm -rf PKG
 %{__make} package \
-	pkgdir=`pwd`/PKG
+	pkgdir=$(pwd)/PKG
 
 rm -f PKG/bin/doc.url
 cp -df PKG/bin/* $RPM_BUILD_ROOT%{_bindir}
@@ -247,6 +250,7 @@
 install urt/librle.a $RPM_BUILD_ROOT%{_libdir}
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+rm -f $RPM_BUILD_ROOT%{_mandir}/README.netpbm-non-english-man-pages
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -295,6 +299,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2007/01/09 15:46:07  glen
+- fix linking with -lX11
+
 Revision 1.77  2006/11/13 15:01:54  sparky
 - don't use %{without ...}, it may not work after inverting bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/netpbm.spec?r1=1.77&r2=1.78&f=u