packages: netpbm/netpbm.spec - rel 8; fix svgalib bcond and turn it off; do...

[arekm]

Author: arekm                        Date: Tue Nov 23 21:03:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 8; fix svgalib bcond and turn it off; don't rely on configure questions, pass options at make time

---- Files affected:
packages/netpbm:
   netpbm.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: packages/netpbm/netpbm.spec
diff -u packages/netpbm/netpbm.spec:1.103 packages/netpbm/netpbm.spec:1.104
--- packages/netpbm/netpbm.spec:1.103	Tue Nov 23 21:31:30 2010
+++ packages/netpbm/netpbm.spec	Tue Nov 23 22:03:00 2010
@@ -12,7 +12,7 @@
 Summary(uk.UTF-8):	Набір бібліотек для роботи з різними графічними файлами
 Name:		netpbm
 Version:	10.35.66
-Release:	7
+Release:	8
 License:	Freeware
 Group:		Libraries
 #  svn export https://netpbm.svn.sourceforge.net/svnroot/netpbm/stable netpbm-%{version} (where version from doc/HISTORY)
@@ -239,43 +239,21 @@
 # it appends defines to pm_config.h twice if -j > 1
 %{__make} -j1 \
 	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -fPIC" \
+	CFLAGS="%{rpmcflags} %{rpmcppflags} -fPIC" \
 	LDFLAGS="%{rpmldflags}" \
-	JBIGHDR_DIR=%{_includedir} \
-	JPEGHDR_DIR=%{_includedir} \
-	PNGHDR_DIR=%{_includedir} \
-	TIFFHDR_DIR=%{_includedir} \
+	JPEGINC_DIR=%{_includedir} \
+	PNGINC_DIR=%{_includedir} \
+	TIFFINC_DIR=%{_includedir} \
+	JPEGLIB_DIR=%{_libdir} \
+	PNGLIB_DIR=%{_libdir} \
+	TIFFLIB_DIR=%{_libdir} \
+	LINUXSVGALIB="%{?with_svga:%{_libdir}/libvga.so}%{!?with_svga:NONE}" \
 	X11LIB=%{_libdir}/libX11.so \
-	JBIGLIB=/usr/%{_lib}/libjbig.so \
+	XML2LIBS="$(%{_bindir}/xml2-config --libs)" \
 	JASPERLIB="" \
-	JASPERDEPLIBS="-ljasper" << EOF
-
-gnu
-regular
-shared
-y
-
-libjpeg.so
-
-libtiff.so
-
-libpng.so
-
-libz.so
-
-%{_libdir}/libX11.so
-
-%if %{without svga}
-none
-%else
-%if "%{_lib}" != "lib"
-/usr/%{_lib}/libvga.so
-%endif
-
-%endif
-%{_docdir}/%{name}-%{version}/netpbm.sourceforge.net/doc/
-
-EOF
+	JASPERDEPLIBS="-ljasper" \
+	JASPERHDR_DIR="/usr/include/jasper" \
+	NETPBM_DOCURL="%{_docdir}/%{name}-%{version}/netpbm.sourceforge.net/doc/"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -283,7 +261,8 @@
 
 rm -rf PKG
 %{__make} -j1 package \
-	pkgdir=$(pwd)/PKG
+	pkgdir=$(pwd)/PKG \
+	LINUXSVGALIB="%{?with_svga:%{_libdir}/libvga.so}%{!?with_svga:NONE}"
 
 rm -f PKG/bin/doc.url
 cp -df PKG/bin/* $RPM_BUILD_ROOT%{_bindir}
@@ -356,6 +335,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2010/11/23 21:03:00  arekm
+- rel 8; fix svgalib bcond and turn it off; don't rely on configure questions, pass options at make time
+
 Revision 1.103  2010/11/23 20:31:30  arekm
 - rel 7; turn off svgalib bcond
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/netpbm/netpbm.spec?r1=1.103&r2=1.104&f=u