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

[Patrice Dumas (pertusus)]

Author: pertusus

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

Modified Files:
	lesstif.spec 
Log Message:
* 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.



Index: lesstif.spec
===================================================================
RCS file: /cvs/extras/rpms/lesstif/devel/lesstif.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lesstif.spec	31 Aug 2006 14:43:35 -0000	1.3
+++ lesstif.spec	30 Sep 2006 20:11:24 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: OSF/Motif(R) library clone
 Name: lesstif
 Version: 0.95.0
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 #Source: ftp://ftp.hungry.com/pub/hungry/lesstif/srcdist/lesstif-%{version}.tar.bz2
@@ -18,10 +18,6 @@
 
 Url: http://www.lesstif.org/
 
-#Obsoletes: openmotif
-#Provides: openmotif
-#Conflicts: openmotif
-
 # monolithic X
 #BuildRequires: xorg-x11-devel
 #BuildRequires: xorg-x11-deprecated-libs-devel
@@ -81,14 +77,9 @@
 Requires: automake
 Requires: %{name} = %{version}-%{release}
 
-#Obsoletes: openmotif-devel
-#Provides: openmotif-devel
-Conflicts: openmotif-devel
-
-#Obsoletes: lesstif-1.2-devel
-#Obsoletes: lesstif-2.0-devel
-#Provides: lesstif-1.2-devel
-#Provides: lesstif-2.0-devel
+# This is not needed and may conflit with openmotig packaging
+# outside of fedora
+#Conflicts: openmotif-devel
 
 %description devel
 Lesstif-devel contains the lesstif static library and header files
@@ -170,7 +161,7 @@
 rmdir clean_docs/lessdox/functions
 
 # remove host.def, it lives in the imake package
-rm -rf $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
+rm $RPM_BUILD_ROOT%{_datadir}/X11/config/host.def
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -221,6 +212,10 @@
 %{_datadir}/X11/config/*
 
 %changelog
+* 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.
+
 * Thu Aug 31 2006 Patrice Dumas <pertusus at free.fr> 0.95.0-9
 - add Requires: libXext-devel to lesstif-devel