updated 3 packages

inkscape-1.0.2-2

poppler-data-0.4.10-1

poppler-21.03.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12563 ec354946-7b23-47d6-9f5a-488ba84defc7

i/inkscape/inkscape-vl.spec

@@ -5,7 +5,7 @@ Name:           inkscape
 Summary:        A Vector Drawing Application
 Summary(ja):    ベクター描画アプリケーション
 Version:        1.0.2
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Group:          graphics
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -158,6 +158,9 @@ gtk-update-icon-cache %{_iconsdir}/icons/hicolor &> /dev/null || :
 
 
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-2
+- rebuilt with poppler-21.03.0.
+
 * Sat Feb 27 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.0.2-1
 - new upstream release.
 

p/poppler-data/poppler-data-vl.spec

@@ -1,10 +1,9 @@
 Name:           poppler-data
 Summary:        Poppler encoding data.
 Summary(ja):    Poppler 用のエンコード用データ
-Version:        0.4.9
+Version:        0.4.10
 Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          publishing
-
 Vendor:         Project Vine
 Distribution:   Vine Linux
 
@@ -29,7 +28,7 @@ Cyrillic properly.
 %package devel
 Summary: Developer files for %{name}
 Summary(ja): %{name} の開発用ファイル
-Group: Development/Libraries
+Group: programming
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig
 
@@ -40,6 +39,7 @@ This package consists of development files for poppler.
 %prep
 %setup -q
 
+
 %install
 %{__rm} -rf %{buildroot}
 %{__make} DESTDIR=%{buildroot} datadir=%{_datadir} install
@@ -58,7 +58,11 @@ This package consists of development files for poppler.
 %files devel
 %{_datadir}/pkgconfig/poppler-data.pc
 
+
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.10-1
+- new upstream release.
+
 * Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.9-1
 - new upstream release.
 

p/poppler/poppler-vl.spec

@@ -3,9 +3,9 @@
 Name:           poppler
 Summary:        PDF rendering library.
 Summary(ja):    PDF レンダリング用ライブラリ
-Version:        0.81.0
+Version:        21.03.0
-Release:        2%{?_dist_release}
+Release:        1%{?_dist_release}
-Group:          System Environment/Libraries
+Group:          system
 
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -15,18 +15,17 @@ License:        GPLv2
 URL:            https://poppler.freedesktop.org/
 Source0:        https://poppler.freedesktop.org/%{name}-%{version}.tar.xz
 
-Patch1:         poppler-revert-drop-qt4.patch
-Patch2:         poppler-qt4-sync-0_81_0.patch
-Patch3:         poppler-0.81.0-qt4-const.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1185007
 Patch4:         poppler-0.30.0-rotated-words-selection.patch
+Patch5:         poppler-0.90.0-position-independent-code.patch
+Patch6:         poppler-21.01.0-glib-introspection.patch
 
 BuildRequires:	cmake
 BuildRequires:	gettext-devel
-BuildRequires:	gtk2-devel >= 2.2.0
 %if %{with doc}
 BuildRequires:	gtk-doc
 %endif
+BuildRequires:	glib2-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	zlib-devel
 BuildRequires:  libjpeg-devel
@@ -48,6 +47,8 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Obsoletes:	%{name}-qt < 0.18
 Obsoletes:	%{name}-qt-devel < 0.18
+Obsoletes:	%{name}-qt4 < 0.81.1
+Obsoletes:	%{name}-qt4-devel < 0.81.1
 
 %description
 Poppler is a PDF rendering library based on the xpdf-3.0 code base.
@@ -61,9 +62,9 @@ Popplerは xpdf-3.0 のコードをベースにした PDF レンダリング用
 %package devel
 Summary:	Libraries and headers for poppler
 Summary(ja): 	poppler用の開発ライブラリおよびヘッダファイル
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name} = %{version}-%{release}
-Requires:	gtk2-devel
+Requires:	glib2-devel
 
 %description devel
 This package includes the files needed for developing and compiling
@@ -79,31 +80,10 @@ develop applications based on poppler.
 poppler をベースにしたアプリケーションを開発するなら、このパッケージ
 をインストールしてください。
 
