From 2b6ead8ec52c4582046bbc9dc70cd64325ffab5fc270690b09d1f1e712d7beda Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 14 Oct 2019 13:42:39 +0000 Subject: [PATCH] Let python-magic build again OBS-URL: https://build.opensuse.org/package/show/Base:System/file?expand=0&rev=194 --- file.changes | 5 +++++ file.spec | 2 +- python-magic.changes | 7 ++++++- python-magic.spec | 4 +--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/file.changes b/file.changes index d6c89ca..618c75f 100644 --- a/file.changes +++ b/file.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 14 13:40:13 UTC 2019 - Dr. Werner Fink + +- Let python-magic build with latest rpm + ------------------------------------------------------------------- Tue Jun 11 10:42:01 UTC 2019 - Dr. Werner Fink diff --git a/file.spec b/file.spec index c9502d4..cfa297a 100644 --- a/file.spec +++ b/file.spec @@ -35,7 +35,7 @@ Release: 0 Summary: A Tool to Determine File Types License: BSD-2-Clause Group: Productivity/File utilities -Source: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz +Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz Source2: baselibs.conf Source3: file-rpmlintrc Source4: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz.asc diff --git a/python-magic.changes b/python-magic.changes index 2daf665..c5f8472 100644 --- a/python-magic.changes +++ b/python-magic.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Mon Oct 14 13:40:13 UTC 2019 - Dr. Werner Fink + +- Let python-magic build with latest rpm + ------------------------------------------------------------------- Wed May 29 06:08:37 UTC 2019 - Dr. Werner Fink -- - Correct version of file which is now 5.37 +- Correct version of file which is now 5.37 ------------------------------------------------------------------- Thu Feb 21 07:18:57 UTC 2019 - Dr. Werner Fink diff --git a/python-magic.spec b/python-magic.spec index 6551729..1ca57ee 100644 --- a/python-magic.spec +++ b/python-magic.spec @@ -18,7 +18,6 @@ # PyPI package name is file-magic. Version is taken from setup.py %define file_magic_version 0.3.0 - %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-magic @@ -33,8 +32,8 @@ Release: 0 Summary: Python module to use libmagic License: BSD-3-Clause AND BSD-4-Clause Group: Development/Languages/Python +%{expand:%(sed -n -e '/^Source0\?:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)} Source99: file.spec -%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)} Requires: libmagic1 Provides: python-file-magic = %{file_magic_version} %global _miscdir %{_datadir}/misc @@ -49,7 +48,6 @@ interface. %{expand:%(sed -n -e '/^%%prep/,/^%%build/p' <%{_sourcedir}/file.spec | sed -e '1d' -e '$d')} ln -sf README.md python/README -%build pushd python %python_build popd