jgu pushed to python-pyopengl (master). "Rename async.py modules to
async_.py to avoid clash with async keyword"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 23:01:41 UTC
From fcae096bceb00a47990317f437197e41ff023e95 Mon Sep 17 00:00:00 2001
From: Jonathan G. Underwood <jonathan.underwood(a)gmail.com>
Date: Jun 30 2018 23:01:31 +0000
Subject: Rename async.py modules to async_.py to avoid clash with async keyword
---
diff --git a/python-pyopengl.spec b/python-pyopengl.spec
index 2349265..c3d247c 100644
--- a/python-pyopengl.spec
+++ b/python-pyopengl.spec
@@ -89,6 +89,8 @@ Requires: python3-tkinter
%prep
%setup -q -c -n %{srcname}-%{version} -T -a0 -a1
+# Add missing .pxd files
+# https://github.com/mcfletch/pyopengl/issues/12
mkdir %{srcname}-accelerate-%{version}/OpenGL_accelerate
cp %{SOURCE2} %{SOURCE3} %{srcname}-accelerate-%{version}/OpenGL_accelerate
@@ -96,6 +98,17 @@ cat > %{srcname}-accelerate-%{version}/OpenGL_accelerate/__init__.py <<EOF
__version__ = %{version}
EOF
+# In Python 3.7 async is a keyword, and so we can't have a module named async
+# https://github.com/mcfletch/pyopengl/issues/14
+mv %{srcname}-%{version}/OpenGL/GL/SGIX/async.py \
+ %{srcname}-%{version}/OpenGL/GL/SGIX/async_.py
+
+mv %{srcname}-%{version}/OpenGL/raw/GL/SGIX/async.py \
+ %{srcname}-%{version}/OpenGL/raw/GL/SGIX/async_.py
+
+sed -i -e 's/from OpenGL.raw.GL.SGIX.async/from OpenGL.raw.GL.SGIX.async_/g' \
+ %{srcname}-%{version}/OpenGL/GL/SGIX/async_.py
+
%build
# Delete all Cython generated .c files to force a rebuild
pushd %{srcname}-accelerate-%{version}/src
@@ -168,6 +181,7 @@ popd
- Force Cython rebuild of c files
- Add missing .pxd files from upstream github repository
- Update URL to point to github
+- Rename async.py modules to async_.py to avoid clash with async keyword
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 3.1.1a1-11
- Rebuilt for Python 3.7
https://src.fedoraproject.org/rpms/python-pyopengl/c/fcae096bceb00a479903...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From e24e53b7dc51bf7d94e7d588a677cd9219954391 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 20:46:44 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index a54dfb0..c60a46d 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -16,6 +16,7 @@ BuildRequires: texlive-collection-latexrecommended
BuildRequires: latexmk
BuildRequires: tex(fncychap.sty)
BuildRequires: tex(framed.sty)
+BuildRequires: tex(upquote.sty)
BuildRequires: tex(tabulary.sty)
BuildRequires: tex(wrapfig.sty)
https://src.fedoraproject.org/rpms/PyX/c/e24e53b7dc51bf7d94e7d588a677cd92...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires (..more)"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 9d31eaf39a7724026a47138bf64d49ad91891eb3 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 21:16:48 +0000
Subject: fix BuildRequires
disable for the moment the pdf manual and faq
---
diff --git a/PyX.spec b/PyX.spec
index 8e97210..dd89559 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -52,14 +52,16 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
pushd faq
%{__sed} -i 's|sphinx-build|sphinx-build-3|' Makefile
-make
+#make
+make html
mv _build/html/ faq
-mv _build/latex/pyxfaq.pdf ..
+#mv _build/latex/pyxfaq.pdf ..
popd
pushd manual
%{__sed} -i 's|sphinx-build|sphinx-build-3|' Makefile
-make
+#make
+make html
mv _build/html/ manual
mv _build/latex/manual.pdf ..
popd
@@ -86,7 +88,7 @@ done
%files doc
%license LICENSE
-%doc *.pdf
+#%doc *.pdf
%doc faq/faq manual/manual
%doc contrib/
%doc examples/
@@ -94,6 +96,7 @@ done
%changelog
* Sat Jun 30 2018 José Matos <jamatos(a)fedoraproject.org> - 0.14.1-9
- fix BuildRequires
+- disable for the moment the pdf manual and faq
* Tue Jun 19 2018 Miro Hrončok <mhroncok(a)redhat.com> - 0.14.1-8
- Rebuilt for Python 3.7
https://src.fedoraproject.org/rpms/PyX/c/9d31eaf39a7724026a47138bf64d49ad...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 8e67e5f5948e1d1f2d870c8cb21e12cc8380f0b3 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 20:25:49 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index a099890..50b66dc 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -15,6 +15,7 @@ BuildRequires: python3-sphinx
BuildRequires: texlive-collection-latexrecommended
BuildRequires: latexmk
BuildRequires: tex(fncychap.sty)
+BuildRequires: tex(framed.sty)
BuildRequires: tex(tabulary.sty)
Requires: tex(latex)
https://src.fedoraproject.org/rpms/PyX/c/8e67e5f5948e1d1f2d870c8cb21e12cc...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 5830a76af07ca16ad8e51e99b261ded82965dc49 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 21:05:48 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index c60a46d..8e97210 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -14,6 +14,7 @@ BuildRequires: texlive-lib-devel
BuildRequires: python3-sphinx
BuildRequires: texlive-collection-latexrecommended
BuildRequires: latexmk
+BuildRequires: tex(capt-of.sty)
BuildRequires: tex(fncychap.sty)
BuildRequires: tex(framed.sty)
BuildRequires: tex(upquote.sty)
https://src.fedoraproject.org/rpms/PyX/c/5830a76af07ca16ad8e51e99b261ded8...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires (..more)"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 0683c15e852b156afb95552d33c2c5a01e23b333 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 22:25:22 +0000
Subject: fix BuildRequires
disable for the moment the pdf manual and faq
---
diff --git a/PyX.spec b/PyX.spec
index dd89559..3efa3e3 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -63,7 +63,7 @@ pushd manual
#make
make html
mv _build/html/ manual
-mv _build/latex/manual.pdf ..
+#mv _build/latex/manual.pdf ..
popd
%install
https://src.fedoraproject.org/rpms/PyX/c/0683c15e852b156afb95552d33c2c5a0...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From cc69708cb250694c98972ec4d45207aa12c1869f Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 18:35:01 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index 75f721f..fe9f697 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -14,6 +14,7 @@ BuildRequires: texlive-collection-latexrecommended
BuildRequires: ghostscript
BuildRequires: python3-sphinx
BuildRequires: latexmk
+BuildRequires: tex(fncychap.sty)
Requires: tex(latex)
Provides: python3-pyx = %{version}-%{release}
https://src.fedoraproject.org/rpms/PyX/c/cc69708cb250694c98972ec4d45207aa...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 158221e513a099b71d9d4709edc50fdab4a387f2 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 20:32:17 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index 50b66dc..a54dfb0 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -17,6 +17,7 @@ BuildRequires: latexmk
BuildRequires: tex(fncychap.sty)
BuildRequires: tex(framed.sty)
BuildRequires: tex(tabulary.sty)
+BuildRequires: tex(wrapfig.sty)
Requires: tex(latex)
Provides: python3-pyx = %{version}-%{release}
https://src.fedoraproject.org/rpms/PyX/c/158221e513a099b71d9d4709edc50fda...
5 years, 2 months
jamatos pushed to PyX (f27). "fix BuildRequires"
by notifications@fedoraproject.org
Notification time stamped 2018-06-30 22:52:53 UTC
From 1de576008d30b5e79da6592c3e7ce925a1851b94 Mon Sep 17 00:00:00 2001
From: José Matos <jamatos(a)fedoraproject.org>
Date: Jun 30 2018 18:53:35 +0000
Subject: fix BuildRequires
---
diff --git a/PyX.spec b/PyX.spec
index fe9f697..19fc6f0 100644
--- a/PyX.spec
+++ b/PyX.spec
@@ -15,6 +15,7 @@ BuildRequires: ghostscript
BuildRequires: python3-sphinx
BuildRequires: latexmk
BuildRequires: tex(fncychap.sty)
+BuildRequires: tex(tabulary.sty)
Requires: tex(latex)
Provides: python3-pyx = %{version}-%{release}
https://src.fedoraproject.org/rpms/PyX/c/1de576008d30b5e79da6592c3e7ce925...
5 years, 2 months