Accepting request 512539 from devel:languages:ocaml

- Use Group: Development/Languages/OCaml

- Wrap specfile conditionals to fix quilt setup

- Remove autodeps for pre openSUSE 12.1 releases

OBS-URL: https://build.opensuse.org/request/show/512539
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ocaml-pcre?expand=0&rev=2

ocaml-pcre.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Jul 25 13:04:54 UTC 2017 - ohering@suse.de
+
+- Use Group: Development/Languages/OCaml
+
+-------------------------------------------------------------------
+Mon Jul 17 12:48:58 UTC 2017 - ohering@suse.de
+
+- Wrap specfile conditionals to fix quilt setup
+
+-------------------------------------------------------------------
+Mon Jul 17 10:48:58 UTC 2017 - ohering@suse.de
+
+- Remove autodeps for pre openSUSE 12.1 releases
+
 -------------------------------------------------------------------
 Mon May 23 20:02:46 UTC 2016 - ohering@suse.de
 

ocaml-pcre.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package ocaml-pcre
 #
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Andrew Psaltis <ampsaltis at gmail.com>
 #
 # All modifications and additions to the file contributed by third parties
@@ -19,31 +19,26 @@
 
 Name:           ocaml-pcre
 Version:        7.2.3
-%{ocaml_preserve_bytecode}
 Release:        0
+%{?ocaml_preserve_bytecode}
 Summary:        Perl compatibility regular expressions (PCRE) for OCaml
 License:        LGPL-2.0
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 
 Url:            http://mmottl.github.io/pcre-ocaml/
 # https://github.com/mmottl/pcre-ocaml/releases/download/v%{version}/pcre-ocaml-%{version}.tar.gz
 Source0:        pcre-ocaml-%{version}.tar.xz
 Patch0:         ocaml-pcre-warnings.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-# ocaml autodep start for pkg: ocaml-pcre
-# hardcoded rpm dependency for pre 12.1 to compensate for lack of ocaml() provides/requires
-%if 0%{?suse_version} < 1210
-Requires:       ocaml-runtime
-%endif
-# ocaml autodep end for pkg: ocaml-pcre
 
 BuildRequires:  gawk
 BuildRequires:  ocaml >= 3.10.2
 BuildRequires:  ocaml-oasis
 BuildRequires:  ocaml-ocamldoc
 BuildRequires:  ocaml-rpm-macros >= 4.03
+BuildRequires:  pkg-config
 BuildRequires:  ocamlfind(bytes)
-BuildRequires:  pcre-devel
+BuildRequires:  pkgconfig(libpcre)
 
 %description
 Perl compatibile regular expressions (PCRE) for OCaml.
@@ -51,7 +46,7 @@ Perl compatibile regular expressions (PCRE) for OCaml.
 
 %package        devel
 Summary:        Development files for %{name}
-Group:          Development/Libraries/Other
+Group:          Development/Languages/OCaml
 Requires:       %{name} = %{version}
 Requires:       pcre-devel
 
@@ -65,6 +60,14 @@ developing applications that use %{name}.
 %patch0 -p1
 
 %build
+sed -i~ "
+s@\(.*\)\(CCOpt:\)\(.*\)\$@\1\2 %{optflags} -fPIC `pkg-config --cflags libpcre`@
+s@\(.*\)\(CCLib:\)\(.*\)\$@\1\2 `pkg-config --libs libpcre`@
+" _oasis
+if diff -u _oasis~ _oasis
+then
+  exit 1
+fi
 %oasis_setup
 %ocaml_oasis_configure --enable-docs
 %ocaml_oasis_build
@@ -75,7 +78,7 @@ developing applications that use %{name}.
 #
 mkdir -vp %{buildroot}/etc/ld.so.conf.d/
 tee %{buildroot}/etc/ld.so.conf.d/%{name}.conf <<_EOF_
-%{_libdir}/ocaml/stublibs
+%{_libdir}/ocaml/pcre
 _EOF_
 #
 
@@ -89,7 +92,7 @@ _EOF_
 /etc/ld.so.conf.d/*.conf
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmxs
 %endif
 %{_libdir}/ocaml/*/*.so
@@ -100,7 +103,7 @@ _EOF_
 %dir %{_libdir}/ocaml
 %dir %{_libdir}/ocaml/*
 %{_libdir}/ocaml/*/*.a
-%if %{ocaml_native_compiler}
+%if 0%{?ocaml_native_compiler}
 %{_libdir}/ocaml/*/*.cmx
 %{_libdir}/ocaml/*/*.cmxa
 %endif