rpms/nip2/devel nip2-7.16.3-lexlib.patch, NONE, 1.1 nip2.spec, 1.19, 1.20

[Adam Goode]

Author: agoode

Update of /cvs/extras/rpms/nip2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20877

Modified Files:
	nip2.spec 
Added Files:
	nip2-7.16.3-lexlib.patch 
Log Message:
* Sat Dec 27 2008 Adam Goode <adam at spicenitz.org> - 7.16.3-3
- Fix build problem related to flex


nip2-7.16.3-lexlib.patch:

--- NEW FILE nip2-7.16.3-lexlib.patch ---
diff -ur nip2-7.16.3~/configure.in nip2-7.16.3/configure.in
--- nip2-7.16.3~/configure.in	2008-10-09 09:18:26.000000000 -0400
+++ nip2-7.16.3/configure.in	2008-12-27 23:16:22.000000000 -0500
@@ -93,7 +93,7 @@
 AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_LEX
-IP_LIBS="$IP_LIBS $LEXLIBS"
+IP_LIBS="$IP_LIBS $LEXLIB"
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_CHECK_TOOL(WINDRES, windres)


Index: nip2.spec
===================================================================
RCS file: /cvs/extras/rpms/nip2/devel/nip2.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nip2.spec	22 Dec 2008 20:28:02 -0000	1.19
+++ nip2.spec	28 Dec 2008 16:15:00 -0000	1.20
@@ -1,6 +1,6 @@
 Name:		nip2
 Version:	7.16.3
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Interactive tool for working with large images
 
 Group:		Applications/Multimedia
@@ -9,6 +9,7 @@
 Source0:	http://www.vips.ecs.soton.ac.uk/supported/7.16/%{name}-%{version}.tar.gz
 Source1:	nip2.desktop
 Patch0:		nip2-7.16.3-guidedir.patch
+Patch1:		nip2-7.16.3-lexlib.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -16,6 +17,7 @@
 BuildRequires:	gtk2-devel shared-mime-info gnome-icon-theme
 BuildRequires:	flex bison intltool fftw-devel libxml2-devel gettext
 BuildRequires:	desktop-file-utils gsl-devel xdg-utils
+BuildRequires:	automake autoconf libtool
 #Requires:
 
 
@@ -38,6 +40,11 @@
 # fix location of help in program to look in correct path
 %patch0 -p1 -b .guidedir
 
+# fix flex
+# https://www.jiscmail.ac.uk/cgi-bin/webadmin?A2=ind0812&L=VIPSIP&T=0&F=&S=&P=52
+%patch1 -p1 -b .lexlib
+autoreconf -i -f
+
 # CVS dirs
 find . -name CVS -type d -print0 | xargs -0 rm -rf
 
@@ -125,6 +132,9 @@
 
 
 %changelog
+* Sat Dec 27 2008 Adam Goode <adam at spicenitz.org> - 7.16.3-3
+- Fix build problem related to flex
+
 * Mon Dec 22 2008 Adam Goode <adam at spicenitz.org> - 7.16.3-2
 - Add gsl-devel and xdg-utils to build requires