pool/python-python-magic
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 525958 from home:TheBlackCat:branches:devel:languages:python

Browse Source 
- 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:
Todd R 2017-09-14 00:18:33 +00:00 committed by Git OBS Bridge
parent 05b4669ca2
commit 078f75b628
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
python-python-magic.changes
View File

@ -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 Thu Sep 7 20:06:52 UTC 2017 - toddrme2178@gmail.com

4
python-python-magic.spec
View File

@ -18,6 +18,7 @@
%{?!python_module:%define python_module() python-%{**} python3-%{**}} %{?!python_module:%define python_module() python-%{**} python3-%{**}}
%bcond_with test %bcond_with test
%define oldpython python
Name: python-python-magic Name: python-python-magic
Version: 0.4.13 Version: 0.4.13
Release: 0 Release: 0
@ -39,6 +40,9 @@ Requires: file
# https://github.com/ahupp/python-magic/issues/33 # https://github.com/ahupp/python-magic/issues/33
# https://github.com/ahupp/python-magic/issues/57 # https://github.com/ahupp/python-magic/issues/57
Conflicts: python-magic Conflicts: python-magic
%ifpython2
Conflicts: %{oldpython}-magic
%endif
BuildArch: noarch BuildArch: noarch
%python_subpackages %python_subpackages