Hello community,
here is the log from the commit of package python-sip for openSUSE:Factory
checked in at 2019-01-10 15:20:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-sip (Old)
and /work/SRC/openSUSE:Factory/.python-sip.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-sip"
Thu Jan 10 15:20:04 2019 rev:99 rq:664039 version:4.19.13
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-sip/python-sip.changes 2018-11-06
13:49:50.332623633 +0100
+++ /work/SRC/openSUSE:Factory/.python-sip.new.28833/python-sip.changes
2019-01-10 15:20:05.986531620 +0100
@@ -1,0 +2,12 @@
+Sun Jan 6 02:06:41 UTC 2019 - wba...@tmo.at
+
+- Build a private Qt4 module as well, that's needed by the latest
+ python-qt4 (boo#1119636)
+
+-------------------------------------------------------------------
+Wed Dec 19 19:54:05 UTC 2018 - Todd R <toddrme2...@gmail.com>
+
+- Use upstream-recommended %{_rpmconfigdir}/macros.d directory
+ for the rpm macros.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-sip.spec ++++++
--- /var/tmp/diff_new_pack.zAAhqp/_old 2019-01-10 15:20:06.986530665 +0100
+++ /var/tmp/diff_new_pack.zAAhqp/_new 2019-01-10 15:20:06.990530661 +0100
@@ -129,6 +129,24 @@
popd
}
+# Now build the PyQt4 sip module
+%{python_expand mkdir build_PyQt4_%{$python_bin_suffix}
+pushd build_PyQt4_%{$python_bin_suffix}
+
+# Link against libpython
+ldlibrary=`$python -c "import sysconfig as
s;print(s.get_config_var('LDLIBRARY')[3:-3])"`
+$python ../configure.py --debug \
+ --sip-module=PyQt4.sip \
+ CFLAGS+="%{optflags}" \
+ CXXFLAGS+="%{optflags}" \
+ LIBS+="-l$ldlibrary" \
+ --no-dist-info
+
+make %{?_smp_mflags}
+
+popd
+}
+
# Now build the PyQt5 sip module
%{python_expand mkdir build_PyQt5_%{$python_bin_suffix}
pushd build_PyQt5_%{$python_bin_suffix}
@@ -160,6 +178,11 @@
sed -i 's,%{_bindir}/sip,%{_bindir}/sip-%{$python_bin_suffix},'
%{buildroot}%{python_sitearch}/sipconfig.py
}
+%{python_expand pushd build_PyQt4_%{$python_bin_suffix}
+%make_install
+popd
+}
+
%{python_expand pushd build_PyQt5_%{$python_bin_suffix}
%make_install
popd
@@ -167,19 +190,19 @@
%fdupes %{buildroot}%{python_sitearch}
}
-mkdir -p %{buildroot}/%{_sysconfdir}/rpm/
+mkdir -p %{buildroot}%{_rpmconfigdir}/macros.d
-echo "%%python_sip_api_ver %{python_sip_api}" >
%{buildroot}/%{_sysconfdir}/rpm/macros.python_all-sip
+echo "%%python_sip_api_ver %{python_sip_api}" >
%{buildroot}%{_rpmconfigdir}/macros.d/macros.python_all-sip
%if 0%{?have_python2}
-echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) =
%%python_sip_api_ver" >
%{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip
-echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) =
%%python_sip_api_ver" >>
%{buildroot}/%{_sysconfdir}/rpm/macros.%{python2_prefix}-sip
+echo "%%requires_python2_sip_api Requires: %{python2_prefix}-sip(api) =
%%python_sip_api_ver" >
%{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python2_prefix}-sip
+echo "%%requires_python_sip_api Requires: %{python2_prefix}-sip(api) =
%%python_sip_api_ver" >>
%{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python2_prefix}-sip
%py_compile %{buildroot}%{python2_sitearch}
%endif
%if 0%{?have_python3}
-echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) =
%%python_sip_api_ver" >
%{buildroot}/%{_sysconfdir}/rpm/macros.%{python3_prefix}-sip
+echo "%%requires_python3_sip_api Requires: %{python3_prefix}-sip(api) =
%%python_sip_api_ver" >
%{buildroot}%{_rpmconfigdir}/macros.d/macros.%{python3_prefix}-sip
%py3_compile %{buildroot}%{python3_sitearch}
%endif
@@ -198,13 +221,17 @@
%doc ChangeLog NEWS
%doc build_%{python_bin_suffix}/README
%{python_sitearch}/sip.so
+%dir %{python_sitearch}/PyQt4
+%{python_sitearch}/PyQt4/sip.so
%dir %{python_sitearch}/PyQt5
%{python_sitearch}/PyQt5/sip.so
%files %{python_files devel}
%license LICENSE*
-%config %{_sysconfdir}/rpm/macros.%{python_prefix}-sip
+%{_rpmconfigdir}/macros.d/macros.%{python_prefix}-sip
%python_alternative %{_bindir}/sip
+%dir %{python_sitearch}/PyQt4
+%{python_sitearch}/PyQt4/sip.pyi
%dir %{python_sitearch}/PyQt5
%{python_sitearch}/PyQt5/sip.pyi
%{_includedir}/python%{python_version}*/sip.h
@@ -220,7 +247,7 @@
%files -n python-sip-common
%license LICENSE*
-%config %{_sysconfdir}/rpm/macros.python_all-sip
+%{_rpmconfigdir}/macros.d/macros.python_all-sip
%{_datadir}/sip/
%changelog
