forked from pool/python-python-magic
		
	Accepting request 525958 from home:TheBlackCat:branches:devel:languages:python
- Fix python-magic conflicts OBS-URL: https://build.opensuse.org/request/show/525958 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-python-magic?expand=0&rev=7
This commit is contained in:
		@@ -1,3 +1,8 @@
 | 
			
		||||
-------------------------------------------------------------------
 | 
			
		||||
Thu Sep 14 00:17:15 UTC 2017 - toddrme2178@gmail.com
 | 
			
		||||
 | 
			
		||||
- Fix python-magic conflicts
 | 
			
		||||
 | 
			
		||||
-------------------------------------------------------------------
 | 
			
		||||
Thu Sep  7 20:06:52 UTC 2017 - toddrme2178@gmail.com
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -18,6 +18,7 @@
 | 
			
		||||
 | 
			
		||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
 | 
			
		||||
%bcond_with     test
 | 
			
		||||
%define         oldpython python
 | 
			
		||||
Name:           python-python-magic
 | 
			
		||||
Version:        0.4.13
 | 
			
		||||
Release:        0
 | 
			
		||||
@@ -39,6 +40,9 @@ Requires:       file
 | 
			
		||||
# https://github.com/ahupp/python-magic/issues/33
 | 
			
		||||
# https://github.com/ahupp/python-magic/issues/57
 | 
			
		||||
Conflicts:      python-magic
 | 
			
		||||
%ifpython2
 | 
			
		||||
Conflicts:      %{oldpython}-magic
 | 
			
		||||
%endif
 | 
			
		||||
BuildArch:      noarch
 | 
			
		||||
 | 
			
		||||
%python_subpackages
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user