Use Obsoletes instead of Conflicts
This commit is contained in:
		
							parent
							
								
									058da9b05b
								
							
						
					
					
						commit
						c45bdfa272
					
				| @ -2,7 +2,7 @@ | |||||||
| 
 | 
 | ||||||
| Name:           maven | Name:           maven | ||||||
| Version:        3.0.4 | Version:        3.0.4 | ||||||
| Release:        4%{?dist} | Release:        5%{?dist} | ||||||
| Summary:        Java project management and project comprehension tool | Summary:        Java project management and project comprehension tool | ||||||
| 
 | 
 | ||||||
| Group:          Development/Tools | Group:          Development/Tools | ||||||
| @ -104,7 +104,7 @@ Obsoletes:      %{name} < 0:%{version}-%{release} | |||||||
| 
 | 
 | ||||||
| # maven2 bin package no longer exists. Replace it | # maven2 bin package no longer exists. Replace it | ||||||
| # these should be around until F20 | # these should be around until F20 | ||||||
| Conflicts:      maven2 < 2.2.1-99 | Obsoletes:      maven2 < 2.2.1-99 | ||||||
| Provides:       maven2 = %{version}-%{release} | Provides:       maven2 = %{version}-%{release} | ||||||
| 
 | 
 | ||||||
| %description | %description | ||||||
| @ -359,6 +359,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| %changelog | %changelog | ||||||
|  | * Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-5 | ||||||
|  | - Use Obsoletes instead of Conflicts | ||||||
|  | 
 | ||||||
| * Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-4 | * Mon May 14 2012 Stanislav Ochotnicky <sochotnicky@redhat.com> - 3.0.4-4 | ||||||
| - Obsolete and provide maven2 | - Obsolete and provide maven2 | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user