rpms/perl/F-8 perl.spec,1.147,1.148

[Marcela Mašláňová (mmaslano)]

Author: mmaslano

Update of /cvs/pkgs/rpms/perl/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26283

Modified Files:
	perl.spec 
Log Message:
Remove conflicts File-Temp. It doesn't update perl with yum.



Index: perl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/perl/F-8/perl.spec,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -r1.147 -r1.148
--- perl.spec	29 Feb 2008 14:51:10 -0000	1.147
+++ perl.spec	3 Mar 2008 09:12:19 -0000	1.148
@@ -24,7 +24,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        35%{?dist}
+Release:        36%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -206,8 +206,7 @@
 
 # Long history in 3rd-party repositories:
 Provides: perl-File-Temp = 0.16
-Obsoletes: perl-File-Temp < 0.16
-Conflicts: perl-File-Temp
+Obsoletes: perl-File-Temp <= 0.15
 
 Requires: perl-libs = %{perl_epoch}:%{perl_version}-%{release}
 Requires: db4 = %{db4_major}.%{db4_minor}.%{db4_patch}
@@ -808,6 +807,9 @@
 # Nothing. Nada. Zilch. Zarro. Uh uh. Nope. Sorry.
 
 %changelog
+* Fri Feb 29 2008 Marcela Maslanova <mmaslano at redhat.com> - 4:5.8.8-36
+- remove conflicts perl-File-Temp. Use obsoletes.
+
 * Fri Feb 29 2008 Marcela Maslanova <mmaslano at redhat.com> - 4:5.8.8-35
 - upgrade Scalar::Util - possible fix for many bugs. Packages dependent on
 	this module could work even with use of CPAN modules.