From 5044cf6abe1f5a2e4af09e88bcd43d2df1622337cf2545aa3f3fbde96d569a82 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 23 Sep 2019 18:00:24 +0000 Subject: [PATCH 01/11] - Update to upstream version 1.8.1 Adapted to upcoming ocaml-4.09. New API Findlib.list_packages' can specify a package prefix. Fix reinstallation of "num" for OCaml-4.06. Fix build with OCaml-4.07. The installation of graphics/META is now optional. Fix "ocamlfind query -d". The environment variable OCAMLFIND_IGNORE_DUPS_IN is now interpreted as a list of directories. Packages for "ocamlfind query" may now be separated by commas, too. New "warning" property for packages. Forgetting to pass -thread/-vmthread only prints a warning now, but doesn't stop the build. For dealing with case-sensitive filesystems it is now only tried to match ASCII characters, but not encoding-dependent characters. OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=73 --- findlib-1.7.3.tar.xz | 3 --- findlib-1.8.1.tar.xz | 3 +++ ocaml-findlib.changes | 16 ++++++++++++++++ ocaml-findlib.spec | 8 +++----- 4 files changed, 22 insertions(+), 8 deletions(-) delete mode 100644 findlib-1.7.3.tar.xz create mode 100644 findlib-1.8.1.tar.xz diff --git a/findlib-1.7.3.tar.xz b/findlib-1.7.3.tar.xz deleted file mode 100644 index 1a9892d..0000000 --- a/findlib-1.7.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cabb6cd484380e41fb20bf5ec6acc65d20769363754a73c74951dd4238b20111 -size 159972 diff --git a/findlib-1.8.1.tar.xz b/findlib-1.8.1.tar.xz new file mode 100644 index 0000000..72e79e0 --- /dev/null +++ b/findlib-1.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a34d0412b8bf34e08155fa4cdb635066d91de569fd644d2e26c00ee4768d81e6 +size 161420 diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 41f99db..7e99101 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de + +- Update to upstream version 1.8.1 + Adapted to upcoming ocaml-4.09. + New API Findlib.list_packages' can specify a package prefix. + Fix reinstallation of "num" for OCaml-4.06. + Fix build with OCaml-4.07. + The installation of graphics/META is now optional. + Fix "ocamlfind query -d". + The environment variable OCAMLFIND_IGNORE_DUPS_IN is now interpreted as a list of directories. + Packages for "ocamlfind query" may now be separated by commas, too. + New "warning" property for packages. + Forgetting to pass -thread/-vmthread only prints a warning now, but doesn't stop the build. + For dealing with case-sensitive filesystems it is now only tried to match ASCII characters, but not encoding-dependent characters. + ------------------------------------------------------------------- Thu Aug 22 13:24:21 UTC 2019 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 263ae1f..b966d04 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -18,7 +18,7 @@ Name: ocaml-findlib -Version: 1.7.3 +Version: 1.8.1 Release: 0 %{?ocaml_preserve_bytecode} Summary: Objective CAML package manager and build helper @@ -94,8 +94,8 @@ make install prefix=$RPM_BUILD_ROOT rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %files -%defattr(-,root,root,-) -%doc LICENSE doc/README +%doc doc/README +%license LICENSE %{_libdir}/ocaml/ocamlfind.conf %{_bindir}/* %{_mandir}/man?/* @@ -117,7 +117,6 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %endif %files devel -%defattr(-,root,root,-) %doc LICENSE doc/README doc/guide-html %{_libdir}/ocaml/*/Makefile.config # @@ -135,7 +134,6 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %{_libdir}/ocaml/*/*.mli %files camlp4 -%defattr(-,root,root,-) %dir %{_libdir}/ocaml %dir %{_libdir}/ocaml/camlp4 %{_libdir}/ocaml/camlp4/META From 810c23b247e3ecc2abbfc84a1b5cf0c63cd558a1b747e02e963f4d5580d7b4d4 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Mon, 23 Sep 2019 18:44:24 +0000 Subject: [PATCH 02/11] - Merge the camlp4 subpackage into the devel package because camlp4 will disappear with ocaml 4.09 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=74 --- ocaml-findlib.changes | 2 ++ ocaml-findlib.spec | 56 +++++++++++++++++-------------------------- 2 files changed, 24 insertions(+), 34 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 7e99101..1182b93 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -13,6 +13,8 @@ Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de New "warning" property for packages. Forgetting to pass -thread/-vmthread only prints a warning now, but doesn't stop the build. For dealing with case-sensitive filesystems it is now only tried to match ASCII characters, but not encoding-dependent characters. +- Merge the camlp4 subpackage into the devel package because + camlp4 will disappear with ocaml 4.09 ------------------------------------------------------------------- Thu Aug 22 13:24:21 UTC 2019 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index b966d04..510c4f3 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -29,8 +29,6 @@ Url: http://projects.camlcity.org/projects/findlib.html Source0: findlib-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build # -Recommends: ocaml-findlib-camlp4 -# Requires: ocaml-compiler-libs Requires: ocaml-runtime # @@ -57,21 +55,14 @@ libraries in programs and scripts. Summary: Development files for ocaml-findlib Group: Development/Languages/OCaml Requires: %{name} = %{version} +Provides: %{name}-camlp4 = %{version}-%{release} +Obsoletes: %{name}-camlp4 < %{version}-%{release} %description devel The ocaml-findlib-devel package contains libraries and signature files for developing applications that use ocaml-findlib. - -%package camlp4 -Summary: Development files for ocaml-findlib -Group: Development/Languages/OCaml -Requires: ocaml-camlp4-devel - -%description camlp4 -The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4 - %prep %setup -q -n findlib-%{version} @@ -93,38 +84,40 @@ rm doc/guide-html/TIMESTAMP make install prefix=$RPM_BUILD_ROOT rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild -%files +> files +> files.devel + +find $RPM_BUILD_ROOT%{_libdir}/ocaml -name META | \ +sed 's@^%{buildroot}@@' | \ +tee -a files +find $RPM_BUILD_ROOT%{_libdir}/ocaml -type d | \ +sed 's@^%{buildroot}@%%dir @' | \ +tee -a files + +sed -i~ '/\/\(camlp4\|findlib\|num-top\)/{ +w files.devel +d +}' files +diff -u "$_"~ "$_" && exit 2 +cat files.devel + +%files -f files %doc doc/README %license LICENSE %{_libdir}/ocaml/ocamlfind.conf %{_bindir}/* %{_mandir}/man?/* # -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/* -%{_libdir}/ocaml/*/META -# -%exclude %dir %{_libdir}/ocaml/camlp4 -%exclude %dir %{_libdir}/ocaml/findlib -%exclude %dir %{_libdir}/ocaml/num-top -%exclude %{_libdir}/ocaml/camlp4/META -%exclude %{_libdir}/ocaml/findlib/META -%exclude %{_libdir}/ocaml/num-top/META %{_libdir}/ocaml/topfind -%dir %{_libdir}/ocaml/findlib %if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.cmxs %endif -%files devel -%doc LICENSE doc/README doc/guide-html +%files devel -f files.devel +%doc doc/README doc/guide-html %{_libdir}/ocaml/*/Makefile.config # %dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/findlib -%dir %{_libdir}/ocaml/num-top -%{_libdir}/ocaml/findlib/META -%{_libdir}/ocaml/num-top/META %if 0%{?ocaml_native_compiler} %{_libdir}/ocaml/*/*.a %{_libdir}/ocaml/*/*.cmxa @@ -133,9 +126,4 @@ rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild %{_libdir}/ocaml/*/*.cmi %{_libdir}/ocaml/*/*.mli -%files camlp4 -%dir %{_libdir}/ocaml -%dir %{_libdir}/ocaml/camlp4 -%{_libdir}/ocaml/camlp4/META - %changelog From 46b9f471b4b38775ad69184c98f4964fa273b5a2d300bf1cba53bafbbc8f3e2c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 24 Sep 2019 06:17:36 +0000 Subject: [PATCH 03/11] Conditional Requires ocaml-camlp4-devel OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=75 --- ocaml-findlib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 510c4f3..6984067 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -57,6 +57,7 @@ Group: Development/Languages/OCaml Requires: %{name} = %{version} Provides: %{name}-camlp4 = %{version}-%{release} Obsoletes: %{name}-camlp4 < %{version}-%{release} +%{expand:%(if test -x "$(type -P camlp4)" ; then echo 'Requires: ocaml-camlp4-devel' ; fi)} %description devel The ocaml-findlib-devel package contains libraries and signature files From 8f5151c572f27c5a282c86759947e31fd73613b751fcbeea538f8a414f3b117f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 1 Oct 2019 06:42:41 +0000 Subject: [PATCH 04/11] -- Merge the camlp4 subpackage into the devel package because - camlp4 will disappear with ocaml 4.09 OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=76 --- ocaml-findlib.changes | 2 -- ocaml-findlib.spec | 71 +++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 39 deletions(-) diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 1182b93..7e99101 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -13,8 +13,6 @@ Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de New "warning" property for packages. Forgetting to pass -thread/-vmthread only prints a warning now, but doesn't stop the build. For dealing with case-sensitive filesystems it is now only tried to match ASCII characters, but not encoding-dependent characters. -- Merge the camlp4 subpackage into the devel package because - camlp4 will disappear with ocaml 4.09 ------------------------------------------------------------------- Thu Aug 22 13:24:21 UTC 2019 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 6984067..ee80a0e 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -37,11 +37,11 @@ Provides: ocamlfind = %{version} BuildRequires: gawk BuildRequires: m4 BuildRequires: ncurses-devel -BuildRequires: ocaml >= 4.02.0 -BuildRequires: ocaml-camlp4-devel >= 4.02.0 +BuildRequires: ocaml +BuildRequires: ocaml-camlp4-devel BuildRequires: ocaml-ocamlbuild BuildRequires: ocaml-ocamldoc -BuildRequires: ocaml-rpm-macros >= 4.02.1 +BuildRequires: ocaml-rpm-macros >= 20190930 %description Findlib is a library manager for Objective Caml. It provides a @@ -55,14 +55,18 @@ libraries in programs and scripts. Summary: Development files for ocaml-findlib Group: Development/Languages/OCaml Requires: %{name} = %{version} -Provides: %{name}-camlp4 = %{version}-%{release} -Obsoletes: %{name}-camlp4 < %{version}-%{release} -%{expand:%(if test -x "$(type -P camlp4)" ; then echo 'Requires: ocaml-camlp4-devel' ; fi)} %description devel The ocaml-findlib-devel package contains libraries and signature files for developing applications that use ocaml-findlib. +%package camlp4 +Summary: Development files for ocaml-findlib +Group: Development/Languages/OCaml +Requires: ocaml-camlp4-devel + +%description camlp4 +The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4 %prep %setup -q -n findlib-%{version} @@ -82,49 +86,42 @@ make opt rm doc/guide-html/TIMESTAMP %install -make install prefix=$RPM_BUILD_ROOT -rm -rfv $RPM_BUILD_ROOT%{_libdir}/ocaml/ocamlbuild +make install prefix=%{buildroot} +rm -rfv %{buildroot}%{_libdir}/ocaml/ocamlbuild +%ocaml_create_file_list -> files -> files.devel - -find $RPM_BUILD_ROOT%{_libdir}/ocaml -name META | \ -sed 's@^%{buildroot}@@' | \ -tee -a files -find $RPM_BUILD_ROOT%{_libdir}/ocaml -type d | \ -sed 's@^%{buildroot}@%%dir @' | \ -tee -a files - -sed -i~ '/\/\(camlp4\|findlib\|num-top\)/{ -w files.devel +cp %{name}.files %{name}.files.prev +# camlp4 support nee +sed -i~ ' +/\/camlp4/ { +w %{name}.files.camlp4 d -}' files +} +/\/findlib/ { +b +} +/\/num-top/ { +b +} +w %{name}.files.x +d +' %{name}.files.devel diff -u "$_"~ "$_" && exit 2 -cat files.devel +tee -a %{name}.files < %{name}.files.x -%files -f files +%files -f %{name}.files %doc doc/README %license LICENSE %{_libdir}/ocaml/ocamlfind.conf +%{_libdir}/ocaml/topfind %{_bindir}/* %{_mandir}/man?/* # -%{_libdir}/ocaml/topfind -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.cmxs -%endif -%files devel -f files.devel +%files devel -f %{name}.files.devel %doc doc/README doc/guide-html %{_libdir}/ocaml/*/Makefile.config -# -%dir %{_libdir}/ocaml -%if 0%{?ocaml_native_compiler} -%{_libdir}/ocaml/*/*.a -%{_libdir}/ocaml/*/*.cmxa -%endif -%{_libdir}/ocaml/*/*.cma -%{_libdir}/ocaml/*/*.cmi -%{_libdir}/ocaml/*/*.mli + +%files camlp4 -f %{name}.files.camlp4 %changelog From fb24c0bd931d9c63ced29292a3ffb4bddd780b2c61c4356d7bbd1032c382ce0f Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Tue, 1 Oct 2019 06:43:30 +0000 Subject: [PATCH 05/11] -dbg OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=77 --- ocaml-findlib.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index ee80a0e..dcf88fd 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -90,7 +90,6 @@ make install prefix=%{buildroot} rm -rfv %{buildroot}%{_libdir}/ocaml/ocamlbuild %ocaml_create_file_list -cp %{name}.files %{name}.files.prev # camlp4 support nee sed -i~ ' /\/camlp4/ { From 134cfb78fdcada2aca957089df68372a9bcabf2c80d3d5f93b0d642f02abce76 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 2 Oct 2019 18:00:00 +0000 Subject: [PATCH 06/11] - Move to github, use _service file OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=78 --- _service | 14 ++++++++++++++ findlib-1.8.1.tar.xz | 3 --- ocaml-findlib.changes | 5 +++++ ocaml-findlib.spec | 6 +++--- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 _service delete mode 100644 findlib-1.8.1.tar.xz diff --git a/_service b/_service new file mode 100644 index 0000000..e41914a --- /dev/null +++ b/_service @@ -0,0 +1,14 @@ + + + https://github.com/ocaml/ocamlfind.git + git + 1.8.1 + findlib-1.8.1 + ocaml-findlib + + + *.tar + xz + + + diff --git a/findlib-1.8.1.tar.xz b/findlib-1.8.1.tar.xz deleted file mode 100644 index 72e79e0..0000000 --- a/findlib-1.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a34d0412b8bf34e08155fa4cdb635066d91de569fd644d2e26c00ee4768d81e6 -size 161420 diff --git a/ocaml-findlib.changes b/ocaml-findlib.changes index 7e99101..4f81be2 100644 --- a/ocaml-findlib.changes +++ b/ocaml-findlib.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 17:59:21 UTC 2019 - ohering@suse.de + +- Move to github, use _service file + ------------------------------------------------------------------- Mon Sep 23 16:35:39 UTC 2019 - ohering@suse.de diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index dcf88fd..b237706 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -25,8 +25,8 @@ Summary: Objective CAML package manager and build helper License: MIT Group: Development/Languages/OCaml -Url: http://projects.camlcity.org/projects/findlib.html -Source0: findlib-%{version}.tar.xz +Url: https://github.com/ocaml/ocamlfind +Source0: %{name}-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build # Requires: ocaml-compiler-libs @@ -69,7 +69,7 @@ Requires: ocaml-camlp4-devel The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4 %prep -%setup -q -n findlib-%{version} +%autosetup -p1 %build (cd tools/extract_args && make) From 4967c37fbbd0c74ff046b06682dab76b612d747bca68b6ac3fbb226a72a64f9e Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Wed, 2 Oct 2019 18:00:39 +0000 Subject: [PATCH 07/11] A ocaml-findlib-1.8.1.tar.xz OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=79 --- ocaml-findlib-1.8.1.tar.xz | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 ocaml-findlib-1.8.1.tar.xz diff --git a/ocaml-findlib-1.8.1.tar.xz b/ocaml-findlib-1.8.1.tar.xz new file mode 100644 index 0000000..50e9b0e --- /dev/null +++ b/ocaml-findlib-1.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff4746e82799e6a4007e04927d9456af0429040ea8a675306f7372d2cb940a81 +size 133764 From f69532a7441f0615fc7b9e653e1c182a38a7344805ca4de4d541ab344f1aaa9a Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 3 Oct 2019 18:47:21 +0000 Subject: [PATCH 08/11] fix OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=80 --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index b237706..abccb0c 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -83,7 +83,7 @@ make all %if 0%{?ocaml_native_compiler} make opt %endif -rm doc/guide-html/TIMESTAMP +rm -fv doc/guide-html/TIMESTAMP %install make install prefix=%{buildroot} From e118a732ae30f790b33ee1354fe2c65c41ea10f401adf303cd7ed17dc40fab00 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Thu, 3 Oct 2019 19:32:04 +0000 Subject: [PATCH 09/11] fix OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=81 --- ocaml-findlib.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index abccb0c..586365d 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -109,7 +109,6 @@ diff -u "$_"~ "$_" && exit 2 tee -a %{name}.files < %{name}.files.x %files -f %{name}.files -%doc doc/README %license LICENSE %{_libdir}/ocaml/ocamlfind.conf %{_libdir}/ocaml/topfind @@ -118,7 +117,6 @@ tee -a %{name}.files < %{name}.files.x # %files devel -f %{name}.files.devel -%doc doc/README doc/guide-html %{_libdir}/ocaml/*/Makefile.config %files camlp4 -f %{name}.files.camlp4 From d4bdd43cc9d875db207ec475e54e3dc9c8bd75ab9b646d9ae8d3334ad0e81eb5 Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 4 Oct 2019 05:16:11 +0000 Subject: [PATCH 10/11] restore release tar with man pages OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=82 --- findlib-1.8.1.tar.xz | 3 +++ ocaml-findlib-1.8.1.tar.xz | 3 --- ocaml-findlib.spec | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) create mode 100644 findlib-1.8.1.tar.xz delete mode 100644 ocaml-findlib-1.8.1.tar.xz diff --git a/findlib-1.8.1.tar.xz b/findlib-1.8.1.tar.xz new file mode 100644 index 0000000..72e79e0 --- /dev/null +++ b/findlib-1.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a34d0412b8bf34e08155fa4cdb635066d91de569fd644d2e26c00ee4768d81e6 +size 161420 diff --git a/ocaml-findlib-1.8.1.tar.xz b/ocaml-findlib-1.8.1.tar.xz deleted file mode 100644 index 50e9b0e..0000000 --- a/ocaml-findlib-1.8.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff4746e82799e6a4007e04927d9456af0429040ea8a675306f7372d2cb940a81 -size 133764 diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 586365d..556855c 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -26,7 +26,7 @@ License: MIT Group: Development/Languages/OCaml Url: https://github.com/ocaml/ocamlfind -Source0: %{name}-%{version}.tar.xz +Source0: findlib-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build # Requires: ocaml-compiler-libs @@ -34,7 +34,6 @@ Requires: ocaml-runtime # Provides: ocamlfind = %{version} -BuildRequires: gawk BuildRequires: m4 BuildRequires: ncurses-devel BuildRequires: ocaml From 68260dc8144e78be617e535bc4a14094e84e1fb39e0d02ccbb689892bbb0262c Mon Sep 17 00:00:00 2001 From: Olaf Hering Date: Fri, 4 Oct 2019 05:19:02 +0000 Subject: [PATCH 11/11] fix OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=83 --- ocaml-findlib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ocaml-findlib.spec b/ocaml-findlib.spec index 556855c..e14b4da 100644 --- a/ocaml-findlib.spec +++ b/ocaml-findlib.spec @@ -68,7 +68,7 @@ Requires: ocaml-camlp4-devel The ocaml-findlib-camlp4 contains signature files for developing applications that use camlp4 %prep -%autosetup -p1 +%autosetup -p1 -n findlib-%{version} %build (cd tools/extract_args && make)