fix "warning: Macro expanded in comment..." warnings

This commit is contained in:
Rex Dieter 2016-02-29 13:23:26 -06:00
parent 2788e4dc7b
commit 74ed63937e

View File

@ -2,11 +2,9 @@
%if 0%{?fedora} %if 0%{?fedora}
%global with_python3 1 %global with_python3 1
%global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])") %global python3_dbus_dir %(%{__python3} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
#global python3_dbus_dir %(d=%{python3_sitearch}/dbus/mainloop; [ -d $d ] || d=%{python3_sitelib}/dbus/mainloop; echo $d)
%endif %endif
%global with_python2 1 %global with_python2 1
%global python2_dbus_dir %(%{__python2} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])") %global python2_dbus_dir %(%{__python2} -c "import dbus.mainloop; print(dbus.mainloop.__path__[0])")
#global python2_dbus_dir %(d=%{python2_sitearch}/dbus/mainloop; [ -d $d ] || d=%{python2_sitelib}/dbus/mainloop; echo $d)
%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
@ -22,7 +20,6 @@ Url: http://www.riverbankcomputing.com/software/pyqt/
Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{version}%{?snap:-snapshot-%{snap}}.tar.gz
%else %else
Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz Source0: http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-%{version}/PyQt-gpl-%{version}.tar.gz
#Source0: http://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt-gpl-%{version}.tar.gz
%endif %endif
Source1: macros.pyqt5 Source1: macros.pyqt5
# wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9 # wrapper, see https://bugzilla.redhat.com/show_bug.cgi?id=1193107#c9
@ -331,7 +328,7 @@ sed -i \
%files doc %files doc
%doc doc/* %doc doc/*
%doc examples/ %doc examples/
# avoid dep on qscintilla-python, own %_qt5_datadir/qsci/... here for now # avoid dep on qscintilla-python, own %%_qt5_datadir/qsci/... here for now
%dir %{_qt5_datadir}/qsci/ %dir %{_qt5_datadir}/qsci/
%dir %{_qt5_datadir}/qsci/api/ %dir %{_qt5_datadir}/qsci/api/
%dir %{_qt5_datadir}/qsci/api/python/ %dir %{_qt5_datadir}/qsci/api/python/