SPECS: ogre.spec - BuildRequires: DevIL-devel >= 1.6.7

[blekot]

Author: blekot                       Date: Sat Apr 15 13:52:43 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- BuildRequires:  DevIL-devel >= 1.6.7

---- Files affected:
SPECS:
   ogre.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/ogre.spec
diff -u SPECS/ogre.spec:1.3 SPECS/ogre.spec:1.4
--- SPECS/ogre.spec:1.3	Sat Apr 15 15:51:25 2006
+++ SPECS/ogre.spec	Sat Apr 15 15:52:38 2006
@@ -14,11 +14,16 @@
 # Source0-md5:	23e17ef81f1d7e159c0ba626a27c7681
 #Patch0: %{name}-DESTDIR.patch
 URL:		http://www.ogre3d.org/
-BuildRequires:	DevIL-devel
+BuildRequires:	DevIL-devel >= 1.6.7
+
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	zziplib-devel
+<<<<<<< ogre.spec
+BuildRequires:	DevIL-devel >= 1.6.7
+=======
+>>>>>>> 1.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -101,6 +106,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/04/15 13:52:38  blekot
+- BuildRequires:  DevIL-devel >= 1.6.7
+
 Revision 1.3  2006/04/15 13:51:25  glen
 - lowercase rc macro so adapter knows it
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ogre.spec?r1=1.3&r2=1.4&f=u