OCaml 4.12.0 build

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

ocaml-lablgtk.rpmlintrc

@@ -0,0 +1,8 @@
+# THIS FILE IS FOR WHITELISTING RPMLINT ERRORS AND WARNINGS IN TASKOTRON
+# https://fedoraproject.org/wiki/Taskotron/Tasks/dist.rpmlint#Whitelisting_errors
+
+# The dictionary is missing some technical terms
+addFilter(r'W: spelling-error .* gtk')
+
+# The gnomeui shared objects do not invoke any glibc symbols
+addFilter(r'E: library-not-linked-against-libc .*lablgnomeui')

ocaml-lablgtk.spec

@@ -1,36 +1,29 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
 Name:           ocaml-lablgtk
-Version:        2.18.5
-Release:        3%{?dist}
+Version:        2.18.11
+Release:        6%{?dist}
 
 Summary:        Objective Caml interface to gtk+
 
 License:        LGPLv2 with exceptions
 
 URL:            http://lablgtk.forge.ocamlcore.org/
-Source:         https://forge.ocamlcore.org/frs/download.php/1627/lablgtk-2.18.5.tar.gz
+Source:         https://github.com/garrigue/lablgtk/archive/%{version}/lablgtk-%{version}.tar.gz
 
-
-Obsoletes:      lablgtk <= 2.6.0-7
-Provides:       lablgtk = 2.6.0-7
-
-BuildRequires:  ncurses-devel
-BuildRequires:  gtk2-devel
-BuildRequires:  gtkglarea2-devel
-BuildRequires:  gtkspell-devel
-BuildRequires:  libXmu-devel
-BuildRequires:  libglade2-devel
-BuildRequires:  libgnomecanvas-devel
-BuildRequires:  libgnomeui-devel
-BuildRequires:  librsvg2-devel
+BuildRequires:  help2man
+BuildRequires:  make
 BuildRequires:  ocaml >= 3.12.1-3
-BuildRequires:  ocaml-camlp4-devel
 BuildRequires:  ocaml-findlib
-BuildRequires:  ocaml-lablgl-devel >= 1.03
 BuildRequires:  ocaml-ocamldoc
-BuildRequires:  zlib-devel
-BuildRequires:  gtksourceview2-devel
+BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtksourceview-2.0)
+BuildRequires:  pkgconfig(gtkspell-2.0)
+BuildRequires:  pkgconfig(libglade-2.0)
+BuildRequires:  pkgconfig(libgnomecanvas-2.0)
+BuildRequires:  pkgconfig(libgnomeui-2.0)
+BuildRequires:  pkgconfig(librsvg-2.0)
+BuildRequires:  pkgconfig(ncurses)
+BuildRequires:  pkgconfig(xmu)
+BuildRequires:  pkgconfig(zlib)
 
 %global __ocaml_requires_opts -i GtkSourceView2_types
 
@@ -44,20 +37,10 @@ is not that easy if you know the dynamic typing approach taken by
 gtk+.
 
 
-%package doc
-Group:          System Environment/Libraries
-Summary:        Documentation for LablGTK
-Requires:       %{name} = %{version}-%{release}
-
-%description doc
-Documentation for %{name}.
-
-
 %package devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-Requires:       gtk2-devel
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       gtk2-devel%{?_isa}
 
 %description devel
 The %{name}-devel package contains libraries and signature files for
@@ -65,21 +48,25 @@ developing applications that use %{name}.
 
 
 %prep
-%setup -q -n lablgtk-%{version}
+%autosetup -n lablgtk-%{version} -p1
 
+# Remove spurious executable bits
+chmod a-x README*
 
 %build
 # Parallel builds don't work.
 unset MAKEFLAGS
