Hello community, here is the log from the commit of package ocaml-lablgl for openSUSE:Leap:15.2 checked in at 2020-03-15 07:11:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/ocaml-lablgl (Old) and /work/SRC/openSUSE:Leap:15.2/.ocaml-lablgl.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-lablgl" Sun Mar 15 07:11:22 2020 rev:12 rq:783319 version:1.05 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/ocaml-lablgl/ocaml-lablgl.changes 2020-01-15 15:34:21.662899134 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.ocaml-lablgl.new.3160/ocaml-lablgl.changes 2020-03-15 07:11:38.280973294 +0100 @@ -1,0 +2,6 @@ +Thu Feb 20 20:20:20 UTC 2020 - [email protected] + +- Require current ocaml-rpm-macros +- Fix build failure after recent X11 changes in SLE15 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-lablgl.spec ++++++ --- /var/tmp/diff_new_pack.yU4EaG/_old 2020-03-15 07:11:38.596973483 +0100 +++ /var/tmp/diff_new_pack.yU4EaG/_new 2020-03-15 07:11:38.600973485 +0100 @@ -30,18 +30,13 @@ Source0: lablgl-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: Mesa-devel -BuildRequires: freeglut-devel BuildRequires: ocaml BuildRequires: ocaml-camlp4-devel -BuildRequires: ocaml-labltk-devel -BuildRequires: ocaml-rpm-macros >= 4.02.1 -BuildRequires: tcl-devel -BuildRequires: tk-devel -BuildRequires: xorg-x11-libX11-devel -BuildRequires: xorg-x11-libXext-devel -BuildRequires: xorg-x11-libXmu-devel -BuildRequires: xorg-x11-proto-devel +BuildRequires: ocaml-rpm-macros >= 20200220 +BuildRequires: pkg-config +BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(gl) +BuildRequires: pkgconfig(glu) %description LablGL is is an Objective Caml interface to OpenGL. Support is @@ -65,7 +60,7 @@ %prep %setup -q -n lablgl-%{version} -cat > Makefile.config <<EOF +tee Makefile.config <<EOF %if 0%{?ocaml_native_compiler} CAMLC = ocamlc.opt CAMLOPT = ocamlopt.opt @@ -74,33 +69,30 @@ CAMLOPT = ocamlc %endif BINDIR = %{_bindir} -XINCLUDES = -I%{_prefix}/X11R6/include -XLIBS = -lXext -lXmu -lX11 -TKINCLUDES = -I%{_includedir} -GLINCLUDES = -GLLIBS = -lGL -lGLU -GLUTLIBS = -lglut -lXxf86vm +XINCLUDES = $(pkg-config --cflags x11) +XLIBS = $(pkg-config --libs x11) +GLINCLUDES = $(pkg-config --libs gl glu) +GLLIBS = $(pkg-config --libs gl glu) RANLIB = : -LIBDIR = %{_libdir}/ocaml -DLLDIR = %{_libdir}/ocaml/stublibs -INSTALLDIR = %{_libdir}/ocaml/lablGL -TOGLDIR=Togl +LIBDIR = %{ocaml_standard_library} +DLLDIR = %{ocaml_standard_library}/stublibs +INSTALLDIR = %{ocaml_standard_library}/lablGL COPTS = $RPM_OPT_FLAGS EOF %build -make all +make lib %if 0%{?ocaml_native_compiler} -make opt +make libopt %endif %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_bindir} -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs -make INSTALLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL \ - DLLDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs \ +mkdir -p $RPM_BUILD_ROOT%{ocaml_standard_library}/lablGL +mkdir -p $RPM_BUILD_ROOT%{ocaml_standard_library}/stublibs +make INSTALLDIR=$RPM_BUILD_ROOT%{ocaml_standard_library}/lablGL \ + DLLDIR=$RPM_BUILD_ROOT%{ocaml_standard_library}/stublibs \ BINDIR=$RPM_BUILD_ROOT%{_bindir} \ install @@ -111,22 +103,17 @@ 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 +cp META $RPM_BUILD_ROOT%{ocaml_standard_library}/lablGL # Remove unnecessary *.ml files (ones which have a *.mli). -pushd $RPM_BUILD_ROOT%{_libdir}/ocaml/lablGL +pushd $RPM_BUILD_ROOT%{ocaml_standard_library}/lablGL +rm -fv build.ml for f in *.ml; do \ b=`basename $f .ml`; \ if [ -f "$b.mli" ]; then \ @@ -135,37 +122,11 @@ done popd # -mkdir -vp %{buildroot}/etc/ld.so.conf.d/ -tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_ -%{_libdir}/ocaml/stublibs -_EOF_ -# +%ocaml_create_file_list -%post -p /sbin/ldconfig +%files -f %{name}.files -%postun -p /sbin/ldconfig - -%files -%defattr(-,root,root,-) -%doc README -/etc/ld.so.conf.d/*.conf -%{_bindir}/lablgl -%{_bindir}/lablglut -%dir %{_libdir}/ocaml/lablGL -%{_libdir}/ocaml/stublibs/*.so - -%files devel -%defattr(-,root,root,-) -%doc CHANGES COPYRIGHT README LablGlut/examples Togl/examples -%{_libdir}/ocaml/lablGL/META -%{_libdir}/ocaml/lablGL/*.a -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/lablGL/*.cmxa -%{_libdir}/ocaml/lablGL/*.cmx -%endif -%{_libdir}/ocaml/lablGL/*.cma -%{_libdir}/ocaml/lablGL/*.cmi -%{_libdir}/ocaml/lablGL/*.mli -%{_libdir}/ocaml/lablGL/build.ml +%files devel -f %{name}.files.devel +%doc CHANGES README %changelog
