Architecture specific change in rpms/lammps.git
by githook-noreply@fedoraproject.org
The package rpms/lammps.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/lammps.git/commit/?id=d8f9b52134c....
Change:
-%ifnarch x86_64
Thanks.
Full change:
============
commit d8f9b52134c7eee374aea19da462360d4a27634c
Author: Christoph Junghans <junghans(a)votca.org>
Date: Wed Dec 12 11:36:09 2018 -0700
Bump version to 20181212
diff --git a/.gitignore b/.gitignore
index dd3ec42..fa9f4fe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@
/lammps-patch_8Mar2018.tar.gz
/lammps-stable_16Mar2018.tar.gz
/lammps-stable_22Aug2018.tar.gz
+/lammps-stable_12Dec2018.tar.gz
+/lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz
diff --git a/979.patch b/979.patch
deleted file mode 100644
index ad95eb5..0000000
--- a/979.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From a8b7153f4ed1a2b6286e00be0f93a5d5e487acc4 Mon Sep 17 00:00:00 2001
-From: Richard Berger <richard.berger(a)temple.edu>
-Date: Fri, 29 Jun 2018 16:00:08 -0400
-Subject: [PATCH] Fixes issue #975
-
----
- src/PYTHON/python_impl.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/PYTHON/python_impl.cpp b/src/PYTHON/python_impl.cpp
-index 9f018ad602..cc5edaf3f5 100644
---- a/src/PYTHON/python_impl.cpp
-+++ b/src/PYTHON/python_impl.cpp
-@@ -344,7 +344,7 @@ void PythonImpl::invoke_function(int ifunc, char *result)
- } else if (otype == DOUBLE) {
- sprintf(result,"%.15g",PyFloat_AsDouble(pValue));
- } else if (otype == STRING) {
-- char *pystr = PY_STRING_AS_STRING(pValue);
-+ const char *pystr = PY_STRING_AS_STRING(pValue);
- if (pfuncs[ifunc].longstr)
- strncpy(pfuncs[ifunc].longstr,pystr,pfuncs[ifunc].length_longstr);
- else strncpy(result,pystr,VALUELENGTH-1);
diff --git a/lammps.spec b/lammps.spec
index 4ba5cc9..1d78c1b 100644
--- a/lammps.spec
+++ b/lammps.spec
@@ -1,19 +1,20 @@
Name: lammps
-Version: 20180822
+Version: 20181212
%global uversion %(v=%{version}; \
months=( "" Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ); \
d=${v:6:2}; \
m=${v:4:2};
y=${v:0:4};
echo stable_${d#0}${months[${m#0}]}${y})
-Release: 2%{?dist}
+Release: 1%{?dist}
Summary: Molecular Dynamics Simulator
License: GPLv2
Url: https://lammps.sandia.gov
Source0: https://github.com/lammps/lammps/archive/%{uversion}.tar.gz#/%{name}-%{uv...
+%global tversion 7869c75cac38cb8a3d2ef7747ea12ec5812f5151
+Source1: https://github.com/lammps/lammps-testing/archive/%{tversion}.tar.gz#/%{na...
BuildRequires: fftw-devel
BuildRequires: gcc-c++
-BuildRequires: gcc-gfortran
BuildRequires: libpng-devel
BuildRequires: libjpeg-devel
BuildRequires: openmpi-devel
@@ -23,37 +24,27 @@ BuildRequires: fftw3-devel
BuildRequires: zlib-devel
BuildRequires: gsl-devel
BuildRequires: voro++-devel
-BuildRequires: openblas-devel
-%if 0%{?rhel}
+BuildRequires: openblas-devel
BuildRequires: cmake3 >= 3.1
-%else
-BuildRequires: cmake >= 3.1
-%global cmake3 %{cmake}
-%endif
BuildRequires: ocl-icd-devel
BuildRequires: opencl-headers
Requires: %{name}-data
-%global with_opencl 1
-# don't build opencl on RHEL, except for x86_64
-%if 0%{?rhel}
-%ifnarch x86_64
-%global with_opencl 0
-%endif
-%endif
+%global lammps_desc \
+LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale \
+Atomic/Molecular Massively Parallel Simulator.\
+\
+LAMMPS has potentials for soft materials (biomolecules, polymers) and \
+solid-state materials (metals, semiconductors) and coarse-grained or \
+mesoscopic systems. It can be used to model atoms or, more generically, as a \
+parallel particle simulator at the atomic, meso, or continuum scale. \
+\
+LAMMPS runs on single processors or in parallel using message-passing \
+techniques and a spatial-decomposition of the simulation domain. The code is \
+designed to be easy to modify or extend with new functionality.
%description
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
%package openmpi
Summary: LAMMPS Open MPI binaries and libraries
@@ -61,17 +52,7 @@ Requires: openmpi
Requires: %{name}-data
%description openmpi
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains LAMMPS Open MPI binaries and libraries
@@ -81,17 +62,7 @@ Requires: mpich
Requires: %{name}-data
%description mpich
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains LAMMPS MPICH binaries and libraries
@@ -102,17 +73,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
%{?python_provide:%python_provide python%{python3_pkgversion}-%{name}}
%description -n python%{python3_pkgversion}-%{name}
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains LAMMPS Python interface
@@ -120,17 +81,7 @@ This package contains LAMMPS Python interface
Summary: Development headers for LAMMPS
%description headers
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains development headers for LAMMPS.
@@ -140,17 +91,7 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-headers%{?_isa} = %{version}-%{release}
%description devel
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains development libraries for serial LAMMPS.
@@ -160,17 +101,7 @@ Requires: %{name}-mpich%{?_isa} = %{version}-%{release}
Requires: %{name}-headers%{?_isa} = %{version}-%{release}
%description mpich-devel
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains development headers and libraries for MPICH LAMMPS.
@@ -180,17 +111,7 @@ Requires: %{name}-openmpi%{?_isa} = %{version}-%{release}
Requires: %{name}-headers%{?_isa} = %{version}-%{release}
%description openmpi-devel
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains development libraries for Open MPI LAMMPS.
@@ -199,22 +120,12 @@ Summary: Data files for LAMMPS
BuildArch: noarch
%description data
-LAMMPS is a classical molecular dynamics code, and an acronym for Large-scale
-Atomic/Molecular Massively Parallel Simulator.
-
-LAMMPS has potentials for soft materials (biomolecules, polymers) and
-solid-state materials (metals, semiconductors) and coarse-grained or
-mesoscopic systems. It can be used to model atoms or, more generically, as a
-parallel particle simulator at the atomic, meso, or continuum scale.
-
-LAMMPS runs on single processors or in parallel using message-passing
-techniques and a spatial-decomposition of the simulation domain. The code is
-designed to be easy to modify or extend with new functionality.
+%{lammps_desc}
This package contains data files for LAMMPS.
%prep
-%setup -q -n %{name}-%{uversion}
+%setup -q -a 1 -n %{name}-%{uversion}
%build
#python wrapper isn't mpi specific
@@ -229,61 +140,37 @@ This package contains data files for LAMMPS.
-DENABLE_TESTING=ON \\\
-DPYTHON_INSTDIR=%{python3_sitelib} \\\
-DCMAKE_INSTALL_SYSCONFDIR=/etc \\\
- -DPKG_GPU=%{with_opencl} -DGPU_API=OpenCL \\\
+ -DPKG_GPU=ON -DGPU_API=OpenCL \\\
-DFFT=FFTW3
-mkdir -p {serial,mpich,openmpi}
-cd openmpi
-%{_openmpi_load}
-%{cmake3} \
- %{defopts} \
- -DBUILD_MPI=ON \
- -DPKG_MPIIO=ON \
- -DCMAKE_INSTALL_BINDIR=$MPI_BIN \
- -DCMAKE_INSTALL_LIBDIR=$MPI_LIB \
- -DCMAKE_EXE_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" \
- -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" \
- ../cmake
-%make_build
-%{_openmpi_unload}
-cd ..
-
-cd mpich
-%{_mpich_load}
-%{cmake3} \
- %{defopts} \
- -DBUILD_MPI=ON \
- -DPKG_MPIIO=ON \
- -DCMAKE_INSTALL_BINDIR=$MPI_BIN \
- -DCMAKE_INSTALL_LIBDIR=$MPI_LIB \
- -DCMAKE_EXE_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" \
- -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" \
- ../cmake
-%make_build
-%{_mpich_unload}
-cd ..
-
-cd serial
-%{cmake3} \
- %{defopts} \
- -DBUILD_MPI=OFF \
- ../cmake
-%make_build
-cd ..
+. /etc/profile.d/modules.sh
+for mpi in '' mpich openmpi ; do
+ test -n "${mpi}" && module load mpi/${mpi}-%{_arch}
+ mkdir -p ${mpi:-serial}
+ pushd ${mpi:-serial}
+ cp -al ../lammps-testing-* tests/
+ %{cmake3} %{defopts} \
+ -DCMAKE_INSTALL_BINDIR=${MPI_BIN:-%{_bindir}} -DCMAKE_INSTALL_LIBDIR=${MPI_LIB:-%{_libdir}} -DLAMMPS_MACHINE="${MPI_SUFFIX#_}" -DLAMMPS_LIB_SUFFIX="${MPI_SUFFIX#_}" -DCMAKE_INSTALL_MANDIR=${MPI_MAN:-%{_mandir}} \
+ ${mpi:+-DBUILD_MPI=ON -DPKG_MPIIO=ON -DCMAKE_EXE_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags" -DCMAKE_SHARED_LINKER_FLAGS="%{__global_ldflags} -Wl,-rpath -Wl,${MPI_LIB} -Wl,--enable-new-dtags"} \
+ $(test -n "${mpi}" && echo -DBUILD_MPI=OFF -DPKG_MPIIO=OFF) -DLAMMPS_TESTING_SOURCE_DIR=$PWD/tests ../cmake
+ %make_build
+ popd
+ test -n "${mpi}" && module unload mpi/${mpi}-%{_arch}
+done
%install
-%make_install -C serial
-%make_install -C mpich
-%make_install -C openmpi
+. /etc/profile.d/modules.sh
+for mpi in '' mpich openmpi ; do
+ %make_install -C ${mpi:-serial}
+done
%check
-make -C serial %{?_smp_mflags} test
-%{_mpich_load}
-make -C mpich %{?_smp_mflags} test
-%{_mpich_unload}
-%{_openmpi_load}
-make -C openmpi %{?_smp_mflags} test
-%{_openmpi_unload}
+. /etc/profile.d/modules.sh
+for mpi in '' mpich openmpi ; do
+ test -n "${mpi}" && module load mpi/${mpi}-%{_arch}
+ make -C ${mpi:-serial} %{?_smp_mflags} test CTEST_OUTPUT_ON_FAILURE=1
+ test -n "${mpi}" && module unload mpi/${mpi}-%{_arch}
+done
%ldconfig_scriptlets
@@ -291,19 +178,24 @@ make -C openmpi %{?_smp_mflags} test
%doc README
%license LICENSE
%{_bindir}/lmp
+%{_mandir}/man1/lmp.*
%{_libdir}/liblammps.so.*
%files devel
%{_libdir}/liblammps.so
%{_libdir}/pkgconfig/liblammps.pc
+%dir %{_datadir}/cmake/Module
+%{_datadir}/cmake/Module/FindLAMMPS.cmake
%files openmpi-devel
-%{_libdir}/openmpi*/lib/liblammps.so
-%{_libdir}/openmpi*/lib/pkgconfig/liblammps.pc
+%{_libdir}/openmpi*/lib/liblammps_openmpi.so
+%{_libdir}/openmpi*/lib/pkgconfig/liblammps_openmpi.pc
+%{_datadir}/cmake/Module/FindLAMMPS_openmpi.cmake
%files mpich-devel
-%{_libdir}/mpich*/lib/liblammps.so
-%{_libdir}/mpich*/lib/pkgconfig/liblammps.pc
+%{_libdir}/mpich*/lib/liblammps_mpich.so
+%{_libdir}/mpich*/lib/pkgconfig/liblammps_mpich.pc
+%{_datadir}/cmake/Module/FindLAMMPS_mpich.cmake
%files -n python%{python3_pkgversion}-%{name}
%{python3_sitelib}/%{name}.py*
@@ -315,13 +207,15 @@ make -C openmpi %{?_smp_mflags} test
%files openmpi
%license LICENSE
-%{_libdir}/openmpi*/bin/*
-%{_libdir}/openmpi*/lib/liblammps.so.*
+%{_libdir}/openmpi*/bin/lmp_openmpi
+%{_mandir}/openmpi*/man1/lmp_openmpi.*
+%{_libdir}/openmpi*/lib/liblammps_openmpi.so.*
%files mpich
%license LICENSE
-%{_libdir}/mpich*/bin/*
-%{_libdir}/mpich*/lib/liblammps.so.*
+%{_libdir}/mpich*/bin/lmp_mpich
+%{_mandir}/mpich*/man1/lmp_mpich.*
+%{_libdir}/mpich*/lib/liblammps_mpich.so.*
%files data
%license LICENSE
@@ -329,7 +223,12 @@ make -C openmpi %{?_smp_mflags} test
%config %{_sysconfdir}/profile.d/lammps.*
%changelog
-* Wed Aug 24 2018 Christoph Junghans <junghans(a)votca.org> - 20180822-2
+* Wed Dec 12 2018 Christoph Junghans <junghans(a)votca.org> - 20181212-1
+- Bump version to 20181212
+- Add MPI_SUFFIX to lmp and liblammps
+- Major spec clean up
+
+* Fri Aug 24 2018 Christoph Junghans <junghans(a)votca.org> - 20180822-2
- Enable some more packages
- Use Openblas instead of internal lapack
diff --git a/sources b/sources
index ba1c7df..8415c05 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-SHA512 (lammps-stable_22Aug2018.tar.gz) = 9de8304f13bca5c9a655c8634e42f58631184f97ea009c8aeefc72b68cf2ff83bd32358fbe1554a2f9d2c3401364fc1b123fc9c90887a7e73d7cf6ff2946ecd5
+SHA512 (lammps-stable_12Dec2018.tar.gz) = 0245576b592d93225daab9e01f82ef2fc0212a4f4df63ecf1fe58b364b2abe2c2a142f7b33a742dbd785cb19f06af7f9522a4bedbe510d26445d2e76c0015c09
+SHA512 (lammps-testing-7869c75cac38cb8a3d2ef7747ea12ec5812f5151.tar.gz) = c996f7109d6467ae8e6a8c187485afb7c55b6dcf2b2e7003a8edd271e7f7dfe275079fbb0d680455628c8fd2eb87640284e8a92ffe095fcb398133be587af57a
5 years, 5 months
Architecture specific change in rpms/libmodulemd.git
by githook-noreply@fedoraproject.org
The package rpms/libmodulemd.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/libmodulemd.git/commit/?id=88a95b....
Change:
+%ifarch %{power64} s390x
Thanks.
Full change:
============
commit 88a95b7d8e04a5c9c9cb86aa241f7a406aa44ddc
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Wed Dec 12 08:30:50 2018 -0500
Don't run valgrind on s390x
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/libmodulemd.spec b/libmodulemd.spec
index df4db56..6eaf9a4 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -105,7 +105,7 @@ Python 3 bindings for libmodulemd1
export LC_CTYPE=C.utf8
-%ifarch %{power64}
+%ifarch %{power64} s390x
# Valgrind is broken on ppc64[le] with GCC7:
# https://bugs.kde.org/show_bug.cgi?id=386945
export MMD_SKIP_VALGRIND=1
5 years, 5 months
Architecture specific change in rpms/libmodulemd.git
by githook-noreply@fedoraproject.org
The package rpms/libmodulemd.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/libmodulemd.git/commit/?id=5500b7....
Change:
+%ifnarch %{valgrind_arches}
Thanks.
Full change:
============
commit 5500b7840fa40b2fb6c21269f823dc40f37d4d66
Author: Stephen Gallagher <sgallagh(a)redhat.com>
Date: Tue Dec 11 22:01:29 2018 -0500
Update to 2.0.0beta2
Signed-off-by: Stephen Gallagher <sgallagh(a)redhat.com>
diff --git a/.gitignore b/.gitignore
index ef98f2d..1dead76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/modulemd-1.6.3.tar.xz
/modulemd-1.6.4.tar.xz
/modulemd-1.7.0.tar.xz
+/modulemd-2.0.0beta2.tar.xz
diff --git a/libmodulemd.spec b/libmodulemd.spec
index 0c2d989..df4db56 100644
--- a/libmodulemd.spec
+++ b/libmodulemd.spec
@@ -1,24 +1,31 @@
+%global libmodulemd_version 2.0.0
+%global libmodulemd_v1_version 1.8.0
+
Name: libmodulemd
-Version: 1.7.0
-Release: 1%{?dist}
+Version: %{libmodulemd_version}
+Release: 0.beta2%{?dist}
Summary: Module metadata manipulation library
License: MIT
URL: https://github.com/fedora-modularity/libmodulemd
-Source0: %{url}/releases/download/%{name}-%{version}/modulemd-%{version}.tar.xz
+Source0: %{url}/releases/download/%{name}-%{version}/modulemd-%{version}beta2.tar.xz
-BuildRequires: meson
+BuildRequires: meson >= 0.45.1-3
BuildRequires: pkgconfig
BuildRequires: gcc
+BuildRequires: gcc-c++
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: pkgconfig(yaml-0.1)
BuildRequires: pkgconfig(gtk-doc)
+BuildRequires: python3-devel
BuildRequires: python3-gobject-base
+%ifarch %{valgrind_arches}
BuildRequires: valgrind
+%endif
Obsoletes: python2-modulemd < 1.3.4
-
+Obsoletes: python3-modulemd < 1.3.4
# Patches
@@ -39,8 +46,6 @@ Obsoletes: python3-modulemd < 1.3.4
%description -n python3-%{name}
Python 3 bindings for %{name}
-Also provides utility module ModulemdUtils.
-
%package devel
Summary: Development files for libmodulemd
@@ -51,12 +56,48 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
Development files for libmodulemd.
+%package -n libmodulemd1
+Summary: Compatibility package for libmodulemd 1.x
+Version: %{libmodulemd_v1_version}
+Obsoletes: libmodulemd < 2
+Provides: libmodulemd = %{libmodulemd_v1_version}-%{release}
+Provides: libmodulemd%{?_isa} = %{libmodulemd_v1_version}-%{release}
+
+%description -n libmodulemd1
+Compatibility library for libmodulemd 1.x
+
+
+%package -n libmodulemd1-devel
+Summary: Compatibility development package for libmodulemd 1.x
+Version: %{libmodulemd_v1_version}
+Requires: libmodulemd1%{?_isa} = %{libmodulemd_v1_version}-%{release}
+Conflicts: %{name}-devel
+Obsoletes: libmodulemd-devel < 2
+Provides: libmodulemd-devel = %{libmodulemd_v1_version}-%{release}
+RemovePathPostfixes: .compat
+
+
+%description -n libmodulemd1-devel
+Development files for libmodulemd 1.x
+
+
+%package -n python3-libmodulemd1
+Summary: Python 3 bindings for %{name}1
+Version: %{libmodulemd_v1_version}
+BuildArch: noarch
+Requires: libmodulemd1 = %{libmodulemd_v1_version}-%{release}
+Requires: python3-gobject-base
+
+%description -n python3-libmodulemd1
+Python 3 bindings for libmodulemd1
+
+
%prep
-%autosetup -p1 -n modulemd-%{version}
+%autosetup -p1 -n modulemd-%{libmodulemd_version}
%build
-%meson -Ddeveloper_build=false
+%meson -Ddeveloper_build=false -Dbuild_api_v1=true -Dbuild_api_v2=true
%meson_build
@@ -69,6 +110,9 @@ export LC_CTYPE=C.utf8
# https://bugs.kde.org/show_bug.cgi?id=386945
export MMD_SKIP_VALGRIND=1
%endif
+%ifnarch %{valgrind_arches}
+export MMD_SKIP_VALGRIND=1
+%endif
%meson_test
@@ -76,24 +120,47 @@ export MMD_SKIP_VALGRIND=1
%install
%meson_install
-
-%ldconfig_scriptlets
+ln -s libmodulemd.so.%{libmodulemd_v1_version} \
+ %{buildroot}%{_libdir}/%{name}.so.compat
%files
%license COPYING
%doc README.md
-%{_bindir}/modulemd-validator
-%{_libdir}/%{name}.so.1*
+%{_libdir}/%{name}.so.2*
%dir %{_libdir}/girepository-1.0
-%{_libdir}/girepository-1.0/Modulemd-1.0.typelib
+%{_libdir}/girepository-1.0/Modulemd-2.0.typelib
+%{python3_sitearch}/gi/overrides/
+
+
+%files devel
+%{_libdir}/%{name}.so
+%{_libdir}/pkgconfig/modulemd-2.0.pc
+%{_includedir}/modulemd-2.0/
+%dir %{_datadir}/gir-1.0
+%{_datadir}/gir-1.0/Modulemd-2.0.gir
+%dir %{_datadir}/gtk-doc
+%dir %{_datadir}/gtk-doc/html
+%{_datadir}/gtk-doc/html/modulemd-2.0/
%files -n python3-%{name}
-%files devel
-%{_libdir}/%{name}.so
+%files -n python3-libmodulemd1
+
+
+%files -n libmodulemd1
+%license COPYING
+%doc README.md
+%{_bindir}/modulemd-validator
+%{_libdir}/%{name}.so.1*
+%dir %{_libdir}/girepository-1.0
+%{_libdir}/girepository-1.0/Modulemd-1.0.typelib
+
+
+%files -n libmodulemd1-devel
+%{_libdir}/%{name}.so.compat
%{_libdir}/pkgconfig/modulemd.pc
%{_includedir}/modulemd/
%dir %{_datadir}/gir-1.0
@@ -103,6 +170,20 @@ export MMD_SKIP_VALGRIND=1
%{_datadir}/gtk-doc/html/modulemd-1.0/
%changelog
+* Tue Dec 11 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 2.0.0-0.beta2
+- Update to 2.0.0beta2
+- Better validation of stored content during read and write operations
+- ModuleIndex now returns FALSE if any subdocument fails
+- Fix tests on 32-bit platforms
+- Make unknown keys in YAML maps non-fatal for libmodulemd1
+- Make unknown keys in YAML maps optionally fatal for libmodulemd 2.x
+- Fix RPM version requirements for libmodulemd1
+
+* Mon Dec 10 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 2.0.0-0.beta1
+- Update to 2.0.0beta1
+- Total rewrite to 2.0 API
+- https://sgallagh.fedorapeople.org/docs/libmodulemd/2.0/
+
* Fri Oct 26 2018 Stephen Gallagher <sgallagh(a)redhat.com> - 1.7.0-1
- Update to 1.7.0
- Enhance YAML parser for use with `fedmod lint`
diff --git a/sources b/sources
index 239b181..8f29c30 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (modulemd-1.7.0.tar.xz) = 6bdf5c77a25ae0d1bf583e5b5fd1ab6ac609c3c3893f66529cb09fcec08479afc3765048abf03bb6afee531119fa6f2bc9ebb51ac388751ea4f59ce64434104e
+SHA512 (modulemd-2.0.0beta2.tar.xz) = de136912ab2c5a238783265b193c18b6addaaa7f31b402bc19ace16d3551b874e787d1b12cda7563a5a1905875dc57186ee09355c26e4ba35a73af0640e72266
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=c6a456b881....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit c6a456b88165ae8fc660002733be6da992f96a77
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:53:09 2018 +0100
Use gcc on all platforms for official release.
diff --git a/firefox.spec b/firefox.spec
index c012e42..f619ddc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,6 @@
+# Temporary disable arm due to build failures
+ExcludeArch: armv7hl
+
%global system_nss 1
%global system_ffi 1
%global system_libvpx 1
@@ -8,10 +11,10 @@
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
-%global build_with_clang 1
+%global build_with_clang 0
%endif
%endif
-%global build_with_pgo 1
+%global build_with_pgo 0
%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -77,7 +80,7 @@ Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 3%{?pre_tag}%{?dist}
+Release: 4%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -883,6 +886,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-4
+- Use gcc on all platforms for official release.
+
* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
- Updated PGO build setup.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=c6a456b881....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit c6a456b88165ae8fc660002733be6da992f96a77
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:53:09 2018 +0100
Use gcc on all platforms for official release.
diff --git a/firefox.spec b/firefox.spec
index c012e42..f619ddc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,6 @@
+# Temporary disable arm due to build failures
+ExcludeArch: armv7hl
+
%global system_nss 1
%global system_ffi 1
%global system_libvpx 1
@@ -8,10 +11,10 @@
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
-%global build_with_clang 1
+%global build_with_clang 0
%endif
%endif
-%global build_with_pgo 1
+%global build_with_pgo 0
%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -77,7 +80,7 @@ Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 3%{?pre_tag}%{?dist}
+Release: 4%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -883,6 +886,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-4
+- Use gcc on all platforms for official release.
+
* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
- Updated PGO build setup.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=c6a456b881....
Change:
+ExcludeArch: armv7hl
Thanks.
Full change:
============
commit c6a456b88165ae8fc660002733be6da992f96a77
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:53:09 2018 +0100
Use gcc on all platforms for official release.
diff --git a/firefox.spec b/firefox.spec
index c012e42..f619ddc 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,3 +1,6 @@
+# Temporary disable arm due to build failures
+ExcludeArch: armv7hl
+
%global system_nss 1
%global system_ffi 1
%global system_libvpx 1
@@ -8,10 +11,10 @@
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
-%global build_with_clang 1
+%global build_with_clang 0
%endif
%endif
-%global build_with_pgo 1
+%global build_with_pgo 0
%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
@@ -77,7 +80,7 @@ Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 3%{?pre_tag}%{?dist}
+Release: 4%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -883,6 +886,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-4
+- Use gcc on all platforms for official release.
+
* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
- Updated PGO build setup.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=d144fd6279....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit d144fd627954f8faa247de7a7235e5be3c4a4d67
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:48:12 2018 +0100
Updated PGO build setup, spec file tweaks
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 7bff990..5cfb5ba 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -16,6 +16,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release
ac_add_options --update-channel=release
+ac_add_options --disable-system-sqlite
# Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
diff --git a/firefox.spec b/firefox.spec
index c58202f..c012e42 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,36 +1,27 @@
%global system_nss 1
-%global system_sqlite 0
%global system_ffi 1
-%global system_cairo 0
%global system_libvpx 1
-%global system_libicu 0
%global hardened_build 1
%global system_jpeg 1
+%global run_tests 0
+%global disable_elfhack 0
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
%global build_with_clang 1
%endif
%endif
-%global build_with_pgo 0
-%global use_bundled_cbindgen 1
+%global build_with_pgo 1
+%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
%else
%global wayland_backend_default 0
%endif
-
# Big endian platforms
%ifarch ppc64 s390x
%global big_endian 1
%endif
-
-%ifarch %{ix86} x86_64
-%global run_tests 0
-%else
-%global run_tests 0
-%endif
-
%bcond_without debug_build
%if %{with debug_build}
%else
@@ -39,10 +30,15 @@
%global debug_build 0
%endif
-%global disable_elfhack 0
-#%if !0%{?build_with_clang}
-#%global disable_elfhack 1
-#%endif
+%if 0%{?build_with_pgo}
+%global use_xvfb 1
+%global build_tests 1
+%endif
+
+%if !0%{?run_tests}
+%global use_xvfb 1
+%global build_tests 1
+%endif
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -56,21 +52,11 @@
%if %{?system_nss}
%global nspr_version 4.19
-# NSS/NSPR quite often ends in build override, so as requirement the version
-# we're building against could bring us some broken dependencies from time to time.
-#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version}
%global nss_version 3.40.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%global nss_build_version %{nss_version}
%endif
-%if %{?system_sqlite}
-%global sqlite_version 3.8.4.2
-# The actual sqlite version (see #480989):
-%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
-%endif
-
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
@@ -90,7 +76,8 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 2%{?pre_tag}%{?dist}
+
+Release: 3%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -166,9 +153,6 @@ BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version}
BuildRequires: nss-static >= %{nss_version}
%endif
-%if %{?system_cairo}
-BuildRequires: pkgconfig(cairo) >= %{cairo_version}
-%endif
BuildRequires: pkgconfig(libpng)
%if %{?system_jpeg}
BuildRequires: libjpeg-devel
@@ -246,16 +230,11 @@ Requires: nss >= 3.29.3-1.1
BuildRequires: desktop-file-utils
BuildRequires: system-bookmarks
-%if %{?system_sqlite}
-BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-Requires: sqlite >= %{sqlite_build_version}
-%endif
-
%if %{?system_ffi}
BuildRequires: pkgconfig(libffi)
%endif
-%if %{?run_tests}
+%if 0%{?use_xvfb}
BuildRequires: xorg-x11-server-Xvfb
%endif
BuildRequires: rust
@@ -391,18 +370,6 @@ echo "ac_add_options --without-system-nspr" >> .mozconfig
echo "ac_add_options --without-system-nss" >> .mozconfig
%endif
-%if %{?system_sqlite}
-echo "ac_add_options --enable-system-sqlite" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-sqlite" >> .mozconfig
-%endif
-
-%if %{?system_cairo}
-echo "ac_add_options --enable-system-cairo" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-cairo" >> .mozconfig
-%endif
-
%if %{?system_ffi}
echo "ac_add_options --enable-system-ffi" >> .mozconfig
%endif
@@ -446,7 +413,7 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
echo "ac_add_options --disable-crashreporter" >> .mozconfig
%endif
-%if %{?run_tests}
+%if 0%{?build_tests}
echo "ac_add_options --enable-tests" >> .mozconfig
%endif
@@ -462,11 +429,6 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
echo "ac_add_options --without-system-libvpx" >> .mozconfig
%endif
-%if %{?system_libicu}
-echo "ac_add_options --with-system-icu" >> .mozconfig
-%else
-echo "ac_add_options --without-system-icu" >> .mozconfig
-%endif
%ifarch s390 s390x
echo "ac_add_options --disable-ion" >> .mozconfig
%endif
@@ -494,17 +456,6 @@ env CARGO_HOME=.cargo cargo install cbindgen
#---------------------------------------------------------------------
%build
-%if %{?system_sqlite}
-# Do not proceed with build if the sqlite require would be broken:
-# make sure the minimum requirement is non-empty, ...
-sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
-# ... and that major number of the computed build-time version matches:
-case "%{sqlite_build_version}" in
- "$sqlite_version"*) ;;
- *) exit 1 ;;
-esac
-%endif
-
%if 0%{?use_bundled_cbindgen}
export PATH=`pwd`/.cargo/bin:$PATH
%endif
@@ -519,13 +470,6 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-# -fpermissive is needed to build with gcc 4.6+ which has become stricter
-#
-# Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-#
-# Disable C++ exceptions since Mozilla code is not exception-safe
-#
MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
#rhbz#1037063
# -Werror=format-security causes build failures when -Wno-format is explicitly given
@@ -533,11 +477,6 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
# Explicitly force the hardening flags for Firefox so it passes the checksec test;
# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
-%if 0%{?fedora} > 23
-# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
-%endif
-# Use hardened build?
%if %{?hardened_build}
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
%endif
@@ -603,11 +542,14 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
+%if 0%{?build_with_pgo}
+xvfb-run ./mach build
+%else
./mach build
+%endif
# create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter}
-#cd %{moz_objdir}
make -C objdir buildsymbols
%endif
@@ -898,8 +840,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper(a)mozilla.org.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml
-#%dir %{mozappdir}/browser/extensions
-#%{mozappdir}/browser/extensions/*
%if %{with langpacks}
%dir %{langpackdir}
%endif
@@ -943,6 +883,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
+- Updated PGO build setup.
+
* Tue Dec 4 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-2
- Updated to Firefox 64 (Build 3)
- Built with Clang on some arches.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=d144fd6279....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit d144fd627954f8faa247de7a7235e5be3c4a4d67
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:48:12 2018 +0100
Updated PGO build setup, spec file tweaks
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 7bff990..5cfb5ba 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -16,6 +16,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release
ac_add_options --update-channel=release
+ac_add_options --disable-system-sqlite
# Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
diff --git a/firefox.spec b/firefox.spec
index c58202f..c012e42 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,36 +1,27 @@
%global system_nss 1
-%global system_sqlite 0
%global system_ffi 1
-%global system_cairo 0
%global system_libvpx 1
-%global system_libicu 0
%global hardened_build 1
%global system_jpeg 1
+%global run_tests 0
+%global disable_elfhack 0
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
%global build_with_clang 1
%endif
%endif
-%global build_with_pgo 0
-%global use_bundled_cbindgen 1
+%global build_with_pgo 1
+%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
%else
%global wayland_backend_default 0
%endif
-
# Big endian platforms
%ifarch ppc64 s390x
%global big_endian 1
%endif
-
-%ifarch %{ix86} x86_64
-%global run_tests 0
-%else
-%global run_tests 0
-%endif
-
%bcond_without debug_build
%if %{with debug_build}
%else
@@ -39,10 +30,15 @@
%global debug_build 0
%endif
-%global disable_elfhack 0
-#%if !0%{?build_with_clang}
-#%global disable_elfhack 1
-#%endif
+%if 0%{?build_with_pgo}
+%global use_xvfb 1
+%global build_tests 1
+%endif
+
+%if !0%{?run_tests}
+%global use_xvfb 1
+%global build_tests 1
+%endif
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -56,21 +52,11 @@
%if %{?system_nss}
%global nspr_version 4.19
-# NSS/NSPR quite often ends in build override, so as requirement the version
-# we're building against could bring us some broken dependencies from time to time.
-#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version}
%global nss_version 3.40.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%global nss_build_version %{nss_version}
%endif
-%if %{?system_sqlite}
-%global sqlite_version 3.8.4.2
-# The actual sqlite version (see #480989):
-%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
-%endif
-
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
@@ -90,7 +76,8 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 2%{?pre_tag}%{?dist}
+
+Release: 3%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -166,9 +153,6 @@ BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version}
BuildRequires: nss-static >= %{nss_version}
%endif
-%if %{?system_cairo}
-BuildRequires: pkgconfig(cairo) >= %{cairo_version}
-%endif
BuildRequires: pkgconfig(libpng)
%if %{?system_jpeg}
BuildRequires: libjpeg-devel
@@ -246,16 +230,11 @@ Requires: nss >= 3.29.3-1.1
BuildRequires: desktop-file-utils
BuildRequires: system-bookmarks
-%if %{?system_sqlite}
-BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-Requires: sqlite >= %{sqlite_build_version}
-%endif
-
%if %{?system_ffi}
BuildRequires: pkgconfig(libffi)
%endif
-%if %{?run_tests}
+%if 0%{?use_xvfb}
BuildRequires: xorg-x11-server-Xvfb
%endif
BuildRequires: rust
@@ -391,18 +370,6 @@ echo "ac_add_options --without-system-nspr" >> .mozconfig
echo "ac_add_options --without-system-nss" >> .mozconfig
%endif
-%if %{?system_sqlite}
-echo "ac_add_options --enable-system-sqlite" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-sqlite" >> .mozconfig
-%endif
-
-%if %{?system_cairo}
-echo "ac_add_options --enable-system-cairo" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-cairo" >> .mozconfig
-%endif
-
%if %{?system_ffi}
echo "ac_add_options --enable-system-ffi" >> .mozconfig
%endif
@@ -446,7 +413,7 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
echo "ac_add_options --disable-crashreporter" >> .mozconfig
%endif
-%if %{?run_tests}
+%if 0%{?build_tests}
echo "ac_add_options --enable-tests" >> .mozconfig
%endif
@@ -462,11 +429,6 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
echo "ac_add_options --without-system-libvpx" >> .mozconfig
%endif
-%if %{?system_libicu}
-echo "ac_add_options --with-system-icu" >> .mozconfig
-%else
-echo "ac_add_options --without-system-icu" >> .mozconfig
-%endif
%ifarch s390 s390x
echo "ac_add_options --disable-ion" >> .mozconfig
%endif
@@ -494,17 +456,6 @@ env CARGO_HOME=.cargo cargo install cbindgen
#---------------------------------------------------------------------
%build
-%if %{?system_sqlite}
-# Do not proceed with build if the sqlite require would be broken:
-# make sure the minimum requirement is non-empty, ...
-sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
-# ... and that major number of the computed build-time version matches:
-case "%{sqlite_build_version}" in
- "$sqlite_version"*) ;;
- *) exit 1 ;;
-esac
-%endif
-
%if 0%{?use_bundled_cbindgen}
export PATH=`pwd`/.cargo/bin:$PATH
%endif
@@ -519,13 +470,6 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-# -fpermissive is needed to build with gcc 4.6+ which has become stricter
-#
-# Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-#
-# Disable C++ exceptions since Mozilla code is not exception-safe
-#
MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
#rhbz#1037063
# -Werror=format-security causes build failures when -Wno-format is explicitly given
@@ -533,11 +477,6 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
# Explicitly force the hardening flags for Firefox so it passes the checksec test;
# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
-%if 0%{?fedora} > 23
-# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
-%endif
-# Use hardened build?
%if %{?hardened_build}
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
%endif
@@ -603,11 +542,14 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
+%if 0%{?build_with_pgo}
+xvfb-run ./mach build
+%else
./mach build
+%endif
# create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter}
-#cd %{moz_objdir}
make -C objdir buildsymbols
%endif
@@ -898,8 +840,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper(a)mozilla.org.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml
-#%dir %{mozappdir}/browser/extensions
-#%{mozappdir}/browser/extensions/*
%if %{with langpacks}
%dir %{langpackdir}
%endif
@@ -943,6 +883,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
+- Updated PGO build setup.
+
* Tue Dec 4 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-2
- Updated to Firefox 64 (Build 3)
- Built with Clang on some arches.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=d144fd6279....
Change:
-%ifarch %{ix86} x86_64
Thanks.
Full change:
============
commit d144fd627954f8faa247de7a7235e5be3c4a4d67
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 10:48:12 2018 +0100
Updated PGO build setup, spec file tweaks
diff --git a/firefox-mozconfig b/firefox-mozconfig
index 7bff990..5cfb5ba 100644
--- a/firefox-mozconfig
+++ b/firefox-mozconfig
@@ -16,6 +16,7 @@ ac_add_options --with-mozilla-api-keyfile=../mozilla-api-key
ac_add_options --with-google-api-keyfile=../google-api-key
ac_add_options --enable-release
ac_add_options --update-channel=release
+ac_add_options --disable-system-sqlite
# Workaround for mozbz#1341234
ac_add_options BINDGEN_CFLAGS="$(pkg-config nspr pixman-1 --cflags)"
diff --git a/firefox.spec b/firefox.spec
index c58202f..c012e42 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -1,36 +1,27 @@
%global system_nss 1
-%global system_sqlite 0
%global system_ffi 1
-%global system_cairo 0
%global system_libvpx 1
-%global system_libicu 0
%global hardened_build 1
%global system_jpeg 1
+%global run_tests 0
+%global disable_elfhack 0
%global build_with_clang 0
%if 0%{?fedora} >= 29
%ifarch x86_64 aarch64
%global build_with_clang 1
%endif
%endif
-%global build_with_pgo 0
-%global use_bundled_cbindgen 1
+%global build_with_pgo 1
+%global use_bundled_cbindgen 1
%if 0%{?fedora} > 29
%global wayland_backend_default 1
%else
%global wayland_backend_default 0
%endif
-
# Big endian platforms
%ifarch ppc64 s390x
%global big_endian 1
%endif
-
-%ifarch %{ix86} x86_64
-%global run_tests 0
-%else
-%global run_tests 0
-%endif
-
%bcond_without debug_build
%if %{with debug_build}
%else
@@ -39,10 +30,15 @@
%global debug_build 0
%endif
-%global disable_elfhack 0
-#%if !0%{?build_with_clang}
-#%global disable_elfhack 1
-#%endif
+%if 0%{?build_with_pgo}
+%global use_xvfb 1
+%global build_tests 1
+%endif
+
+%if !0%{?run_tests}
+%global use_xvfb 1
+%global build_tests 1
+%endif
%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
@@ -56,21 +52,11 @@
%if %{?system_nss}
%global nspr_version 4.19
-# NSS/NSPR quite often ends in build override, so as requirement the version
-# we're building against could bring us some broken dependencies from time to time.
-#%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536)
%global nspr_build_version %{nspr_version}
%global nss_version 3.40.1
-#%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536)
%global nss_build_version %{nss_version}
%endif
-%if %{?system_sqlite}
-%global sqlite_version 3.8.4.2
-# The actual sqlite version (see #480989):
-%global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536)
-%endif
-
%global mozappdir %{_libdir}/%{name}
%global mozappdirdev %{_libdir}/%{name}-devel-%{version}
%global langpackdir %{mozappdir}/langpacks
@@ -90,7 +76,8 @@
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 64.0
-Release: 2%{?pre_tag}%{?dist}
+
+Release: 3%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version...
@@ -166,9 +153,6 @@ BuildRequires: pkgconfig(nspr) >= %{nspr_version}
BuildRequires: pkgconfig(nss) >= %{nss_version}
BuildRequires: nss-static >= %{nss_version}
%endif
-%if %{?system_cairo}
-BuildRequires: pkgconfig(cairo) >= %{cairo_version}
-%endif
BuildRequires: pkgconfig(libpng)
%if %{?system_jpeg}
BuildRequires: libjpeg-devel
@@ -246,16 +230,11 @@ Requires: nss >= 3.29.3-1.1
BuildRequires: desktop-file-utils
BuildRequires: system-bookmarks
-%if %{?system_sqlite}
-BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-Requires: sqlite >= %{sqlite_build_version}
-%endif
-
%if %{?system_ffi}
BuildRequires: pkgconfig(libffi)
%endif
-%if %{?run_tests}
+%if 0%{?use_xvfb}
BuildRequires: xorg-x11-server-Xvfb
%endif
BuildRequires: rust
@@ -391,18 +370,6 @@ echo "ac_add_options --without-system-nspr" >> .mozconfig
echo "ac_add_options --without-system-nss" >> .mozconfig
%endif
-%if %{?system_sqlite}
-echo "ac_add_options --enable-system-sqlite" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-sqlite" >> .mozconfig
-%endif
-
-%if %{?system_cairo}
-echo "ac_add_options --enable-system-cairo" >> .mozconfig
-%else
-echo "ac_add_options --disable-system-cairo" >> .mozconfig
-%endif
-
%if %{?system_ffi}
echo "ac_add_options --enable-system-ffi" >> .mozconfig
%endif
@@ -446,7 +413,7 @@ echo "ac_add_options --disable-webrtc" >> .mozconfig
echo "ac_add_options --disable-crashreporter" >> .mozconfig
%endif
-%if %{?run_tests}
+%if 0%{?build_tests}
echo "ac_add_options --enable-tests" >> .mozconfig
%endif
@@ -462,11 +429,6 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
echo "ac_add_options --without-system-libvpx" >> .mozconfig
%endif
-%if %{?system_libicu}
-echo "ac_add_options --with-system-icu" >> .mozconfig
-%else
-echo "ac_add_options --without-system-icu" >> .mozconfig
-%endif
%ifarch s390 s390x
echo "ac_add_options --disable-ion" >> .mozconfig
%endif
@@ -494,17 +456,6 @@ env CARGO_HOME=.cargo cargo install cbindgen
#---------------------------------------------------------------------
%build
-%if %{?system_sqlite}
-# Do not proceed with build if the sqlite require would be broken:
-# make sure the minimum requirement is non-empty, ...
-sqlite_version=$(expr "%{sqlite_version}" : '\([0-9]*\.\)[0-9]*\.') || exit 1
-# ... and that major number of the computed build-time version matches:
-case "%{sqlite_build_version}" in
- "$sqlite_version"*) ;;
- *) exit 1 ;;
-esac
-%endif
-
%if 0%{?use_bundled_cbindgen}
export PATH=`pwd`/.cargo/bin:$PATH
%endif
@@ -519,13 +470,6 @@ echo "Generate big endian version of config/external/icu/data/icud58l.dat"
# Update the various config.guess to upstream release for aarch64 support
find ./ -name config.guess -exec cp /usr/lib/rpm/config.guess {} ';'
-# -fpermissive is needed to build with gcc 4.6+ which has become stricter
-#
-# Mozilla builds with -Wall with exception of a few warnings which show up
-# everywhere in the code; so, don't override that.
-#
-# Disable C++ exceptions since Mozilla code is not exception-safe
-#
MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
#rhbz#1037063
# -Werror=format-security causes build failures when -Wno-format is explicitly given
@@ -533,11 +477,6 @@ MOZ_OPT_FLAGS=$(echo "%{optflags}" | %{__sed} -e 's/-Wall//')
# Explicitly force the hardening flags for Firefox so it passes the checksec test;
# See also https://fedoraproject.org/wiki/Changes/Harden_All_Packages
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -Wformat-security -Wformat -Werror=format-security"
-%if 0%{?fedora} > 23
-# Disable null pointer gcc6 optimization in gcc6 (rhbz#1328045)
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fno-delete-null-pointer-checks"
-%endif
-# Use hardened build?
%if %{?hardened_build}
MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
%endif
@@ -603,11 +542,14 @@ MOZ_SMP_FLAGS=-j1
export MOZ_MAKE_FLAGS="$MOZ_SMP_FLAGS"
export MOZ_SERVICES_SYNC="1"
export STRIP=/bin/true
+%if 0%{?build_with_pgo}
+xvfb-run ./mach build
+%else
./mach build
+%endif
# create debuginfo for crash-stats.mozilla.com
%if %{enable_mozilla_crashreporter}
-#cd %{moz_objdir}
make -C objdir buildsymbols
%endif
@@ -898,8 +840,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper(a)mozilla.org.xpi
%attr(644, root, root) %{mozappdir}/browser/blocklist.xml
-#%dir %{mozappdir}/browser/extensions
-#%{mozappdir}/browser/extensions/*
%if %{with langpacks}
%dir %{langpackdir}
%endif
@@ -943,6 +883,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Dec 12 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-3
+- Updated PGO build setup.
+
* Tue Dec 4 2018 Martin Stransky <stransky(a)redhat.com> - 64.0-2
- Updated to Firefox 64 (Build 3)
- Built with Clang on some arches.
5 years, 5 months
Architecture specific change in rpms/firefox.git
by githook-noreply@fedoraproject.org
The package rpms/firefox.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/firefox.git/commit/?id=3336f2b994....
Change:
+%ifarch %{arm}
Thanks.
Full change:
============
commit 3336f2b99462836caf87ad455525be1a20b05809
Author: Martin Stransky <stransky(a)redhat.com>
Date: Wed Dec 12 09:07:02 2018 +0100
Disable debuginginfo on x390/arm to link that packages
diff --git a/firefox.spec b/firefox.spec
index 44047da..c58202f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -126,7 +126,6 @@ Patch37: build-jit-atomic-always-lucky.patch
Patch38: build-cacheFlush-missing.patch
Patch40: build-aarch64-skia.patch
Patch41: build-disable-elfhack.patch
-Patch42: prio-nss-build.patch
Patch44: mozilla-1494037.patch
Patch46: firefox-debug-build.patch
@@ -339,8 +338,6 @@ This package contains results of tests executed during build.
%patch41 -p1 -b .disable-elfhack
%endif
%patch3 -p1 -b .arm
-# Build with system nss
-#%patch42 -p1 -b .nss-build
%patch44 -p1 -b .1494037
%patch46 -p1 -b .debug
@@ -547,13 +544,17 @@ MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
%if %{?debug_build}
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-O2//')
%endif
-%ifarch s390 %{arm}
+%ifarch s390
MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g1/')
# If MOZ_DEBUG_FLAGS is empty, firefox's build will default it to "-g" which
# overrides the -g1 from line above and breaks building on s390/arm
# (OOM when linking, rhbz#1238225)
export MOZ_DEBUG_FLAGS=" "
%endif
+%ifarch %{arm}
+MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-g/-g0/')
+export MOZ_DEBUG_FLAGS=" "
+%endif
%if !0%{?build_with_clang}
%ifarch s390 %{arm} ppc aarch64 %{ix86}
MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
diff --git a/prio-nss-build.patch b/prio-nss-build.patch
deleted file mode 100644
index 3854572..0000000
--- a/prio-nss-build.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-diff -up firefox-63.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium.old firefox-63.0/media/libyuv/libyuv/tools_libyuv/autoroller/unittests/testdata/DEPS.chromium
-diff -up firefox-63.0/media/webrtc/trunk/Makefile.old firefox-63.0/media/webrtc/trunk/Makefile
-diff -up firefox-63.0/third_party/prio/include/mprio.h.old firefox-63.0/third_party/prio/include/mprio.h
---- firefox-63.0/third_party/prio/include/mprio.h.old 2018-10-18 15:10:24.616102952 +0200
-+++ firefox-63.0/third_party/prio/include/mprio.h 2018-10-18 15:10:33.853076714 +0200
-@@ -14,9 +14,9 @@ extern "C" {
- #endif
-
- #include <msgpack.h>
--#include <nss/blapit.h>
--#include <nss/pk11pub.h>
--#include <nss/seccomon.h>
-+#include <blapit.h>
-+#include <pk11pub.h>
-+#include <seccomon.h>
- #include <stdbool.h>
- #include <stddef.h>
-
-diff -up firefox-63.0/third_party/prio/prio/encrypt.c.old firefox-63.0/third_party/prio/prio/encrypt.c
---- firefox-63.0/third_party/prio/prio/encrypt.c.old 2018-10-18 15:15:08.279250181 +0200
-+++ firefox-63.0/third_party/prio/prio/encrypt.c 2018-10-18 15:15:14.614229961 +0200
-@@ -6,9 +6,9 @@
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
--#include <nss/keyhi.h>
--#include <nss/keythi.h>
--#include <nss/pk11pub.h>
-+#include <keyhi.h>
-+#include <keythi.h>
-+#include <pk11pub.h>
- #include <prerror.h>
-
- #include "encrypt.h"
-diff -up firefox-63.0/third_party/prio/prio/prg.c.old firefox-63.0/third_party/prio/prio/prg.c
---- firefox-63.0/third_party/prio/prio/prg.c.old 2018-10-18 15:15:21.364208421 +0200
-+++ firefox-63.0/third_party/prio/prio/prg.c 2018-10-18 15:15:27.542188720 +0200
-@@ -7,8 +7,8 @@
- */
-
- #include <mprio.h>
--#include <nss/blapit.h>
--#include <nss/pk11pub.h>
-+#include <blapit.h>
-+#include <pk11pub.h>
- #include <string.h>
-
- #include "prg.h"
-diff -up firefox-63.0/third_party/prio/prio/prg.h.old firefox-63.0/third_party/prio/prio/prg.h
---- firefox-63.0/third_party/prio/prio/prg.h.old 2018-10-18 15:15:35.511163303 +0200
-+++ firefox-63.0/third_party/prio/prio/prg.h 2018-10-18 15:15:40.568147167 +0200
-@@ -10,7 +10,7 @@
- #define __PRG_H__
-
- #include <mpi.h>
--#include <nss/blapit.h>
-+#include <blapit.h>
- #include <stdlib.h>
-
- #include "config.h"
-diff -up firefox-63.0/third_party/prio/prio/rand.c.old firefox-63.0/third_party/prio/prio/rand.c
---- firefox-63.0/third_party/prio/prio/rand.c.old 2018-10-18 15:15:49.967117182 +0200
-+++ firefox-63.0/third_party/prio/prio/rand.c 2018-10-18 15:16:00.130084760 +0200
-@@ -8,9 +8,9 @@
-
- #include <limits.h>
- #include <mprio.h>
--#include <nss/nss.h>
--#include <nss/pk11pub.h>
--#include <nspr/prinit.h>
-+#include <nss.h>
-+#include <pk11pub.h>
-+#include <prinit.h>
-
- #include "debug.h"
- #include "rand.h"
-diff -up firefox-63.0/third_party/prio/prio/rand.h.old firefox-63.0/third_party/prio/prio/rand.h
---- firefox-63.0/third_party/prio/prio/rand.h.old 2018-10-18 15:14:49.689309517 +0200
-+++ firefox-63.0/third_party/prio/prio/rand.h 2018-10-18 15:14:56.789286855 +0200
-@@ -10,7 +10,7 @@
- #define __RAND_H__
-
- #include <mpi.h>
--#include <nss/seccomon.h>
-+#include <seccomon.h>
- #include <stdlib.h>
-
- /*
5 years, 5 months