rpms/lesstif/devel lesstif.spec,1.4,1.5

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/lesstif/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32727

Modified Files:
	lesstif.spec 
Log Message:
* Mon Jan  1 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-11
- add debian patcheset
- Conflict with openmotif versions provided in older fedora core releases
  (should fix #221083)



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- lesstif.spec	30 Sep 2006 20:11:24 -0000	1.4
+++ lesstif.spec	1 Jan 2007 14:46:55 -0000	1.5
@@ -15,6 +15,7 @@
 Patch2: lesstif-0.95.0-CAN-2005-0605.patch
 Patch3: lesstif-0.95.0-64bitcleanups.patch
 Patch4: lesstif-0.95.0-c++fix.patch
+Patch5: http://ftp.debian.org/debian/pool/main/l/lesstif2/lesstif2_0.94.4-2.diff.gz
 
 Url: http://www.lesstif.org/
 
@@ -26,11 +27,9 @@
 BuildRequires: freetype-devel fontconfig-devel
 # lynx is used to transform html in txt
 BuildRequires: lynx
-# for tests, not used now.
-# Missing X11/bitmaps/{Excl,...} required for another test.
+# for tests
 BuildRequires: libGLw-devel
-BuildRequires: bison
-BuildRequires: flex
+BuildRequires: bitmap-devel
 # needed for aclocal, to find the aclocal dir for the autoconf macro
 BuildRequires: automake
 Requires: xorg-x11-xinit 
@@ -77,9 +76,9 @@
 Requires: automake
 Requires: %{name} = %{version}-%{release}
 
-# This is not needed and may conflit with openmotig packaging
-# outside of fedora
-#Conflicts: openmotif-devel
+# Conflicts with openmotif found in older fedora releases
+Conflicts: openmotif-devel <=  2.3.0-0.2.1
+
 
 %description devel
 Lesstif-devel contains the lesstif static library and header files
@@ -95,6 +94,7 @@
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # those substitutions are not usefull, since the symbols are defined
 # in the Makefile, but it is clearer like that
@@ -212,9 +212,14 @@
 %{_datadir}/X11/config/*
 
 %changelog
+* Mon Jan  1 2007 Patrice Dumas <pertusus at free.fr> 0.95.0-11
+- add debian patcheset
+- Conflict with openmotif versions provided in older fedora core releases
+  (should fix #221083)
+
 * Thu Aug 31 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-10
 - remove Conflicts: openmotif-devel, it isn't needed for fedora and
-  may hurt external packaging of openmotif. Fix #208380.
+  may hurt external packaging of openmotif. Fix #208380
 
 * Thu Aug 31 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-9
 - add Requires: libXext-devel to lesstif-devel