Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/poppler.git#1a2b38df7aa313c1cf7f14d5f17371712d9bafbb

poppler-21.01.0-glib-introspection.patch

@@ -0,0 +1,11 @@
+--- poppler-21.01.0/glib/CMakeLists.txt
++++ poppler-21.01.0/glib/CMakeLists.txt
+@@ -121,7 +121,7 @@ if (HAVE_INTROSPECTION AND BUILD_SHARED_
+ 
+   # General gir: Reset object-list for introspection & load tool args
+   set(INTROSPECTION_GIRS)
+-  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all")
++  set(INTROSPECTION_SCANNER_ARGS "--add-include-path=${CMAKE_CURRENT_SOURCE_DIR}" "--warn-all" "--sources-top-dirs=${CMAKE_SOURCE_DIR}" "--sources-top-dirs=${CMAKE_BINARY_DIR}")
+   set(INTROSPECTION_COMPILER_ARGS "--includedir=${CMAKE_CURRENT_SOURCE_DIR}")
+ 
+   # Poppler: Assign package to gir & export keys

poppler.spec

@@ -4,7 +4,7 @@
 Summary: PDF rendering library
 Name:    poppler
 Version: 21.01.0
-Release: 1%{?dist}
+Release: 4%{?dist}
 License: (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 URL:     http://poppler.freedesktop.org/
 Source0: http://poppler.freedesktop.org/poppler-%{version}.tar.xz
@@ -19,6 +19,8 @@ Patch1:  poppler-0.90.0-position-independent-code.patch
 # Bogus volatiles detected by gcc-11
 Patch2:  %{name}-gcc11.patch
 
+Patch3:  poppler-21.01.0-glib-introspection.patch
+
 BuildRequires: make
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -210,6 +212,18 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.01.0-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 15 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-3
+- Improve the previous fix
+- Resolves: #1915776
+
+* Wed Jan 13 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-2
+- Fix multilib property of poppler-glib
+- by using the same build directory for all architectures
+- Resolves: #1915776
+
 * Mon Jan 11 2021 Marek Kasik <mkasik@redhat.com> - 21.01.0-1
 - Update to 21.01.0
 - Remove the Qt4 frontend