update code

poppler.spec

@@ -3,7 +3,7 @@
  
 Name:           poppler
 Version:        0.67.0
-Release:        2
+Release:        3
 Summary:        Poppler is a PDF rendering library based on the xpdf-3.0 code base
 License:        (GPLv2 or GPLv3) and GPLv2+ and LGPLv2+ and MIT
 URL:            https://poppler.freedesktop.org/
@@ -33,23 +33,44 @@ BuildRequires:  nss-devel poppler-data-devel git
 
 Requires:       poppler-data 
 Obsoletes:      poppler-glib-demos < 0.60.1-1
-Provides:       poppler-glib poppler-cpp poppler-utils 
+Provides:       poppler-utils 
-Obsoletes:      poppler-glib poppler-cpp poppler-utils
+Obsoletes:      poppler-utils
 
 %description
 Poppler is a free software utility library for rendering Portable Document Format (PDF) documents. \
 Its development is supported by freedesktop.org. It is commonly used on Linux systems,and is used by \
 the PDF viewers of the open source GNOME and KDE desktop environments.
 
-%package        devel
+%package devel
-Summary:        Provide header files and libraries for poppler
+Summary: Provide header files and libraries for poppler
-Requires:       %{name} = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
-Obsoletes:      poppler-glib-devel cpp-devel
-Provides:       poppler-glib-devel cpp-devel
 
 %description devel
 The package provides necessary files and documents for the use of compiling applications based on poppler
 
+%package glib
+Summary: Provide glib wrapper for poppler
+Requires: %{name} = %{version}-%{release}
+
+%description glib
+This package provides glib wrapper for poppler
+
+%package glib-devel
+Summary: Provide development files for glib wrapper
+Requires: %{name}-glib = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+Suggests: %{name}-doc = %{version}-%{release}
+
+%description glib-devel
+This package provides development files for glib wrapper
+
+%package glib-doc
+Summary: Provide documentation for glib wrapper
+BuildArch: noarch
+
+%description glib-doc
+This package provides documentation files for glib wrapper
+
 %package qt
 Summary: Provides Qt4 wrapper for poppler
 Requires: %{name} = %{version}-%{release}
@@ -65,7 +86,7 @@ Summary: Provides development files for Qt4 wrapper
 Requires: %{name}-qt = %{version}-%{release}
 Requires: %{name}-devel = %{version}-%{release}
 Obsoletes: poppler-qt4-devel < 0.16.0-3
-Provides:  poppler-qt4-devel = %{version}-%{release}
+Provides: poppler-qt4-devel = %{version}-%{release}
 Requires: qt4-devel
 
 %description qt-devel
@@ -87,6 +108,21 @@ Requires: qt5-qtbase-devel
 %description qt5-devel
 This package provides development files for Qt5 wrapper.
 
+%package cpp
+Summary: Provide pure C++ wrapper for poppler
+Requires: %{name} = %{version}-%{release}
+
+%description cpp
+This package provides pure C++ wrapper for poppler
+
+%package cpp-devel
+Summary: Provide development files for C++ wrapper
+Requires: %{name}-cpp = %{version}-%{release}
+Requires: %{name}-devel = %{version}-%{release}
+
+%description cpp-devel
+This package provides development files for C++ wrapper
+
 %package_help
 
 %prep
@@ -120,59 +156,88 @@ test "$(pkg-config --modversion poppler-splash)" = "%{version}"
 
 %ldconfig_scriptlets
 
+%ldconfig_scriptlets glib
+
 %ldconfig_scriptlets qt
 
 %ldconfig_scriptlets qt5
 
+%ldconfig_scriptlets cpp
+
 %files
 %defattr(-,root,root)
 %license COPYING
 %{_bindir}/pdf*
 %{_libdir}/libpoppler.so.78*
-%{_libdir}/libpoppler-glib.so.8*
-%{_libdir}/libpoppler-cpp.so.0*
-%{_libdir}/girepository-1.0/Poppler-0.18.typelib
 
 %files devel 
 %defattr(-,root,root)
-%dir %{_includedir}/poppler/
+%{_includedir}/poppler/*.h            
-%{_includedir}/poppler/*.h
+%{_includedir}/poppler/fofi/           
-%{_includedir}/poppler/fofi/
+%{_includedir}/poppler/goo/          
-%{_includedir}/poppler/goo/
+%{_includedir}/poppler/splash/            
-%{_includedir}/poppler/splash/
+%{_libdir}/pkgconfig/poppler.pc          
-%{_includedir}/poppler/glib/
+%{_libdir}/pkgconfig/poppler-splash.pc      
-%{_includedir}/poppler/cpp
+%{_libdir}/libpoppler.so                      
-%{_libdir}/pkgconfig/poppler.pc
+
-%{_libdir}/pkgconfig/poppler-splash.pc
+%files glib
-%{_libdir}/libpoppler.so
+%defattr(-,root,root)
+%{_libdir}/libpoppler-glib.so.8*
+%{_libdir}/girepository-1.0/Poppler-0.18.typelib
+
+%files glib-devel
+%defattr(-,root,root)
 %{_libdir}/pkgconfig/poppler-glib.pc
-%{_libdir}/pkgconfig/poppler-c*.pc
+%{_libdir}/pkgconfig/poppler-cairo.pc
-%{_libdir}/libpoppler-cpp.so
 %{_libdir}/libpoppler-glib.so
 %{_datadir}/gir-1.0/Poppler-0.18.gir
+%{_includedir}/poppler/glib/
+
+%files glib-doc
+%defattr(-,root,root)
+%{_datadir}/gtk-doc/
 
 %files qt  
+%defattr(-,root,root)
 %{_libdir}/libpoppler-qt4.so.4*
 
 %files qt-devel
+%defattr(-,root,root)
 %{_libdir}/libpoppler-qt4.so
 %{_libdir}/pkgconfig/poppler-qt4.pc
 %{_includedir}/poppler/qt4/
 
 %files qt5
+%defattr(-,root,root)
 %{_libdir}/libpoppler-qt5.so.1*
 
 %files qt5-devel
+%defattr(-,root,root)
 %{_libdir}/libpoppler-qt5.so
 %{_libdir}/pkgconfig/poppler-qt5.pc
 %{_includedir}/poppler/qt5/
 
+%files cpp
+%defattr(-,root,root)
+%{_libdir}/libpoppler-cpp.so.0*
+
+%files cpp-devel
+%defattr(-,root,root)
+%{_libdir}/pkgconfig/poppler-cpp.pc
+%{_libdir}/libpoppler-cpp.so
+%{_includedir}/poppler/cpp
+
 %files help
 %defattr(-,root,root)
 %doc README
-%{_datadir}/gtk-doc/
 %{_mandir}/man1/*
 
 %changelog
+* Mon Oct 14 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-3
+- Type:enhancement
+- Id:NA
+- SUG:NA
+- DESC:Adjust sub-package relationship
+
 * Fri Sep 20 2019 openEuler Buildteam <buildteam@openeuler.org> - 0.67.0-2
 - Package init