Improve the previous fix

Resolves: #1915776

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

@@ -1,15 +1,10 @@
 %global test_sha 03a4b9eb854a06a83c465e82de601796c458bbe9
 %global test_date 2021-01-11
 
-# We need the same path for all architectures because the path
-# is included in introspection file and breaks multilib requirements
-# if it is different.
-%global _vpath_builddir build
-
 Summary: PDF rendering library
 Name:    poppler
 Version: 21.01.0
-Release: 2%{?dist}
+Release: 3%{?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
@@ -24,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++
@@ -215,6 +212,10 @@ test "$(pkg-config --modversion poppler-qt5)" = "%{version}"
 %{_mandir}/man1/*
 
 %changelog
+* 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