diff --git a/python-wxPython-rpmlintrc b/python-wxPython-rpmlintrc
new file mode 100644
index 0000000..67d25fd
--- /dev/null
+++ b/python-wxPython-rpmlintrc
@@ -0,0 +1 @@
+addFilter("devel-file-in-non-devel-package")
diff --git a/python-wxPython.changes b/python-wxPython.changes
index cd49269..b6d1f3f 100644
--- a/python-wxPython.changes
+++ b/python-wxPython.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Mon Jun  4 09:11:22 UTC 2018 - petr@cervinka.net
+
+- Move "wx/*.so" libraries to main package, remove devel package (boo#1095747) 
+- Add rpmlintrc file to filter devel-file-in-non-devel-package
+- Apply spec-cleaner
+
 -------------------------------------------------------------------
 Fri May 18 07:36:08 UTC 2018 - jengelh@inai.de
 
diff --git a/python-wxPython.spec b/python-wxPython.spec
index 775aba3..1caf38f 100644
--- a/python-wxPython.spec
+++ b/python-wxPython.spec
@@ -13,21 +13,28 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%bcond_with     test
-%bcond_with     syswx
 %define         oldpython python
 %define         X_display ":98"
+%bcond_with     test
+%bcond_with     syswx
+%if %{with syswx}
+%define wx_args --use_syswx --gtk3 -v
+%else
+%define wx_args --gtk3 -v
+%endif
 Name:           python-wxPython
 Version:        4.0.1
 Release:        0
-License:        GPL-2.0+
 Summary:        The "Phoenix" variant of the wxWidgets Python bindings
-Url:            https://github.com/wxWidgets/Phoenix
+License:        GPL-2.0-or-later
 Group:          Development/Languages/Python
+URL:            https://github.com/wxWidgets/Phoenix
 Source:         https://files.pythonhosted.org/packages/source/w/wxPython/wxPython-%{version}.tar.gz
+Source1:        python-wxPython-rpmlintrc
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module requests}
 BuildRequires:  %{python_module setuptools}
@@ -36,6 +43,9 @@ BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gstreamer-plugins-base-devel
 BuildRequires:  libjbig-devel
+BuildRequires:  pkgconfig
+BuildRequires:  python-rpm-macros
+BuildRequires:  xorg-x11-server
 BuildRequires:  pkgconfig(cppunit)
 BuildRequires:  pkgconfig(freeglut)
 BuildRequires:  pkgconfig(gstreamer-1.0)
@@ -50,29 +60,20 @@ BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(webkit2gtk-4.0)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  python-rpm-macros
-BuildRequires:  xorg-x11-server
+Requires:       python-six
+Requires(post): update-alternatives
+Requires(postun): update-alternatives
+Conflicts:      python-wxWidgets
+Provides:       python-wxWidgets = %{version}
 %if %{with test}
-BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module pytest-xdist}
+BuildRequires:  %{python_module pytest}
 BuildRequires:  %{python_module six}
 %endif
-Requires:       python-six
 %ifpython2
-Provides:       %{oldpython}-wxWidgets = %version
-Conflicts:      otherproviders(%{oldpython}-wxWidgets)
+Conflicts:      %{oldpython}-wxWidgets
+Provides:       %{oldpython}-wxWidgets = %{version}
 %endif
-Provides:       python-wxWidgets = %version
-Conflicts:      otherproviders(python-wxWidgets)
-Requires(post):   update-alternatives
-Requires(postun):  update-alternatives
-%if %{with syswx}
-%define wx_args --use_syswx --gtk3 -v
-%else
-%define wx_args --gtk3 -v
-%endif
-
-
 %python_subpackages
 
 %description
@@ -89,38 +90,12 @@ Summary:        Languages for package %{name}
 Group:          System/Localization
 Requires:       %{name} = %{version}
 Requires:       python-base
-Provides:       %{name}-lang-all = %{version}
 Supplements:    packageand(bundle-lang-other:%{name})
+Provides:       %{name}-lang-all = %{version}
 
 %description lang
 Provides translations to the package %{name}.
 
-%package devel
-Summary:        Development files for %{name}
-Group:          System/Localization
-Requires:       %{name} = %{version}
-Requires:       python-devel
-Requires:       c++_compiler
-Requires:       gstreamer-plugins-base-devel
-Requires:       libjbig-devel
-Requires:       pkgconfig(cppunit)
-Requires:       pkgconfig(freeglut)
-Requires:       pkgconfig(gstreamer-1.0)
-Requires:       pkgconfig(gtk+-3.0)
-Requires:       pkgconfig(libjpeg)
-Requires:       pkgconfig(liblzma)
-Requires:       pkgconfig(libmspack)
-Requires:       pkgconfig(libnotify)
-Requires:       pkgconfig(libpng16)
-Requires:       pkgconfig(libtiff-4)
-Requires:       pkgconfig(sdl2)
-Requires:       pkgconfig(sm)
-Requires:       pkgconfig(webkit2gtk-4.0)
-Requires:       pkgconfig(x11)
-
-%description devel
-Files needed to build software that uses %{name}.
-
 %prep
 %setup -q -n wxPython-%{version}
 sed -i -e '/^#!\//, 1d' wx/py/*.py
@@ -177,8 +152,8 @@ mv wx_temp wx
 %python_uninstall_alternative pywxrc
 
 %files %{python_files}
-%defattr(-,root,root)
-%doc CHANGES.rst LICENSE.txt README.rst TODO.rst license/*.txt
+%license LICENSE.txt
+%doc CHANGES.rst README.rst TODO.rst license/*.txt
 %python_alternative %{_bindir}/helpviewer
 %python_alternative %{_bindir}/img2png
 %python_alternative %{_bindir}/img2py
@@ -194,14 +169,8 @@ mv wx_temp wx
 %{python_sitearch}/wxPython-%{version}-py*.egg-info
 %{python_sitearch}/wx/
 %exclude %{python_sitearch}/wx/locale/
-%exclude %{python_sitearch}/wx/*.so
-
-%files %{python_files devel}
-%defattr(-,root,root)
-%{python_sitearch}/wx/*.so
 
 %files %{python_files lang}
-%defattr(-,root,root)
 %{python_sitearch}/wx/locale/
 
 %changelog