Merge changes from CUPS 1.4svn-r7696.

[thirdparty/cups.git] / packaging / cups.spec.in

diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in
index 4e564c176c8f98fb14edce391de17f77695a8bb7..3246b0b00823dabc8af2c87359711a58b790bc66 100644 (file)
--- a/packaging/cups.spec.in
+++ b/packaging/cups.spec.in
@@ -1,5 +1,5 @@
 #
-# "$Id: cups.spec.in 6889 2007-08-29 22:23:35Z mike $"
+# "$Id: cups.spec.in 7693 2008-06-25 17:12:28Z mike $"
 #
 #   RPM "spec" file for the Common UNIX Printing System (CUPS).
 #
@@ -51,6 +51,9 @@ BuildRoot: /tmp/%{name}-root
 Requires: %{name}-libs = %{epoch}:%{version}
 Obsoletes: lpd, lpr, LPRng
 Provides: lpd, lpr, LPRng
+Obsoletes: cups-da, cups-de, cups-es, cups-et, cups-fi, cups-fr, cups-he
+Obsoletes: cups-id, cups-it, cups-ja, cups-ko, cups-nl, cups-no, cups-pl
+Obsoletes: cups-pt, cups-ru, cups-sv, cups-zh
 
 %package devel
 Summary: Common UNIX Printing System - development environment
@@ -356,5 +359,5 @@ rm -rf $RPM_BUILD_ROOT
 
 
 #
-# End of "$Id: cups.spec.in 6889 2007-08-29 22:23:35Z mike $".
+# End of "$Id: cups.spec.in 7693 2008-06-25 17:12:28Z mike $".
 #