-#-----------------------------------------------------------------------------
-
-%package qt4
-Summary:	Qt4 wrapper for poppler
-Group:		System Environment/Libraries
-Requires:	%{name} = %{version}-%{release}
-Requires:	qt4 >= 4.4.0
-
-%description qt4
-Qt4 wrapper for poppler. 
-
-%package qt4-devel
-Summary:	Development files for poppler Qt4 wrapper
-Group:		Development/Libraries
-Requires:	%{name}-qt4 = %{version}-%{release}
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	qt4-devel >= 4.4.0
-
-%description qt4-devel
-Development files for poppler Qt4 wrapper
-
 #-----------------------------------------------------------------------------
 %package qt5
 Summary:	Qt5 wrapper for poppler
-Group:		System Environment/Libraries
+Group:		system
 Requires:	%{name} = %{version}-%{release}
 Requires:	qt5-qtbase
 
@@ -112,7 +92,7 @@ Qt5 wrapper for poppler.
 
 %package qt5-devel
 Summary:	Development files for poppler Qt5 wrapper
-Group:		Development/Libraries
+Group:		programming
 Requires:	%{name}-qt5 = %{version}-%{release}
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	qt5-qtbase-devel
@@ -124,7 +104,7 @@ Development files for poppler Qt4 wrapper
 
 %package utils
 Summary:	Command line utilities for converting PDF files
-Group:		Applications/Text
+Group:		publishing
 Requires:	%{name} = %{version}-%{release}
 
 %description utils
@@ -133,13 +113,17 @@ converting PDF files to a number of other formats.
 
 #-----------------------------------------------------------------------------
 
+%debug_package
+
+#-----------------------------------------------------------------------------
+
 %prep
 %autosetup -p1
 
+chmod -x poppler/CairoFontEngine.cc
+
+
 %build
-mkdir build
-cd build
-export CC="gcc -fPIC" # hack to make the cmake call pass
 %cmake \
   -DENABLE_CMS=lcms2 \
   -DENABLE_DCTDECODER=libjpeg \
@@ -151,32 +135,22 @@ export CC="gcc -fPIC" # hack to make the cmake call pass
   -DENABLE_ZLIB=OFF \
   -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
   ..
-unset CC
 
-%{__make} %{?_smp_mflags}
+%cmake_build
+
 
 %install
 %{__rm} -rf ${RPM_BUILD_ROOT}
-cd build
+%cmake_install
-%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
-# remove unnecessary files.
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libpoppler.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libpoppler-cpp.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libpoppler-glib.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libpoppler-qt4.la
-%{__rm} -rf ${RPM_BUILD_ROOT}/%{_libdir}/libpoppler-qt5.la
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
-%post -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
+%ldconfig_scriptlets qt5
 
-%post qt4 -p /sbin/ldconfig
-
-%postun qt4 -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -184,7 +158,6 @@ cd build
 %doc AUTHORS INSTALL NEWS README*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/*.typelib
-%exclude %{_libdir}/libpoppler-qt4.so.*
 %exclude %{_libdir}/libpoppler-qt5.so.*
 
 %files devel
@@ -196,23 +169,10 @@ cd build
 %if %{with doc}
 %{_datadir}/gtk-doc/html/poppler
 %endif
-%exclude %{_libdir}/libpoppler-qt4.so
 %exclude %{_libdir}/libpoppler-qt5.so
-%exclude %{_libdir}/pkgconfig/poppler-qt4.pc
 %exclude %{_libdir}/pkgconfig/poppler-qt5.pc
-%exclude %{_includedir}/poppler/qt4
 %exclude %{_includedir}/poppler/qt5
 
-%files qt4
-%defattr(-, root, root)
-%{_libdir}/libpoppler-qt4.so.*
-
-%files qt4-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.*
@@ -228,7 +188,14 @@ cd build
 %{_bindir}/pdf*
 %{_mandir}/man1/pdf*
 
+
 %changelog
+* Wed Mar 03 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 21.03.0-1
+- new upstream release.
+- dropped Qt4 support.
+- updated Patch4.
+- imported Patch5-6 from rawhide.
+
 * Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.81.0-2
 - added "-DENABLE_UNSTABLE_API_ABI_HEADERS=ON" to cmake options.