Hello community, here is the log from the commit of package file for openSUSE:Factory checked in at 2017-10-09 19:36:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/file (Old) and /work/SRC/openSUSE:Factory/.file.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "file" Mon Oct 9 19:36:07 2017 rev:103 rq:532411 version:5.32 Changes: -------- --- /work/SRC/openSUSE:Factory/file/file.changes 2017-09-25 13:48:58.378995860 +0200 +++ /work/SRC/openSUSE:Factory/.file.new/file.changes 2017-10-09 19:36:08.483440414 +0200 @@ -1,0 +2,6 @@ +Tue Sep 26 15:20:23 UTC 2017 - [email protected] + +- remove python build instructions from master spec file, move completely + into python-magic.spec + +------------------------------------------------------------------- --- /work/SRC/openSUSE:Factory/file/python-magic.changes 2016-08-22 10:50:17.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.file.new/python-magic.changes 2017-10-09 19:36:11.511307317 +0200 @@ -1,0 +2,11 @@ +Tue Sep 26 15:17:29 UTC 2017 - [email protected] + +- converted to singlespec, dropped separate python3-magic spec file +- moved python build instructions from file.spec to python-magic.spec +- do not need to build the binary parts in order to build the python part +- removed inlining of %defines from file.spec because it is unreliable + in presence of parametrized macros +- added provides: python-file-magic to comply with the python package + naming policy + +------------------------------------------------------------------- @@ -120,0 +132 @@ + Old: ---- python3-magic.changes python3-magic.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ file.spec ++++++ --- /var/tmp/diff_new_pack.xUTybz/_old 2017-10-09 19:36:13.147235405 +0200 +++ /var/tmp/diff_new_pack.xUTybz/_new 2017-10-09 19:36:13.151235229 +0200 @@ -19,8 +19,6 @@ %define somajor 1 %define libname libmagic%{somajor} -%define python python - Name: file BuildRequires: findutils BuildRequires: libtool @@ -145,11 +143,6 @@ CFLAGS="$RPM_OPT_FLAGS -DHOWMANY=69632 -fPIE" %configure --disable-silent-rules --datadir=%{_miscdir} --disable-static --with-pic --enable-fsect-man5 %{__make} %{?_smp_mflags} pkgdatadir='$(datadir)' LDFLAGS="-pie" -%if 0%{?build_python_bindings:1} -pushd python -%python setup.py build -popd -%endif %install export LANG=POSIX ++++++ python-magic.spec ++++++ --- /var/tmp/diff_new_pack.xUTybz/_old 2017-10-09 19:36:13.171234350 +0200 +++ /var/tmp/diff_new_pack.xUTybz/_new 2017-10-09 19:36:13.171234350 +0200 @@ -16,16 +16,16 @@ # -%{expand:%(sed -n -e '/^%%define somajor/,/^%%define libname/p' <%_sourcedir/file.spec)} +# PyPI package name is file-magic. Version is taken from setup.py +%define file_magic_version 0.3.0 -%define python python +%{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-magic -%define build_python_bindings 1 +BuildRequires: %{python_module setuptools} BuildRequires: findutils BuildRequires: libtool -BuildRequires: python-devel -BuildRequires: python-setuptools +BuildRequires: python-rpm-macros BuildRequires: zlib-devel Url: http://www.darwinsys.com/file/ Version: 5.32 @@ -34,27 +34,35 @@ License: BSD-3-Clause and BSD-4-Clause Group: Development/Languages/Python Source99: file.spec -%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%_sourcedir/file.spec)} -Requires: %libname -%global _sysconfdir /etc +%{expand:%(sed -n -e '/^Source:/,/^BuildRoot:/p' <%{_sourcedir}/file.spec)} +Requires: libmagic1 +Provides: python-file-magic = %{file_magic_version} %global _miscdir %{_datadir}/misc +%python_subpackages + %description This package contains the python binding that require the magic "file" interface. %prep -%{expand:%(sed -n -e '/^%%prep/,/^%%install/p' <%_sourcedir/file.spec | sed -e '1d' -e '$d')} +%{expand:%(sed -n -e '/^%%prep/,/^%%build/p' <%{_sourcedir}/file.spec | sed -e '1d' -e '$d')} + +%build +pushd python +%python_build +popd %install pushd python -%python setup.py install --root=%{buildroot} \ - --prefix=%{_prefix} \ - --record-rpm=../python_files +%python_install popd -%files -f python_files +%files %{python_files} %defattr(-,root,root) %doc python/README python/example.py +%{python_sitelib}/magic.py* +%pycache_only %{python_sitelib}/__pycache__ +%{python_sitelib}/file_magic-*-py%{python_version}.egg-info %changelog
