commit ocaml-obuild for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-obuild for openSUSE:Factory checked in at 2019-11-11 21:31:49 Comparing /work/SRC/openSUSE:Factory/ocaml-obuild (Old) and /work/SRC/openSUSE:Factory/.ocaml-obuild.new.2990 (New) Package is "ocaml-obuild" Mon Nov 11 21:31:49 2019 rev:4 rq:747334 version:0.1.10 Changes: --- /work/SRC/openSUSE:Factory/ocaml-obuild/ocaml-obuild.changes 2019-03-22 15:09:44.613371179 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-obuild.new.2990/ocaml-obuild.changes 2019-11-11 21:31:50.448267860 +0100 @@ -1,0 +2,6 @@ +Fri Nov 1 12:34:56 UTC 2019 - oher...@suse.de + +- Use _service file +- Require ocaml.opt + +--- Old: ocaml-obuild-0.1.10.tar.gz New: _service ocaml-obuild-0.1.10.tar.xz Other differences: -- ++ ocaml-obuild.spec ++ --- /var/tmp/diff_new_pack.LzSiy2/_old 2019-11-11 21:31:51.044268493 +0100 +++ /var/tmp/diff_new_pack.LzSiy2/_new 2019-11-11 21:31:51.068268519 +0100 @@ -23,17 +23,12 @@ Summary:Package build system for OCaml License:BSD-2-Clause Group: Development/Languages/OCaml - URL:https://github.com/ocaml-obuild/obuild -Source0: https://github.com/ocaml-obuild/obuild/archive/obuild-v%{version}/%{name}-%{version}.tar.gz - +Source0:%{name}-%{version}.tar.xz # Enable reproducible builds. Already applied upstream. Patch0: https://github.com/ocaml-obuild/obuild/commit/b40c69380f724933c462ede4b926e3c4f4182d09.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-build - BuildRequires: help2man -BuildRequires: ocaml +BuildRequires: ocaml(ocaml.opt) BuildRequires: ocaml-rpm-macros %description @@ -45,8 +40,7 @@ %prep -%setup -q -n obuild-obuild-v%{version} -%patch0 -p1 +%autosetup -p1 %build ./bootstrap @@ -72,7 +66,6 @@ dist/build/obuild-simple/obuild-simple %files -%defattr(-,root,root,-) %doc README.md OBUILD_SPEC.md DESIGN.md %license LICENSE %{_bindir}/* ++ _service ++ ocaml-obuild 6d2eb3ce5a7e7622920a14c75b9db08c8b3da8bd git disable https://github.com/ocaml-obuild/obuild.git 0.1.10 *.tar xz
commit ocaml-obuild for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-obuild for openSUSE:Factory checked in at 2019-03-22 15:09:36 Comparing /work/SRC/openSUSE:Factory/ocaml-obuild (Old) and /work/SRC/openSUSE:Factory/.ocaml-obuild.new.25356 (New) Package is "ocaml-obuild" Fri Mar 22 15:09:36 2019 rev:3 rq:687319 version:0.1.10 Changes: --- /work/SRC/openSUSE:Factory/ocaml-obuild/ocaml-obuild.changes 2018-07-13 10:20:59.642429813 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-obuild.new.25356/ocaml-obuild.changes 2019-03-22 15:09:44.613371179 +0100 @@ -1,0 +2,8 @@ +Thu Mar 21 12:51:03 UTC 2019 - a...@onthewings.net + +- Update to 0.1.10: + * Parse warning in META file. +- Add b40c69380f724933c462ede4b926e3c4f4182d09.patch to enable + reproducible builds (bsc#1087961). + +--- Old: ocaml-obuild-0.1.9.tar.gz New: b40c69380f724933c462ede4b926e3c4f4182d09.patch ocaml-obuild-0.1.10.tar.gz Other differences: -- ++ ocaml-obuild.spec ++ --- /var/tmp/diff_new_pack.6UWRnP/_old 2019-03-22 15:09:45.173370695 +0100 +++ /var/tmp/diff_new_pack.6UWRnP/_new 2019-03-22 15:09:45.173370695 +0100 @@ -1,7 +1,7 @@ # # spec file for package ocaml-obuild # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,8 +15,9 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: ocaml-obuild -Version:0.1.9 +Version:0.1.10 Release:0 %{?ocaml_preserve_bytecode} Summary:Package build system for OCaml @@ -25,10 +26,14 @@ URL:https://github.com/ocaml-obuild/obuild Source0: https://github.com/ocaml-obuild/obuild/archive/obuild-v%{version}/%{name}-%{version}.tar.gz + +# Enable reproducible builds. Already applied upstream. +Patch0: https://github.com/ocaml-obuild/obuild/commit/b40c69380f724933c462ede4b926e3c4f4182d09.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: ocaml BuildRequires: help2man +BuildRequires: ocaml BuildRequires: ocaml-rpm-macros %description @@ -41,12 +46,11 @@ %prep %setup -q -n obuild-obuild-v%{version} - +%patch0 -p1 %build ./bootstrap - %install mkdir -p %{buildroot}/%{_bindir} cp "dist/build/obuild/obuild" "dist/build/obuild-simple/obuild-simple" "%{buildroot}/%{_bindir}" @@ -67,7 +71,6 @@ --no-info \ dist/build/obuild-simple/obuild-simple - %files %defattr(-,root,root,-) %doc README.md OBUILD_SPEC.md DESIGN.md @@ -75,5 +78,4 @@ %{_bindir}/* %{_mandir}/man1/*.1* - %changelog ++ b40c69380f724933c462ede4b926e3c4f4182d09.patch ++ >From b5d17ea03601af1519d2f7a51d9fcee28283e0dc Mon Sep 17 00:00:00 2001 From: Andy Li Date: Tue, 19 Mar 2019 22:39:11 +0800 Subject: [PATCH] Always sort readdir results in order to get reproducible builds. (#175) --- ext/filesystem.ml | 30 ++ obuild/project.ml | 2 +- 2 files changed, 7 insertions(+), 25 deletions(-) diff --git a/ext/filesystem.ml b/ext/filesystem.ml index 1a9412a..5914d8c 100644 --- a/ext/filesystem.ml +++ b/ext/filesystem.ml @@ -33,17 +33,9 @@ let removeDirContent wpath = let removeDir path = removeDirContent path; Unix.rmdir (fp_to_string path); () let iterate f path = -let dirhandle = Unix.opendir (fp_to_string path) in -(try -while true do -let ent = Unix.readdir dirhandle in -if ent <> ".." && ent <> "." -then f (fn ent) -done; -with End_of_file -> -() -); -Unix.closedir dirhandle; +let entries = Sys.readdir (fp_to_string path) in +Array.fast_sort String.compare entries; +Array.iter (fun ent -> f (fn ent)) entries; () (* list directory entry with a map function included for efficiency *) @@ -62,19 +54,9 @@ let list_dir_pred (p : filename -> bool) path : filename list = let list_dir = list_dir_pred (const true) let list_dir_path_pred p path = -let accum = ref [] in -let dirhandle = Unix.opendir (fp_to_string path) in -(try -while true do -let ent = Unix.readdir dirhandle in -if ent <> ".." && p ent -then accum := (path fn ent) :: !accum -done; -with End_of_file -> -() -); -Unix.closedir dirhandle; -!accum +let entries = List.filter p (Array.to_list (Sys.readdir (fp_to_string path))) in +let sorted = List.fast_sort String.compare entries in +List.map (fun ent -> path
commit ocaml-obuild for openSUSE:Factory
Hello community, here is the log from the commit of package ocaml-obuild for openSUSE:Factory checked in at 2018-07-13 10:20:11 Comparing /work/SRC/openSUSE:Factory/ocaml-obuild (Old) and /work/SRC/openSUSE:Factory/.ocaml-obuild.new (New) Package is "ocaml-obuild" Fri Jul 13 10:20:11 2018 rev:2 rq:620956 version:0.1.9 Changes: --- /work/SRC/openSUSE:Factory/ocaml-obuild/ocaml-obuild.changes 2018-04-01 17:26:29.619590889 +0200 +++ /work/SRC/openSUSE:Factory/.ocaml-obuild.new/ocaml-obuild.changes 2018-07-13 10:20:59.642429813 +0200 @@ -1,0 +2,6 @@ +Fri Mar 9 16:31:56 UTC 2018 - jeng...@inai.de + +- Trim filler wording from descriptions. +- Replace old $RPM_* shell vars by macros. + +--- Other differences: -- ++ ocaml-obuild.spec ++ --- /var/tmp/diff_new_pack.CgGdEI/_old 2018-07-13 10:21:00.006430247 +0200 +++ /var/tmp/diff_new_pack.CgGdEI/_new 2018-07-13 10:21:00.006430247 +0200 @@ -19,7 +19,7 @@ Version:0.1.9 Release:0 %{?ocaml_preserve_bytecode} -Summary:Simple package build system for OCaml +Summary:Package build system for OCaml License:BSD-2-Clause Group: Development/Languages/OCaml @@ -33,8 +33,6 @@ %description A parallel, incremental and declarative build system for OCaml. -The goal is to make a very simple build system for users and developers of -OCaml libraries and programs. Obuild acts as a building black box: users only declare what they want to build and with which sources; the build system will consistently build it. The design is based on Haskell's Cabal and borrows most of the layout and @@ -50,19 +48,19 @@ %install -mkdir -p $RPM_BUILD_ROOT%{_bindir} -cp "dist/build/obuild/obuild" "dist/build/obuild-simple/obuild-simple" "$RPM_BUILD_ROOT%{_bindir}" +mkdir -p %{buildroot}/%{_bindir} +cp "dist/build/obuild/obuild" "dist/build/obuild-simple/obuild-simple" "%{buildroot}/%{_bindir}" # generate manpages -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 +mkdir -p %{buildroot}/%{_mandir}/man1 help2man \ ---output "$RPM_BUILD_ROOT%{_mandir}/man1/obuild.1" \ +--output "%{buildroot}/%{_mandir}/man1/obuild.1" \ --name "parallel, incremental and declarative build system for OCaml" \ --help-option "" \ --no-discard-stderr \ --no-info \ dist/build/obuild/obuild help2man \ ---output "$RPM_BUILD_ROOT%{_mandir}/man1/obuild-simple.1" \ +--output "%{buildroot}/%{_mandir}/man1/obuild-simple.1" \ --name "simple package build system for OCaml" \ --version-string " " \ --no-discard-stderr \