-%configure --with-gl --enable-debug
-perl -pi -e "s|-O|$RPM_OPT_FLAGS|" src/Makefile
-%if %{opt}
+%configure --enable-debug
+sed -e "s|-O|$RPM_OPT_FLAGS|" \
+    -e "s|-shared|& -ccopt \"$RPM_LD_FLAGS\"|" \
+    -e "s|(CAMLMKLIB)|& -ldopt \"$RPM_LD_FLAGS\"|" \
+    -i src/Makefile
+%ifarch %{ocaml_native_compiler}
 make world CAMLOPT="ocamlopt.opt -g"
 make opt CAMLOPT="ocamlopt.opt -g"
 %else
 make world CAMLC="ocamlc -g"
 %endif
-make doc CAMLP4O="camlp4o -I %{_libdir}/ocaml/camlp4/Camlp4Parsers"
 
 
 %install
@@ -95,7 +82,7 @@ make install \
      LIBDIR=$RPM_BUILD_ROOT%{_libdir} \
      INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2 \
      DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs
-cp META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
+cp -p META $RPM_BUILD_ROOT%{_libdir}/ocaml/lablgtk2
 
 # Remove ld.conf (part of main OCaml dist).
 rm $RPM_BUILD_ROOT%{_libdir}/ocaml/ld.conf
@@ -113,27 +100,40 @@ popd
 # Remove .cvsignore files from examples directory.
 find examples -name .cvsignore -exec rm {} \;
 
+# Generate man pages
+export LD_LIBRARY_PATH=$PWD/src
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+cp -p src/lablgladecc src/lablgladecc2
+for bin in gdk_pixbuf_mlsource lablgladecc2 lablgtk2; do
+  help2man -N --version-string=%{version} src/$bin > \
+    $RPM_BUILD_ROOT%{_mandir}/man1/$bin.1
+done
+
 
 %files
