Architecture specific change in rpms/ocaml-fileutils.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-fileutils.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-fileutils.git/commit/?id=a9....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit a9e8600c632dad4490ed5b46d443acef02856897
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 8 17:24:31 2017 +0000
New upstream version 0.5.2.
OCaml 4.06.0 rebuild.
diff --git a/.gitignore b/.gitignore
index ea02671..384150d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ocaml-fileutils-0.4.0.tar.gz
/ocaml-fileutils-0.4.4.tar.gz
/ocaml-fileutils-0.4.5.tar.gz
/ocaml-fileutils-0.5.1.tar.gz
+/ocaml-fileutils-0.5.2.tar.gz
diff --git a/ocaml-fileutils.spec b/ocaml-fileutils.spec
index 156503c..9862385 100644
--- a/ocaml-fileutils.spec
+++ b/ocaml-fileutils.spec
@@ -1,16 +1,11 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if ! %opt
-%global debug_package %{nil}
-%endif
-
Name: ocaml-fileutils
-Version: 0.5.1
-Release: 9%{?dist}
+Version: 0.5.2
+Release: 1%{?dist}
Summary: OCaml library for common file and filename operations
License: LGPLv2 with exceptions
URL: https://forge.ocamlcore.org/projects/ocaml-fileutils/
-Source0: http://forge.ocamlcore.org/frs/download.php/1651/ocaml-fileutils-0.5.1.ta...
+Source0: http://forge.ocamlcore.org/frs/download.php/1695/ocaml-fileutils-0.5.2.ta...
BuildRequires: ocaml >= 4.00.1
BuildRequires: ocaml-findlib-devel >= 1.3.3-3
@@ -74,7 +69,7 @@ make test
%files
%doc COPYING.txt
%{_libdir}/ocaml/fileutils
-%if %opt
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/fileutils/*.a
%exclude %{_libdir}/ocaml/fileutils/*.cmx
%exclude %{_libdir}/ocaml/fileutils/*.cmxa
@@ -85,7 +80,7 @@ make test
%files devel
%doc COPYING.txt AUTHORS.txt CHANGELOG.txt README.txt TODO.txt
-%if %opt
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/fileutils/*.a
%{_libdir}/ocaml/fileutils/*.cmx
%{_libdir}/ocaml/fileutils/*.cmxa
@@ -95,7 +90,8 @@ make test
%changelog
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.5.1-9
+* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.5.2-1
+- New upstream version 0.5.2.
- OCaml 4.06.0 rebuild.
* Mon Aug 07 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.5.1-8
diff --git a/sources b/sources
index a36731d..23e4068 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2fe185bbce4357eb5fba1dfc0b3e63c5 ocaml-fileutils-0.5.1.tar.gz
+SHA512 (ocaml-fileutils-0.5.2.tar.gz) = 264282c54ff693686ca9e60f371038f8ea9bce219d04556297dc7b6028c9f65c5a03b7cd263c3519cb212e29665200db1c95c88874bb2cb3d7b610e3b832018d
6 years, 6 months
Architecture specific change in rpms/ocaml-camomile.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-camomile.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-camomile.git/commit/?id=657....
Change:
+%ifarch %{power64}
Thanks.
Full change:
============
commit 65788eb6b1b29f871cec99d23d4c3c937bbe74e5
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 8 17:10:33 2017 +0000
Move to camomile 0.8.6.
diff --git a/.gitignore b/.gitignore
index 443135d..3205553 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ camomile-0.7.2.tar.bz2
/camomile-0.8.3.tar.bz2
/camomile-0.8.5.tar.bz2
/camomile-3f4d657d.tar.gz
+/camomile-0.8.6.tar.gz
diff --git a/camomile-0.8.3-enable-debug.patch b/camomile-0.8.3-enable-debug.patch
deleted file mode 100644
index 007c83d..0000000
--- a/camomile-0.8.3-enable-debug.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- camomile-0.8.3/Makefile.in.old 2013-09-14 07:39:54.498539889 +0100
-+++ camomile-0.8.3/Makefile.in 2013-09-14 07:40:02.920552224 +0100
-@@ -65,7 +65,7 @@
- SUBDIR = -I internal -I public -I toolslib -I .
- INCLUDES = $(SUBDIR)
- BFLAGS = $(BOPTIONS) $(INCLUDES)
--OFLAGS = $(OOPTIONS) $(INCLUDES)
-+OFLAGS = $(OOPTIONS) $(INCLUDES) -g
-
- # Generic targets
- #################
diff --git a/ocaml-camomile.spec b/ocaml-camomile.spec
index dc0ae72..79e28b1 100644
--- a/ocaml-camomile.spec
+++ b/ocaml-camomile.spec
@@ -1,11 +1,6 @@
-# Currently building git releases from
-# https://github.com/yoriyuki/Camomile
-%global commit 3f4d657d50c17213f3338ca75efb30d728704df3
-%global shortcommit 3f4d657d
-
Name: ocaml-camomile
Version: 0.8.6
-Release: 0.4.git%{shortcommit}%{?dist}
+Release: 2%{?dist}
Summary: Unicode library for OCaml
# Several files are MIT and UCD licensed, but the overall work is LGPLv2+
@@ -13,19 +8,14 @@ Summary: Unicode library for OCaml
# https://www.redhat.com/archives/fedora-legal-list/2008-March/msg00005.html
License: LGPLv2+
URL: https://github.com/yoriyuki/Camomile
-Source0: https://github.com/yoriyuki/Camomile/archive/%{commit}/camomile-%{shortco...
-
-# Use ocamlopt -g option to enable debuginfo.
-Patch1: camomile-0.8.3-enable-debug.patch
+Source0: https://github.com/yoriyuki/Camomile/archive/rel-%{version}/camomile-%{ve...
BuildRequires: ocaml >= 3.12.1-12
BuildRequires: ocaml-findlib-devel
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-camlp4-devel
BuildRequires: ocaml-cppo
-
-# While we are building from git pre-releases we must run autoconf.
-BuildRequires: autoconf
+BuildRequires: jbuilder
# The base package requires the data files. Note that it is possible
# to install the data files on their own to support other packages
@@ -61,39 +51,39 @@ applications that use %{name}.
%prep
-%setup -q -n Camomile-%{commit}
-cd Camomile
-
-%patch1 -p1
-
-autoconf
+%setup -q -n Camomile-rel-%{version}
%build
-cd Camomile
-# Parallel builds don't work.
-unset MAKEFLAGS
-./configure --prefix=%{_prefix} --datadir=%{_datadir} --libdir=%{_libdir}
-make
-make dochtml
-make man
+# This avoids a stack overflow in the OCaml 4.05 compiler on POWER only.
+%ifarch %{power64}
+ulimit -Hs 65536
+ulimit -Ss 65536
+%endif
+jbuilder build --verbose
%install
-cd Camomile
+# We have to do this by hand because jbuilder doesn't work.
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-make install
+mkdir -p $RPM_BUILD_ROOT%{_datadir}
+ocamlfind install camomile _build/install/default/lib/camomile/*
+cp -r _build/install/default/share/camomile $RPM_BUILD_ROOT%{_datadir}
%ifarch %{ocaml_native_compiler}
-cp tools/camomilecharmap.opt $RPM_BUILD_ROOT%{_bindir}/camomilecharmap
-cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
+cp _build/default/Camomile/tools/camomilecharmap.exe $RPM_BUILD_ROOT%{_bindir}/camomilecharmap
+cp _build/default/Camomile/tools/camomilelocaledef.exe $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%endif
+%check
+jbuilder runtest
+
+
%files
-%doc Camomile/README
+%doc README
%{_libdir}/ocaml/camomile
%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/camomile/*.a
@@ -108,7 +98,7 @@ cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%files devel
-%doc Camomile/README Camomile/dochtml/*
+%doc README web/dochtml/*
%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/camomile/*.a
%{_libdir}/ocaml/camomile/*.cmxa
@@ -118,20 +108,22 @@ cp tools/camomilelocaledef.opt $RPM_BUILD_ROOT%{_bindir}/camomilelocaledef
%files data
-%doc Camomile/README
+%doc README
%{_datadir}/camomile/
%changelog
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-0.4.git3f4d657d
-- Bump release and rebuild.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-0.3.git3f4d657d
-- Bump release and rebuild.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-0.2.git3f4d657d
+* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-2
- OCaml 4.06.0 rebuild.
+* Tue Oct 17 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-1
+- New upstream version 0.8.6.
+- Switch back to versioned releases.
+- Use new build system.
+- Enable parallel builds.
+- Drop -g patch since that seems to work by default now.
+- Run tests.
+
* Mon Aug 07 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.8.6-0.1
- Build from git releases.
- OCaml 4.05.0 rebuild.
diff --git a/sources b/sources
index 5ee72d5..174e585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (camomile-3f4d657d.tar.gz) = 32141ce1b1ab4d199092838a8fc57341a0c2fab395f4d6530d9e4e28a8dab6fcc85841149ec0f9e614606c78a305f5a1aa862124e447fd67597389b2370b5907
+SHA512 (camomile-0.8.6.tar.gz) = d31d7015640ced3da47055ae3d4d8f868018b63e825e5a208420641aa6515b8753eacaf03f1d26239086d186ee4a293de17e97b634a335bb62eb399708f95353
6 years, 6 months
Architecture specific change in rpms/ocaml-libvirt.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-libvirt.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-libvirt.git/commit/?id=b7b9....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit b7b940a2e83c27e9dfecdb33761db50a6c83081d
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 8 16:55:27 2017 +0000
Fix -safe-string.
diff --git a/0001-Use-safe-string-and-fix-the-library.patch b/0001-Use-safe-string-and-fix-the-library.patch
new file mode 100644
index 0000000..448b08b
--- /dev/null
+++ b/0001-Use-safe-string-and-fix-the-library.patch
@@ -0,0 +1,76 @@
+From bab7f84ade84ceaddb08b6948792d49b3d04b897 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones(a)redhat.com>
+Date: Wed, 8 Nov 2017 16:52:58 +0000
+Subject: [PATCH] Use -safe-string and fix the library.
+
+Note this changes the type of the cpumap from string to bytes,
+since (by the design of the API) it must be mutated.
+---
+ libvirt/Makefile.in | 4 ++--
+ libvirt/libvirt.ml | 10 +++++-----
+ libvirt/libvirt.mli | 6 +++---
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/libvirt/Makefile.in b/libvirt/Makefile.in
+index cf614fc..1eb846b 100644
+--- a/libvirt/Makefile.in
++++ b/libvirt/Makefile.in
+@@ -31,11 +31,11 @@ OCAMLMKLIB = @OCAMLMKLIB@
+
+ ifneq ($(OCAMLFIND),)
+ OCAMLCPACKAGES := -package unix
+-OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3
++OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3 -safe-string
+ OCAMLCLIBS := -linkpkg
+ else
+ OCAMLCINCS :=
+-OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3
++OCAMLCFLAGS := -g -warn-error CDEFLMPSUVYZX-3 -safe-string
+ OCAMLCLIBS := unix.cma
+ endif
+
+diff --git a/libvirt/libvirt.ml b/libvirt/libvirt.ml
+index d03a127..7e1e470 100644
+--- a/libvirt/libvirt.ml
++++ b/libvirt/libvirt.ml
+@@ -92,13 +92,13 @@ struct
+
+ (* See VIR_USE_CPU, VIR_UNUSE_CPU, VIR_CPU_USABLE macros defined in <libvirt.h>. *)
+ let use_cpu cpumap cpu =
+- cpumap.[cpu/8] <-
+- Char.chr (Char.code cpumap.[cpu/8] lor (1 lsl (cpu mod 8)))
++ Bytes.set cpumap (cpu/8)
++ (Char.chr (Char.code (Bytes.get cpumap (cpu/8)) lor (1 lsl (cpu mod 8))))
+ let unuse_cpu cpumap cpu =
+- cpumap.[cpu/8] <-
+- Char.chr (Char.code cpumap.[cpu/8] land (lnot (1 lsl (cpu mod 8))))
++ Bytes.set cpumap (cpu/8)
++ (Char.chr (Char.code (Bytes.get cpumap (cpu/8)) land (lnot (1 lsl (cpu mod 8)))))
+ let cpu_usable cpumaps maplen vcpu cpu =
+- Char.code cpumaps.[vcpu*maplen + cpu/8] land (1 lsl (cpu mod 8)) <> 0
++ Char.code (Bytes.get cpumaps (vcpu*maplen + cpu/8)) land (1 lsl (cpu mod 8)) <> 0
+
+ external set_keep_alive : [>`R] t -> int -> int -> unit = "ocaml_libvirt_connect_set_keep_alive"
+
+diff --git a/libvirt/libvirt.mli b/libvirt/libvirt.mli
+index dc0033b..87f50f5 100644
+--- a/libvirt/libvirt.mli
++++ b/libvirt/libvirt.mli
+@@ -376,11 +376,11 @@ sig
+ CPU map between a single virtual and all physical CPUs of a domain.
+ *)
+
+- val use_cpu : string -> int -> unit
++ val use_cpu : bytes -> int -> unit
+ (** [use_cpu cpumap cpu] marks [cpu] as usable in [cpumap]. *)
+- val unuse_cpu : string -> int -> unit
++ val unuse_cpu : bytes -> int -> unit
+ (** [unuse_cpu cpumap cpu] marks [cpu] as not usable in [cpumap]. *)
+- val cpu_usable : string -> int -> int -> int -> bool
++ val cpu_usable : bytes -> int -> int -> int -> bool
+ (** [cpu_usable cpumaps maplen vcpu cpu] checks returns true iff the
+ [cpu] is usable by [vcpu]. *)
+
+--
+2.13.1
+
diff --git a/ocaml-libvirt.spec b/ocaml-libvirt.spec
index 5e93f51..ae9cdce 100644
--- a/ocaml-libvirt.spec
+++ b/ocaml-libvirt.spec
@@ -1,8 +1,6 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
Name: ocaml-libvirt
Version: 0.6.1.4
-Release: 24%{?dist}
+Release: 25%{?dist}
Summary: OCaml binding for libvirt
License: LGPLv2+
@@ -31,6 +29,9 @@ Patch8: 0003-Add-a-binding-for-virConnectGetAllDomainStats-RHBZ-1.patch
Patch9: 0004-examples-Print-more-stats-in-the-get_all_domain_stat.patch
Patch10: 0005-Change-binding-of-virConnectGetAllDomainStats-to-ret.patch
+# Upstream patch to use -safe-string.
+Patch11: 0001-Use-safe-string-and-fix-the-library.patch
+
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-ocamldoc
BuildRequires: ocaml-findlib-devel
@@ -56,23 +57,13 @@ developing applications that use %{name}.
%prep
%setup -q
-
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%autopatch -p1
%build
%configure
make all doc
-%if %opt
+%ifarch %{ocaml_native_compiler}
make opt
%endif
@@ -83,7 +74,7 @@ export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
-%if %opt
+%ifarch %{ocaml_native_compiler}
make install-opt
%else
make install-byte
@@ -93,7 +84,7 @@ make install-byte
%files
%doc COPYING.LIB README ChangeLog
%{_libdir}/ocaml/libvirt
-%if %opt
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/libvirt/*.a
%exclude %{_libdir}/ocaml/libvirt/*.cmxa
%exclude %{_libdir}/ocaml/libvirt/*.cmx
@@ -105,7 +96,7 @@ make install-byte
%files devel
%doc COPYING.LIB README TODO.libvirt ChangeLog html/*
-%if %opt
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/libvirt/*.a
%{_libdir}/ocaml/libvirt/*.cmxa
%{_libdir}/ocaml/libvirt/*.cmx
@@ -114,11 +105,8 @@ make install-byte
%changelog
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.6.1.4-24
-- Bump release and rebuild.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.6.1.4-23
-- Bump release and rebuild.
+* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.6.1.4-25
+- Fix -safe-string.
* Tue Nov 07 2017 Richard W.M. Jones <rjones(a)redhat.com> - 0.6.1.4-22
- OCaml 4.06.0 rebuild.
6 years, 6 months
Architecture specific change in rpms/ocaml-ocamlnet.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-ocamlnet.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-ocamlnet.git/commit/?id=de3....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit de3a1765bd9de4212e3baa5605692509bb19bdfe
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 8 16:19:36 2017 +0000
New upstream version 4.1.4.
diff --git a/.gitignore b/.gitignore
index b1d57a3..54c1268 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ ocamlnet-2.2.9.tar.gz
/ocamlnet-4.0.4.tar.gz
/ocamlnet-4.1.2.tar.gz
/ocamlnet-4.1.3.tar.gz
+/ocamlnet-4.1.4.tar.gz
diff --git a/ocaml-ocamlnet.spec b/ocaml-ocamlnet.spec
index 09e6405..d9e4a8e 100644
--- a/ocaml-ocamlnet.spec
+++ b/ocaml-ocamlnet.spec
@@ -1,5 +1,3 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-
# Prevent RPM from stripping the binaries & debuginfo.
#
# NB: Only required because this package uses the obsolete -custom
@@ -10,14 +8,16 @@
%global __strip /bin/true
Name: ocaml-ocamlnet
-Version: 4.1.3
-Release: 4%{?dist}
+Version: 4.1.4
+Release: 1%{?dist}
Summary: Network protocols for OCaml
License: BSD
URL: http://projects.camlcity.org/projects/ocamlnet.html
Source0: http://download.camlcity.org/download/ocamlnet-%{version}.tar.gz
+# Non-upstream patch to fix string immutability problems with OCaml 4.06.
+Patch1: ocamlnet-4.1.4-bytes-fixes.patch
BuildRequires: ocaml >= 3.12.1-3
BuildRequires: ocaml-ocamldoc
@@ -111,6 +111,7 @@ files for developing applications that use %{name}-nethttpd.
%prep
%setup -q -n ocamlnet-%{version}
+%autopatch -p1
%build
@@ -131,7 +132,7 @@ unset MAKEFLAGS
make all
-%if %opt
+%ifarch %{ocaml_native_compiler}
make opt
%endif
@@ -175,7 +176,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%{_libdir}/ocaml/rpc-auth-local
%{_libdir}/ocaml/rpc-generator
%{_libdir}/ocaml/shell
-%if %opt
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmxa
%exclude %{_libdir}/ocaml/*/*.cmx
@@ -192,7 +193,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files devel
%doc ChangeLog RELNOTES
-%if %opt
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%{_libdir}/ocaml/*/*.cmx
@@ -204,7 +205,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files nethttpd
%doc ChangeLog RELNOTES
%{_libdir}/ocaml/nethttpd
-%if %opt
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/*/*.a
%exclude %{_libdir}/ocaml/*/*.cmxa
%endif
@@ -213,7 +214,7 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%files nethttpd-devel
%doc ChangeLog RELNOTES
-%if %opt
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/*/*.a
%{_libdir}/ocaml/*/*.cmxa
%endif
@@ -221,11 +222,8 @@ echo -e '-b /usr/bin/netplex-admin\n-b /usr/bin/ocamlrpcgen' \
%changelog
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.1.3-4
-- Bump release and rebuild.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.1.3-3
-- Bump release and rebuild.
+* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.1.4-1
+- New upstream version 4.1.4.
* Tue Nov 07 2017 Richard W.M. Jones <rjones(a)redhat.com> - 4.1.3-2
- OCaml 4.06.0 rebuild.
diff --git a/ocamlnet-4.1.4-bytes-fixes.patch b/ocamlnet-4.1.4-bytes-fixes.patch
new file mode 100644
index 0000000..4c832a0
--- /dev/null
+++ b/ocamlnet-4.1.4-bytes-fixes.patch
@@ -0,0 +1,54 @@
+--- ocamlnet-4.1.4.old/src/netzip/netgzip.ml 2017-08-14 14:16:50.000000000 +0100
++++ ocamlnet-4.1.4/src/netzip/netgzip.ml 2017-11-08 16:24:22.162165338 +0000
+@@ -7,7 +7,6 @@
+ val mutable closed = false
+
+ method input s p l =
+- let s = Bytes.unsafe_to_string s in
+ let n = Gzip.input gzip_ch s p l in
+ if n = 0 then raise End_of_file;
+ n
+@@ -27,7 +26,6 @@
+ class output_gzip_rec gzip_ch : Netchannels.rec_out_channel =
+ object(self)
+ method output s p l =
+- let s = Bytes.unsafe_to_string s in
+ Gzip.output gzip_ch s p l;
+ l
+ method close_out() =
+@@ -156,8 +154,6 @@
+ (fun out_buf out_pos out_len ->
+ let (finished, used_in, used_out) =
+ try
+- let in_buf = Bytes.unsafe_to_string in_buf in
+- let out_buf = Bytes.unsafe_to_string out_buf in
+ Zlib.inflate
+ stream
+ in_buf in_pos in_len out_buf out_pos out_len
+@@ -170,8 +166,7 @@
+ st.in_size <-
+ Int32.add st.in_size (Int32.of_int used_out);
+ st.in_crc <-
+- ( let out_buf = Bytes.unsafe_to_string out_buf in
+- Zlib.update_crc st.in_crc out_buf out_pos used_out
++ ( Zlib.update_crc st.in_crc out_buf out_pos used_out
+ );
+
+ k := !k + used_in;
+@@ -292,8 +287,6 @@
+ (fun out_buf out_pos out_len ->
+ let (finished, used_in, used_out) =
+ try
+- let in_buf = Bytes.unsafe_to_string in_buf in
+- let out_buf = Bytes.unsafe_to_string out_buf in
+ Zlib.deflate
+ stream in_buf 0 in_len out_buf out_pos out_len
+ (if at_eof then Zlib.Z_FINISH else Zlib.Z_NO_FLUSH)
+@@ -305,7 +298,6 @@
+
+ st.out_size <- Int32.add st.out_size (Int32.of_int used_in);
+ st.out_crc <- (
+- let in_buf = Bytes.unsafe_to_string in_buf in
+ Zlib.update_crc st.out_crc in_buf 0 used_in
+ );
+
diff --git a/sources b/sources
index 2e29d3d..06dc763 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ocamlnet-4.1.3.tar.gz) = 683ab6f529639c9da01478ba8ba7a1bf89a418ad3872331bb3e29067c0a75ddc0db996630ce5a5dd116967d6e3e756ade02d9a78b865bbc226f95d01af9e3956
+SHA512 (ocamlnet-4.1.4.tar.gz) = ca502444f81898ccda27d61760a357aad59624cf3c4c025d49dd1c2e7bc3ef497c199634247ba7731e016c234e5cd92d2599d1ef9ecd55c3b6e7a64fc4773ee0
6 years, 6 months
Architecture specific change in rpms/ocaml-ounit.git
by githook-noreply@fedoraproject.org
The package rpms/ocaml-ounit.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/ocaml-ounit.git/commit/?id=3b4819....
Change:
+%ifarch %{ocaml_native_compiler}
Thanks.
Full change:
============
commit 3b481949d9f6f32a9808f658165f649e83bf7aa5
Author: Richard W.M. Jones <rjones(a)redhat.com>
Date: Wed Nov 8 16:09:01 2017 +0000
New upstream version 2.0.6.
diff --git a/.gitignore b/.gitignore
index 2ac5742..2d49a35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ ounit-1.0.3.tar.gz
/ounit-1.1.0.tar.gz
/ounit-1.1.2.tar.gz
/ounit-2.0.0.tar.gz
+/ounit-2.0.6.tar.gz
diff --git a/ocaml-ounit.spec b/ocaml-ounit.spec
index 4700bc9..dcf61af 100644
--- a/ocaml-ounit.spec
+++ b/ocaml-ounit.spec
@@ -1,16 +1,11 @@
-%global opt %(test -x %{_bindir}/ocamlopt && echo 1 || echo 0)
-%if ! %opt
-%global debug_package %{nil}
-%endif
-
Name: ocaml-ounit
-Version: 2.0.0
-Release: 30%{?dist}
+Version: 2.0.6
+Release: 1%{?dist}
Summary: Unit test framework for OCaml
License: MIT
URL: http://ounit.forge.ocamlcore.org/
-Source0: http://forge.ocamlcore.org/frs/download.php/1258/ounit-%{version}.tar.gz
+Source0: http://forge.ocamlcore.org/frs/download.php/1722/ounit-2.0.6.tar.gz
BuildRequires: ocaml >= 3.10.0
BuildRequires: ocaml-findlib-devel
@@ -61,7 +56,7 @@ rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
%files
%doc LICENSE.txt
%{_libdir}/ocaml/oUnit
-%if %opt
+%ifarch %{ocaml_native_compiler}
%exclude %{_libdir}/ocaml/oUnit/*.a
%exclude %{_libdir}/ocaml/oUnit/*.cmxa
%endif
@@ -71,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
%files devel
%doc LICENSE.txt README.txt
%doc _build/src/api-ounit.docdir/*
-%if %opt
+%ifarch %{ocaml_native_compiler}
%{_libdir}/ocaml/oUnit/*.a
%{_libdir}/ocaml/oUnit/*.cmxa
%endif
@@ -79,11 +74,8 @@ rm -rf $RPM_BUILD_ROOT/usr/local/share/doc
%changelog
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 2.0.0-30
-- Bump release and rebuild.
-
-* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 2.0.0-29
-- Bump release and rebuild.
+* Wed Nov 08 2017 Richard W.M. Jones <rjones(a)redhat.com> - 2.0.6-1
+- New upstream version 2.0.6.
* Tue Nov 07 2017 Richard W.M. Jones <rjones(a)redhat.com> - 2.0.0-28
- OCaml 4.06.0 rebuild.
diff --git a/sources b/sources
index f0e8974..9391661 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2e0a24648c55005978d4923eb4925b28 ounit-2.0.0.tar.gz
+SHA512 (ounit-2.0.6.tar.gz) = 466ec1f691a81e0abd93f698c7328e6db4fa2d617d8f5262d9f18b57ede3d389a3ee122ed7bccc8dff20600826fbbae1d17dd88d7c1329562798792fae54417d
6 years, 6 months
Architecture specific change in rpms/purple-hangouts.git
by githook-noreply@fedoraproject.org
The package rpms/purple-hangouts.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/purple-hangouts.git/commit/?id=8c....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 8cc9c606a3d9f0d8bf8e3cb17856acaa43e25e74
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Nov 8 19:15:14 2017 +0500
Fixed build under EPEL7.
diff --git a/purple-hangouts.spec b/purple-hangouts.spec
index 23c0da6..dab20bd 100644
--- a/purple-hangouts.spec
+++ b/purple-hangouts.spec
@@ -7,7 +7,7 @@
Name: purple-%{plugin_name}
Version: 0
-Release: 51.%{date}hg%{shortcommit0}%{?dist}
+Release: 52.%{date}hg%{shortcommit0}%{?dist}
Epoch: 1
Summary: Hangouts plugin for libpurple
@@ -22,6 +22,10 @@ BuildRequires: pkgconfig(purple)
BuildRequires: pkgconfig(zlib)
BuildRequires: gcc
+%if 0%{?rhel}
+ExcludeArch: ppc64
+%endif
+
%package -n pidgin-%{plugin_name}
Summary: Adds pixmaps, icons and smileys for Hangouts protocol
BuildArch: noarch
@@ -63,6 +67,9 @@ chmod 755 %{buildroot}%{_libdir}/purple-2/lib%{plugin_name}.so
%{_datadir}/pixmaps/pidgin/protocols/*/%{plugin_name}.png
%changelog
+* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-52.20171023hg4ce9b33
+- Fixed build under EPEL7.
+
* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-51.20171023hg4ce9b33
- Updated to latest snapshot.
6 years, 6 months
Architecture specific change in rpms/purple-hangouts.git
by githook-noreply@fedoraproject.org
The package rpms/purple-hangouts.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/purple-hangouts.git/commit/?id=8c....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 8cc9c606a3d9f0d8bf8e3cb17856acaa43e25e74
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Nov 8 19:15:14 2017 +0500
Fixed build under EPEL7.
diff --git a/purple-hangouts.spec b/purple-hangouts.spec
index 23c0da6..dab20bd 100644
--- a/purple-hangouts.spec
+++ b/purple-hangouts.spec
@@ -7,7 +7,7 @@
Name: purple-%{plugin_name}
Version: 0
-Release: 51.%{date}hg%{shortcommit0}%{?dist}
+Release: 52.%{date}hg%{shortcommit0}%{?dist}
Epoch: 1
Summary: Hangouts plugin for libpurple
@@ -22,6 +22,10 @@ BuildRequires: pkgconfig(purple)
BuildRequires: pkgconfig(zlib)
BuildRequires: gcc
+%if 0%{?rhel}
+ExcludeArch: ppc64
+%endif
+
%package -n pidgin-%{plugin_name}
Summary: Adds pixmaps, icons and smileys for Hangouts protocol
BuildArch: noarch
@@ -63,6 +67,9 @@ chmod 755 %{buildroot}%{_libdir}/purple-2/lib%{plugin_name}.so
%{_datadir}/pixmaps/pidgin/protocols/*/%{plugin_name}.png
%changelog
+* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-52.20171023hg4ce9b33
+- Fixed build under EPEL7.
+
* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-51.20171023hg4ce9b33
- Updated to latest snapshot.
6 years, 6 months
Architecture specific change in rpms/purple-hangouts.git
by githook-noreply@fedoraproject.org
The package rpms/purple-hangouts.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/purple-hangouts.git/commit/?id=8c....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 8cc9c606a3d9f0d8bf8e3cb17856acaa43e25e74
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Nov 8 19:15:14 2017 +0500
Fixed build under EPEL7.
diff --git a/purple-hangouts.spec b/purple-hangouts.spec
index 23c0da6..dab20bd 100644
--- a/purple-hangouts.spec
+++ b/purple-hangouts.spec
@@ -7,7 +7,7 @@
Name: purple-%{plugin_name}
Version: 0
-Release: 51.%{date}hg%{shortcommit0}%{?dist}
+Release: 52.%{date}hg%{shortcommit0}%{?dist}
Epoch: 1
Summary: Hangouts plugin for libpurple
@@ -22,6 +22,10 @@ BuildRequires: pkgconfig(purple)
BuildRequires: pkgconfig(zlib)
BuildRequires: gcc
+%if 0%{?rhel}
+ExcludeArch: ppc64
+%endif
+
%package -n pidgin-%{plugin_name}
Summary: Adds pixmaps, icons and smileys for Hangouts protocol
BuildArch: noarch
@@ -63,6 +67,9 @@ chmod 755 %{buildroot}%{_libdir}/purple-2/lib%{plugin_name}.so
%{_datadir}/pixmaps/pidgin/protocols/*/%{plugin_name}.png
%changelog
+* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-52.20171023hg4ce9b33
+- Fixed build under EPEL7.
+
* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-51.20171023hg4ce9b33
- Updated to latest snapshot.
6 years, 6 months
Architecture specific change in rpms/purple-hangouts.git
by githook-noreply@fedoraproject.org
The package rpms/purple-hangouts.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/purple-hangouts.git/commit/?id=8c....
Change:
+ExcludeArch: ppc64
Thanks.
Full change:
============
commit 8cc9c606a3d9f0d8bf8e3cb17856acaa43e25e74
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Nov 8 19:15:14 2017 +0500
Fixed build under EPEL7.
diff --git a/purple-hangouts.spec b/purple-hangouts.spec
index 23c0da6..dab20bd 100644
--- a/purple-hangouts.spec
+++ b/purple-hangouts.spec
@@ -7,7 +7,7 @@
Name: purple-%{plugin_name}
Version: 0
-Release: 51.%{date}hg%{shortcommit0}%{?dist}
+Release: 52.%{date}hg%{shortcommit0}%{?dist}
Epoch: 1
Summary: Hangouts plugin for libpurple
@@ -22,6 +22,10 @@ BuildRequires: pkgconfig(purple)
BuildRequires: pkgconfig(zlib)
BuildRequires: gcc
+%if 0%{?rhel}
+ExcludeArch: ppc64
+%endif
+
%package -n pidgin-%{plugin_name}
Summary: Adds pixmaps, icons and smileys for Hangouts protocol
BuildArch: noarch
@@ -63,6 +67,9 @@ chmod 755 %{buildroot}%{_libdir}/purple-2/lib%{plugin_name}.so
%{_datadir}/pixmaps/pidgin/protocols/*/%{plugin_name}.png
%changelog
+* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-52.20171023hg4ce9b33
+- Fixed build under EPEL7.
+
* Wed Nov 08 2017 Vitaly Zaitsev <vitaly(a)easycoding.org> - 1:0-51.20171023hg4ce9b33
- Updated to latest snapshot.
6 years, 6 months
Architecture specific change in rpms/php-zendframework-zend-crypt.git
by githook-noreply@fedoraproject.org
The package rpms/php-zendframework-zend-crypt.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/php-zendframework-zend-crypt.git/....
Change:
+%ifarch %arm
Thanks.
Full change:
============
commit 20974167875c4d5e8a619e30c6939e62ab468fd9
Author: Remi Collet <remi(a)fedoraproject.org>
Date: Wed Nov 8 13:23:29 2017 +0100
fix erratic FTBFS from Koschei, ignore 1 failed test on arm
https://github.com/zendframework/zend-crypt/issues/53
diff --git a/php-zendframework-zend-crypt.spec b/php-zendframework-zend-crypt.spec
index b76c460..28be467 100644
--- a/php-zendframework-zend-crypt.spec
+++ b/php-zendframework-zend-crypt.spec
@@ -21,7 +21,7 @@
Name: php-%{gh_owner}-%{gh_project}
Version: 3.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -124,7 +124,6 @@ EOF
%install
-
mkdir -p %{buildroot}%{php_home}/Zend/
cp -pr src %{buildroot}%{php_home}/Zend/%{library}
@@ -148,6 +147,11 @@ Zend\Loader\AutoloaderFactory::factory(array(
require_once '%{php_home}/Zend/autoload.php';
EOF
+%ifarch %arm
+# see https://github.com/zendframework/zend-crypt/issues/53
+rm test/Key/Derivation/ScryptTest.php
+%endif
+
ret=0
for cmd in php php56 php71 php72; do
if which $cmd; then
@@ -170,6 +174,10 @@ exit $ret
%changelog
+* Wed Nov 8 2017 Remi Collet <remi(a)remirepo.net> - 3.2.1-2
+- fix erratic FTBFS from Koschei, ignore 1 failed test on arm
+ https://github.com/zendframework/zend-crypt/issues/53
+
* Fri Aug 4 2017 Remi Collet <remi(a)remirepo.net> - 3.2.1-1
- Update to 3.2.1
6 years, 6 months