Compare commits

..

No commits in common. "master" and "f24" have entirely different histories.
master ... f24

4 changed files with 28 additions and 120 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
lablgl-1.04.tar.gz
/lablgl-20120306.tar.gz
/lablgl-1.05.tar.gz
/ocaml-lablgl-1.06.tar.gz

View File

@ -1,11 +0,0 @@
--- LablGlut/src/wrap_glut.c~ 2019-08-07 02:55:23.000000000 -0500
+++ LablGlut/src/wrap_glut.c 2019-09-18 16:26:31.068789343 -0500
@@ -14,7 +14,7 @@
#ifdef __APPLE__
#include <GLUT/glut.h>
#else
-#include <GL/glut.h>
+#include <GL/freeglut.h>
#endif
#include <stdio.h>
#include <stdlib.h>

View File

@ -2,14 +2,14 @@
Name: ocaml-lablgl
Epoch: 1
Version: 1.06
Release: 17%{?dist}
Version: 1.05
Release: 18%{?dist}
Summary: LablGL is an OpenGL interface for Objective Caml
License: BSD
URL: http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgl.html
Source0: https://github.com/garrigue/lablgl/archive/v1.06/%{name}-%{version}.tar.gz
Patch0: lablgl-freeglut.patch
URL: http://forge.ocamlcore.org/projects/lablgl/
Source0: https://forge.ocamlcore.org/frs/download.php/1254/lablgl-%{version}.tar.gz
BuildRequires: freeglut-devel
BuildRequires: ocaml >= 3.12.1-3
@ -22,7 +22,7 @@ BuildRequires: libXxf86vm-devel
BuildRequires: mesa-libGL-devel
BuildRequires: mesa-libGLU-devel
BuildRequires: ocaml-labltk-devel
BuildRequires: ocaml-camlp4-devel
%description
LablGL is is an Objective Caml interface to OpenGL. Support is
@ -37,7 +37,6 @@ Summary: Development files for %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: ocaml-labltk-devel
%description devel
The %{name}-devel package contains libraries and signature files for
developing applications that use %{name}.
@ -46,8 +45,6 @@ developing applications that use %{name}.
%prep
%setup -q -n lablgl-%{version}
%patch0 -p0
cat > Makefile.config <<EOF
%if %{opt}
CAMLC = ocamlc.opt
@ -91,8 +88,26 @@ make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL \
BINDIR=$RPM_BUILD_ROOT%{_bindir} \
install
# Install package META.
cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL/
# Make and install a META file.
cat <<EOM >META
version="%{version}"
directory="+lablgl"
archive(byte) = "lablgl.cma"
archive(native) = "lablgl.cmxa"
package "togl" (
requires = "labltk lablgl"
archive(byte) = "togl.cma"
archive(native) = "togl.cmxa"
)
package "glut" (
requires = "lablgl"
archive(byte) = "lablglut.cma"
archive(native) = "lablglut.cmxa"
)
EOM
cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL
# Remove unnecessary *.ml files (ones which have a *.mli).
pushd $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL
@ -128,101 +143,6 @@ popd
%changelog
* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-17
- OCaml 4.11.1 rebuild
* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-16
- OCaml 4.11.0 rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.06-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-14
- OCaml 4.11.0+dev2-2020-04-22 rebuild
* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-13
- OCaml 4.11.0 pre-release attempt 2
* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-12
- OCaml 4.11.0 pre-release
* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-11
- Update all OCaml dependencies for RPM 4.16.
* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-10
- OCaml 4.10.0 final.
* Tue Feb 25 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-9
- Remove self META file (RHBZ#1806040).
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.06-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-7
- OCaml 4.10.0+beta1 rebuild.
* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-6
- OCaml 4.09.0 for riscv64
* Fri Dec 06 2019 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-5
- OCaml 4.09.0 (final) rebuild.
* Tue Sep 17 2019 Gwyn Ciesla <gwync@protonmail.com> - 1:1.06-3
- Rebuilt for new freeglut
* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-2
- OCaml 4.08.1 (final) rebuild.
* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 1:1.06-1
- New upstream version 1.06.
- This removes the camlp4 dependency (RHBZ#1736347).
- Fix for new source URL.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-32
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-30
- OCaml 4.07.0 (final) rebuild.
* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-29
- OCaml 4.07.0-rc1 rebuild.
* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1:1.05-28
- Escape macros in %%changelog
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-26
- OCaml 4.06.0 rebuild.
* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-25
- OCaml 4.05.0 rebuild.
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-22
- OCaml 4.04.2 rebuild.
* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-21
- OCaml 4.04.1 rebuild.
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Fri Nov 04 2016 Richard W.M. Jones <rjones@redhat.com> - 1:1.05-19
- Rebuild for OCaml 4.04.0.
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.05-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
@ -408,7 +328,7 @@ popd
- Rebuild for ocaml 3.08.3
* Sat Feb 12 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:1.01-2
- Removed %%{_smp_mflags} as it breaks the build
- Removed %{_smp_mflags} as it breaks the build
* Thu Aug 19 2004 Gerard Milmeister <gemi@bluewin.ch> - 0:1.01-0.fdr.1
- New Version 1.01

View File

@ -1 +1 @@
SHA512 (ocaml-lablgl-1.06.tar.gz) = 169ac4ed8eaf3635c107c57cd03a76a64fc16a8d3ba1ad261b7e4dcda985c0a83059421e72233f645aec21a1ec27b980530b4ffb7013fba31d446b16521b3f4c
b64662bf47f2973f836d33ae1365244f lablgl-1.05.tar.gz