#1037 minor spec file tweaks to support building on opensuse

git-svn-id: https://xpra.org/svn/Xpra/trunk@11328 3bb7dfac-3a0b-4e04-842a-767bc560f471
Xpra-org · Nov 28, 2015 · 73952ee · 73952ee
1 parent d9d71ef
commit 73952ee
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/rpmbuild/PyOpenGL.spec b/rpmbuild/PyOpenGL.spec
@@ -27,10 +27,13 @@ BuildRequires:  python-setuptools
 BuildRequires:  python-setuptools-devel
 %endif
 BuildArch:      noarch
-Requires:       numpy python-setuptools freeglut
+Requires:       numpy
+Requires:       python-setuptools
 
-# in some other repositories this is named python-opengl
 %if 0%{?suse_version}==0
+# not sure what we should depend on with suse, this is Fedora / CentOS only:
+Requires:       freeglut
+# in some other repositories this is named python-opengl
 Provides:       python-opengl = %{VERSION}-%{release}
 Obsoletes:      python-opengl < %{VERSION}-%{release}
 %endif

diff --git a/rpmbuild/python-pillow.spec b/rpmbuild/python-pillow.spec
@@ -4,6 +4,9 @@
 %global name3 python3-pillow
 
 %global lcms lcms
+%global libjpeg libjpeg
+%global tkinter tkinter
+%global PyQt4 PyQt4
 # none of these RHEL versions have python 3
 %if 0%{?el6}
 	%global with_python3 0
@@ -26,9 +29,13 @@
 	%global with_webp 1
 %endif
 %if 0%{?suse_version}
-	%global with_python3 1
-	%global with_filter 1
+	%global with_python3 0
+	%global with_filter 0
 	%global with_webp 1
+	%global lcms liblcms
+	%global libjpeg libjpeg8
+	%global tkinter python-tk
+	%global PyQt4 python-qt4
 %endif
 
 
@@ -42,19 +49,24 @@ License:        MIT
 URL:            http://python-imaging.github.com/Pillow/
 Source:        	https://pypi.python.org/packages/source/P/Pillow/Pillow-%{version}.tar.gz
 
+%if 0%{?suse_version}
+BuildRequires:  python-devel
+%else
 BuildRequires:  python2-devel
+%endif
+
 BuildRequires:  python-setuptools
-BuildRequires:  tkinter
+BuildRequires:  %{tkinter}
 BuildRequires:  tk-devel
 #BuildRequires:  python-sphinx
-BuildRequires:  libjpeg-devel
+BuildRequires:  %{libjpeg}-devel
 BuildRequires:  zlib-devel
 BuildRequires:  freetype-devel
 BuildRequires:  %{lcms}-devel
 %if 0%{with_webp} > 0
 BuildRequires:  libwebp-devel
 %endif
-BuildRequires:  PyQt4
+BuildRequires:  %{PyQt4}
 BuildRequires:  numpy
 
 %if 0%{with_python3}

diff --git a/rpmbuild/python-rencode.spec b/rpmbuild/python-rencode.spec
@@ -1,10 +1,7 @@
 # Remove private provides from .so files in the python_sitearch directory
 %global __provides_exclude_from ^%{python_sitearch}/.*\\.so$
-
-%if 0%{?rhel} && 0%{?rhel} <= 6
-%{!?__python2: %global __python2 /usr/bin/python2}
+%{!?__python2: %define __python2 python2}
 %{!?python2_sitearch: %global python2_sitearch %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
-%endif
 
 #this spec file is for both Fedora and CentOS
 #only Fedora has Python3 at present:
@@ -20,8 +17,13 @@ License:        GPLv3+ and BSD
 URL:            http://code.google.com/p/rencode/
 Source0:        rencode-%{version}.tar.xz
 
+%if 0%{?suse_version}
+BuildRequires:  python-devel
+BuildRequires:  python-Cython
+%else
 BuildRequires:  python2-devel
 BuildRequires:  Cython
+%endif
 %if 0%{?with_python3}
 BuildRequires:  python3-devel
 BuildRequires:  python3-Cython