From 755278a7f21fbf4342a19a690064c4bf9202c57f Mon Sep 17 00:00:00 2001 From: Yanko Kaneti Date: Wed, 6 Mar 2019 12:39:05 +0200 Subject: [PATCH] Switch to the new upstream github repo sources Build only gl4 manpages for now --- .gitignore | 1 + gl-manpages.spec | 38 ++++++++++++++++++-------------------- make-gl-man-snapshot.sh | 9 --------- sources | 2 +- 4 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 make-gl-man-snapshot.sh diff --git a/.gitignore b/.gitignore index 03c5fad..5e79944 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /gl-manpages-1.1-20131105.tar.xz /gl-manpages-1.1-20140424.tar.xz /gl-manpages-1.1-20161227.tar.xz +/gl-manpages-4547332.tar.gz diff --git a/gl-manpages.spec b/gl-manpages.spec index 44d7d04..d3da77b 100644 --- a/gl-manpages.spec +++ b/gl-manpages.spec @@ -1,42 +1,42 @@ -%global codate 20161227 +# FIXME: Figure out what to do about the gles* manpages, maybe different conflicting packages... +%global codate 20190306 +%global commit 4547332f0f27d98601a8f5732ce8e85e09dbdb93 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: gl-manpages Version: 1.1 -Release: 17.%{codate}%{?dist} +Release: 18.%{codate}%{?dist} Summary: OpenGL manpages License: MIT and Open Publication -URL: http://www.opengl.org/wiki/Getting_started/XML_Toolchain_and_Man_Pages -# see Source1 -Source0: gl-manpages-%{version}-%{codate}.tar.xz -Source1: make-gl-man-snapshot.sh +URL: https://github.com/KhronosGroup/OpenGL-Refpages +Source0: https://github.com/KhronosGroup/OpenGL-Refpages/archive/%{commit}/%{name}-%{shortcommit}.tar.gz # FIXME: Bundle mathml and the Oasis dbmathl until they are packaged Source2: http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd Source3: http://www.w3.org/Math/DTD/mathml2.tgz # FIXME These are the old gl-manpages source which # still have some manpages that khronos doesn't. # Ship until somebody in the know helps figuring whats what. -# When matching install the kronos version. +# When matching install the khronos version. Source4: gl-manpages-1.0.1.tar.bz2 #Silence author/version/manual etc. warnings Source5: metainfo.xsl BuildArch: noarch -BuildRequires: libxslt docbook-style-xsl docbook5-style-xsl +BuildRequires: libxslt docbook-style-xsl docbook5-style-xsl python3 %description OpenGL manpages %prep -%setup -q -n %{name}-%{version}-%{codate} +%setup -q -n OpenGL-Refpages-%{commit} tar xzf %{SOURCE3} cp -av %{SOURCE2} mathml2/ tar xjf %{SOURCE4} %build -# FIXME Figure out what to do about the GLSL builtin functions export BD=`pwd` xmlcatalog --create --noout \ --add public "-//W3C//DTD MathML 2.0//EN" "file://$BD/mathml2/mathml2.dtd" \ @@ -45,23 +45,17 @@ xmlcatalog --create --noout \ --add system "http://www.oasis-open.org/docbook/xml/mathml/1.1CR1/dbmathml.dtd" "file://$BD/mathml2/dbmathml.dtd" \ mathml2.cat export XML_CATALOG_FILES="$BD/mathml2.cat /etc/xml/catalog" -for MAN in man3 man2 ; do - pushd $MAN +make +pushd gl4 for MANP in gl*.xml ; do - xsltproc --nonet %{SOURCE5} $MANP | xsltproc --nonet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl - + xsltproc --xinclude --nonet %{SOURCE5} $MANP | xsltproc --xinclude --nonet /usr/share/sgml/docbook/xsl-ns-stylesheets/manpages/docbook.xsl - done - popd -done -pushd man4 -for MANP in gl*.xml ; do - xsltproc --xinclude --nonet %{SOURCE5} $MANP | xsltproc --xinclude --nonet /usr/share/sgml/docbook/xsl-ns-stylesheets/manpages/docbook.xsl - -done popd %install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/ -cp -n {man4,man3,man2}/*.3G $RPM_BUILD_ROOT%{_mandir}/man3/ +cp -n gl4/*.3G $RPM_BUILD_ROOT%{_mandir}/man3/ # install the old manpages source with 3gl -> 3G # when matchin don't clobber the khronos version for MANP in `find gl-manpages-1.0.1 -name *.3gl` ; do @@ -76,6 +70,10 @@ find $RPM_BUILD_ROOT%{_mandir}/man3/ -type f -size -100b | xargs sed -i -e 's/\. %changelog +* Wed Mar 6 2019 Yanko Kaneti - 1.1-18.20190306 +- Switch to the new upstream github repo sources +- Build only gl4 manpages for now + * Thu Jan 31 2019 Fedora Release Engineering - 1.1-17.20161227 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/make-gl-man-snapshot.sh b/make-gl-man-snapshot.sh deleted file mode 100644 index c66ea96..0000000 --- a/make-gl-man-snapshot.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -TODAY=`date +%Y%m%d` -DIR=gl-manpages-1.1-$TODAY -mkdir -p $DIR -for MAN in man4 man3 man2 ; do - svn co --username anonymous --password anonymous https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/docs/$MAN/ $DIR/$MAN --depth immediates -done -find $DIR -name .svn | xargs rm -rf -tar cJf $DIR.tar.xz $DIR diff --git a/sources b/sources index c0098f3..7bdf606 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (gl-manpages-1.1-20161227.tar.xz) = 555ed16ce1fb60f5293a9c09df10a5476f7275216564c001d0398f1bef462a141d8dd975e02e0841d75a64dbf769e9611bc106676ef9adf5ef45c28ad6da0ade +SHA512 (gl-manpages-4547332.tar.gz) = 7aa546766f063a3fca92267c8dbdb63441a37d9f9cc7ae83d4ffdb2aa0d4b4d7679139f1a7547b9564da617743e521dfeb7f4522e4cf8ac57a5adfb20b5ed214 SHA512 (mathml2.tgz) = 5bca2fb6b71c7c561b0ee0865663a3609947bfc17c5ea35934145d06903a681ce04efefe567704c2386e5f127a1df098bd4bb67e4b825ca01e86679680108675 SHA512 (dbmathml.dtd) = 031ad81e0fd873d2ed0fb78a074cc2de93ea7c937d85aac6cb2dc3023e3ba494a9a20f485b5355ce9060aea9adae192c9259b59139ac71273ca3fb858a240704 SHA512 (gl-manpages-1.0.1.tar.bz2) = 901add38fe2cd857b08c38901d3fcb27bff0481cf4504f02d6673e38d07c4dbffff97a614e29d0fac3be2b921e79a20e7a201dc7ae4fade646e206f6ce6ccb20