rpms/html-xml-utils/devel html-xml-utils.spec,1.4,1.5

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/html-xml-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7955

Modified Files:
	html-xml-utils.spec 
Log Message:
* Fri Nov 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7-7
- Add explicit "Conflicts: surfraw" (#208781).
  Add explicit "Conflicts: normalize" (#208781). 
  Both are fixed in upstream releases >= 5.0 (!)



Index: html-xml-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/html-xml-utils/devel/html-xml-utils.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- html-xml-utils.spec	31 Jul 2008 17:26:46 -0000	1.4
+++ html-xml-utils.spec	21 Nov 2008 19:14:53 -0000	1.5
@@ -1,6 +1,12 @@
+# Remove these for html-xml-utils >= 5.0 (!)
+# Conflicts with /usr/bin/cite
+Conflicts: surfraw
+# Conflicts with /usr/bin/normalize and /usr/share/man/man1/normalize.1.gz
+Conflicts: normalize
+
 Name:           html-xml-utils
 Version:        3.7
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A number of simple utilities for manipulating HTML and XML files
 
 Group:          Development/Tools
@@ -12,7 +18,7 @@
 
 %description
 A number of simple utilities for manipulating HTML and XML files. See Manpages
-for each specific command
+for each specific command.
 
 %prep
 %setup -q 
@@ -41,6 +47,11 @@
 
 
 %changelog
+* Fri Nov 21 2008 Michael Schwendt <mschwendt at fedoraproject.org> - 3.7-7
+- Add explicit "Conflicts: surfraw" (#208781).
+  Add explicit "Conflicts: normalize" (#208781). 
+  Both are fixed in upstream releases >= 5.0 (!)
+
 * Thu Jul 31 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 3.7-6
 - fix license tag