-%doc README COPYING CHANGES
+%doc README CHANGES
+%license COPYING LGPL
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/*.cmi
 %{_libdir}/ocaml/lablgtk2/*.cma
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/lablgtk2/*.cmxs
 %endif
 %{_libdir}/ocaml/stublibs/*.so*
 %{_bindir}/gdk_pixbuf_mlsource
 %{_bindir}/lablgladecc2
 %{_bindir}/lablgtk2
+%{_mandir}/man1/gdk_pixbuf_mlsource.1*
+%{_mandir}/man1/lablgladecc2.1*
+%{_mandir}/man1/lablgtk2.1*
 
 
 %files devel
-%doc README COPYING CHANGES
+%doc CHANGES.API
 %dir %{_libdir}/ocaml/lablgtk2
 %{_libdir}/ocaml/lablgtk2/META
 %{_libdir}/ocaml/lablgtk2/*.a
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/lablgtk2/*.cmxa
 %{_libdir}/ocaml/lablgtk2/*.cmx
 %endif
@@ -141,23 +141,142 @@ find examples -name .cvsignore -exec rm {} \;
 %{_libdir}/ocaml/lablgtk2/*.ml
 %{_libdir}/ocaml/lablgtk2/*.h
 %{_libdir}/ocaml/lablgtk2/gtkInit.cmo
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/lablgtk2/gtkInit.o
 %endif
 %{_libdir}/ocaml/lablgtk2/gtkThInit.cmo
 %{_libdir}/ocaml/lablgtk2/gtkThread.cmo
-%if %{opt}
+%ifarch %{ocaml_native_compiler}
 %{_libdir}/ocaml/lablgtk2/gtkThread.o
 %endif
 %{_libdir}/ocaml/lablgtk2/propcc
 %{_libdir}/ocaml/lablgtk2/varcc
 
 
-%files doc
-%doc examples doc/html
-
-
 %changelog
+* Mon Mar  1 10:09:47 GMT 2021 Richard W.M. Jones <rjones@redhat.com> - 2.18.11-6
+- OCaml 4.12.0 build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 01 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.11-4
+- OCaml 4.11.1 rebuild
+
+* Fri Aug 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.11-3
+- OCaml 4.11.0 rebuild
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 29 2020 Jerry James <loganjerry@gmail.com> - 2.18.11-1
+- New upstream version 2.18.11
+- Drop upstreamed -fno-common patch
+
+* Mon May 04 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-7
+- OCaml 4.11.0+dev2-2020-04-22 rebuild
+
+* Tue Apr 21 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-6
+- OCaml 4.11.0 pre-release attempt 2
+
+* Fri Apr 17 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-5
+- OCaml 4.11.0 pre-release
+
+* Thu Apr 02 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-4
+- Update all OCaml dependencies for RPM 4.16.
+
+* Wed Feb 26 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.10-3
+- OCaml 4.10.0 final.
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Fri Jan 24 2020 Jerry James <loganjerry@gmail.com> - 2.18.10-1
+- New upstream version 2.18.10
+- Add -fno-common patch to fix build with gcc 10
+- Link shared objects with RPM_OPT_FLAGS
+- Use %%license macro
+- Drop ancient Obsoletes/Provides; package was obsoleting itself
+- Add man pages
+
+* Mon Jan 20 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.9-1
+- New upstream version 2.18.9.
+- Remove patch which has equivalent fix upstream.
+
+* Sun Jan 19 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-8
+- OCaml 4.10.0+beta1 rebuild.
+
+* Thu Jan 09 2020 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-7
+- OCaml 4.09.0 for riscv64
+
+* Thu Dec 05 2019 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-6
+- OCaml 4.09.0 (final) rebuild.
+
+* Thu Aug 29 2019 Jerry James <loganjerry@gmail.com> - 2.18.8-5
+- Bring the gtksourceview2 dependency back.
+
+* Fri Aug 16 2019 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-4
+- OCaml 4.08.1 (final) rebuild.
+
+* Sat Aug 10 2019 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-3
+- Drop dependency on gtksourceview2.
+
+* Wed Jul 31 2019 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-2
+- OCaml 4.08.1 (rc2) rebuild.
+
+* Sat Jul 27 2019 Richard W.M. Jones <rjones@redhat.com> - 2.18.8-1
+- New version 2.18.8.
+- Remove BRs on camlp4 and lablgl.
+- Drop HTML documentation.
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jul 11 2018 Richard W.M. Jones <rjones@redhat.com> - 2.18.6-7
+- OCaml 4.07.0 (final) rebuild.
+
+* Tue Jun 19 2018 Richard W.M. Jones <rjones@redhat.com> - 2.18.6-6
+- OCaml 4.07.0-rc1 rebuild.
+
+* Tue Feb 13 2018 Richard W.M. Jones <rjones@redhat.com> - 2.18.6-5
+- Remove support for GL.
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 2.18.6-4
+- Escape macros in %%changelog
+
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.6-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.6-2
+- OCaml 4.06.0 rebuild.
+
+* Tue Nov 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.6-1
+- New upstream version 2.18.6.
+
+* Mon Aug 07 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.5-9
+- OCaml 4.05.0 rebuild.
+
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.5-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.5-6
+- Bump release and rebuild.
+
+* Mon Jun 26 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.5-5
+- OCaml 4.04.2 rebuild.
+
+* Thu May 11 2017 Richard W.M. Jones <rjones@redhat.com> - 2.18.5-4
+- OCaml 4.04.1 rebuild.
+
 * Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.18.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 
@@ -397,7 +516,7 @@ find examples -name .cvsignore -exec rm {} \;
 - rebuilt
 
 * Sat Feb 12 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:2.4.0-2
-- Remove %{_smp_mflags} as it breaks the build
+- Remove %%{_smp_mflags} as it breaks the build
 
 * Sat Feb 12 2005 Gerard Milmeister <gemi@bluewin.ch> - 0:2.4.0-1
 - New Version 2.4.0

sources

@@ -1 +1 @@
-43eb7062439f7ddd0d8ad96c3e3b87dd  lablgtk-2.18.5.tar.gz
+SHA512 (lablgtk-2.18.11.tar.gz) = adc840df68aa5f9541db44f888f344b313e40c7d8f5cd35f2a45f1bc84e7136dde4b39f873de011db5d5fdfd904c0a097cd9d105458ea9f483cdab3954a2ee05