diff --git a/gl-manpages.spec b/gl-manpages.spec index e81acf5..46ec405 100644 --- a/gl-manpages.spec +++ b/gl-manpages.spec @@ -2,7 +2,7 @@ Name: gl-manpages Version: 1.1 -Release: 1.%{codate}%{?dist} +Release: 2.%{codate}%{?dist} Summary: OpenGL manpages License: MIT and Open Publication @@ -13,6 +13,11 @@ Source1: make-gl-man-snapshot.sh # 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. +Source4: gl-manpages-1.0.1.tar.bz2 BuildArch: noarch @@ -25,6 +30,7 @@ OpenGL manpages %setup -q -n %{name}-%{version}-%{codate} tar xzf %{SOURCE3} cp -av %{SOURCE2} mathml2/ +tar xjf %{SOURCE4} %build @@ -40,6 +46,12 @@ done %install mkdir -p $RPM_BUILD_ROOT%{_mandir}/man3/ cp -n {man4,man3,man}/*.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 + FN=${MANP//*\//} + cp -n $MANP $RPM_BUILD_ROOT%{_mandir}/man3/${FN/.3gl/.3G} +done %files @@ -47,6 +59,9 @@ cp -n {man4,man3,man}/*.3G $RPM_BUILD_ROOT%{_mandir}/man3/ %changelog +* Tue Oct 9 2012 Yanko Kaneti - 1.1-2.%{codate} +- Re-add the older gl-manpages for those not present in khronos + * Tue Oct 9 2012 Yanko Kaneti - 1.1-1.%{codate} - Try building from source diff --git a/sources b/sources index 0ad93a7..bb2375e 100644 --- a/sources +++ b/sources @@ -2,3 +2,4 @@ d8788262ad56f21438a8eb78c0afc5d7 gl-manpages-1.1-20121009.tar.xz d66fd4a92910731c19327af50dd15e77 make-gl-man-snapshot.sh d5e8926fa467c9e1bad59de24206bcbe mathml2.tgz bbf92a1d88ce217d736c222470d6811c dbmathml.dtd +6ae05158e678f4594343f32c2ca50515 gl-manpages-1.0.1.tar.bz2