updated 7 packages

cups-filters-1.25.11-1

icu-65.1-2

lsb-4.0-5

openjpeg2-2.3.1-2

poppler-data-0.4.9-1

poppler-0.81.0-2

poppler061-0.61.1-2

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

c/cups-filters/cups-filters-vl.spec

@@ -1,27 +1,29 @@
 # we build CUPS also with relro
 %global _hardened_build 1
 
-%define _unpackaged_files_terminate_build 1
+Summary:        OpenPrinting CUPS filters and backends
+Name:           cups-filters
+Version:        1.25.11
+Release:        1%{?_dist_release}
+Group:          System Environment/Base
 
-Summary: OpenPrinting CUPS filters and backends
-Name:    cups-filters
-Version: 1.18.0
-Release: 3%{?_dist_release}
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       tomop
 
 # For a breakdown of the licensing, see COPYING file
 # GPLv2:   filters: commandto*, imagetoraster, pdftops, rasterto*,
 #                   imagetopdf, pstopdf, texttopdf
 #         backends: parallel, serial
-# GPLv2+:  filters: gstopxl, textonly, texttops, imagetops
+# GPLv2+:  filters: gstopxl, textonly, texttops, imagetops, foomatic-rip
 # GPLv3:   filters: bannertopdf
-# GPLv3+:  filters: urftopdf
+# GPLv3+:  filters: urftopdf, rastertopdf
 # LGPLv2+:   utils: cups-browsed
 # MIT:     filters: gstoraster, pdftoijs, pdftoopvp, pdftopdf, pdftoraster
-License: GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT
+License:        GPLv2 and GPLv2+ and GPLv3 and GPLv3+ and LGPLv2+ and MIT and BSD with advertising
 
-Group:   System Environment/Base
-Url:     http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters
-Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
+URL:            https://wiki.linuxfoundation.org/openprinting/cups-filters
+Source0:        http://openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
 
 Requires: cups
 Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
@@ -75,9 +77,6 @@ Requires: bc grep sed
 Provides: ghostscript-cups = 9.08
 Obsoletes: ghostscript-cups < 9.08
 
-Vendor: Project Vine
-Distribution: Vine Linux
-Packager: tomop
 
 %package libs
 Summary: OpenPrinting CUPS filters and backends - cupsfilters and fontembed libraries
@@ -204,6 +203,7 @@ fi
 
 
 %files
+%license COPYING
 %doc __doc/README __doc/AUTHORS __doc/NEWS
 %config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf
 %{_bindir}/driverless
@@ -236,7 +236,8 @@ fi
 %{_mandir}/man5/cups-browsed.conf.5.gz
 
 %files libs
-%doc __doc/COPYING fontembed/README
+%license __doc/COPYING
+%doc fontembed/README
 %{_libdir}/libcupsfilters.so.*
 %{_libdir}/libfontembed.so.*
 
@@ -250,6 +251,10 @@ fi
 %{_libdir}/libfontembed.so
 
 %changelog
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.25.11-1
+- new upstream release.
+- built with poppler-0.81.0.
+
 * Tue Sep 04 2018 Toshiaki Ara <ara_t@384.jp> 1.18.0-3
 - rebuild with qpdf-8.1.0
 

i/icu/icu-vl.spec

@@ -1,3 +1,5 @@
+%define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
+
 %define sover 65
 %define minorver 1
 
@@ -5,7 +7,7 @@ Summary: International Components for Unicode
 Summary(ja): ユニコード用国際化コンポーネント
 Name: icu
 Version: %{sover}.%{minorver}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 Group:   Development/Tools
 License: MIT
 URL:     http://icu-project.org/
@@ -57,6 +59,21 @@ Requires: libicu%{sover} = %{version}-%{release}
 %description -n libicu-doc
 This package contains the development documentation for %{name}. 
 
+# compat32
+%if %{build_compat32}
+%package -n compat32-libicu%{sover}
+Summary: International Components for Unicode (library)
+Summary(ja): ユニコード用国際化コンポーネント (ライブラリ）
+Group: System Environment/Libraries
+Provides: compat32-libicu = %{version}-%{release}
+
+%description -n compat32-libicu%{sover}
+ICU is a C++ and C library that provides robust and full-featured Unicode
+support. This package contains the runtime libraries for ICU. It does not
+contain any of the data files needed at runtime.
+%endif
+
+
 %prep
 %setup -q -n icu
 
@@ -132,13 +149,23 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc docs/*
 
+%if %{build_compat32}
+%files -n compat32-libicu%{sover}
+%license LICENSE
+%defattr(-, root, root, 0755)
+%{_libdir}/*.so.*
+%endif
+
 %changelog
+* Sun Oct 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 65.1-2
+- made to build compat32-* package.
+
 * Sun Oct 13 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 65.1-1
 - updated to 65.1.
 
 * Fri Aug 30 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.3-1
 - updated to 60.3.
-- disables test on i686.
+- disabled tests on i686.
 
 * Mon Jan 08 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 60.2-1
 - updated to 60.2.

l/lsb/lsb-vl.spec

@@ -50,7 +50,7 @@ Summary: LSB support for Vine Linux
 Summary(ja): Vine Linux の LSB サポート
 Name: lsb
 Version: 4.0
-Release: 4%{?_dist_release}
+Release: 5%{?_dist_release}
 URL: http://www.linuxfoundation.org/
 Source0: %{name}-vine-%{version}.tar.bz2
 License: GPLv2
@@ -111,7 +111,7 @@ Requires: libpango-1.0.so.0
 Requires: libpangoft2-1.0.so.0
 Requires: libpangoxft-1.0.so.0
 Requires: libpthread.so.0
-Requires: libqt-mt.so.3
+#Requires: libqt-mt.so.3
 Requires: libQtCore.so.4
 Requires: libQtGui.so.4
 Requires: libQtNetwork.so.4
@@ -124,176 +124,6 @@ Requires: libutil.so.1
 Requires: libz.so.1
 %endif
 
-%ifarch ia64
-# archLSB IA64 Base Libraries
-Requires: libatk-1.0.so.0()(64bit)
-Requires: libc.so.6.1()(64bit)
-Requires: libcrypt.so.1()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libgdk-x11-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
-Requires: libglib-2.0.so.0()(64bit)
-Requires: libgmodule-2.0.so.0()(64bit)
-Requires: libgobject-2.0.so.0()(64bit)
-Requires: libgthread-2.0.so.0()(64bit)
-Requires: libgtk-x11-2.0.so.0()(64bit)
-Requires: libm.so.6.1()(64bit)
-Requires: libncurses.so.5()(64bit)
-Requires: libpango-1.0.so.0()(64bit)
-Requires: libpangoft2-1.0.so.0()(64bit)
-Requires: libpangoxft-1.0.so.0()(64bit)
-Requires: libpthread.so.0()(64bit)
-Requires: libqt-mt.so.3()(64bit)
-Requires: libQtCore.so.4()(64bit)
-Requires: libQtGui.so.4()(64bit)
-Requires: libQtNetwork.so.4()(64bit)
-Requires: libQtOpenGL.so.4()(64bit)
-Requires: libQtSql.so.4()(64bit)
-Requires: libQtSvg.so.4()(64bit)
-Requires: libQtXml.so.4()(64bit)
-Requires: libstdc++.so.6()(64bit)
-Requires: libutil.so.1()(64bit)
-Requires: libz.so.1()(64bit)
-%endif
-
-%ifarch ppc
-# archLSB PPC32 Base Libraries
-Requires: libatk-1.0.so.0
-Requires: libc.so.6
-Requires: libcrypt.so.1
-Requires: libdl.so.2
-Requires: libgcc_s.so.1
-Requires: libgdk-x11-2.0.so.0
-Requires: libgdk_pixbuf-2.0.so.0
-Requires: libgdk_pixbuf_xlib-2.0.so.0
-Requires: libglib-2.0.so.0
-Requires: libgmodule-2.0.so.0
-Requires: libgobject-2.0.so.0
-Requires: libgthread-2.0.so.0
-Requires: libgtk-x11-2.0.so.0
-Requires: libm.so.6
-Requires: libncurses.so.5
-Requires: libpango-1.0.so.0
-Requires: libpangoft2-1.0.so.0
-Requires: libpangoxft-1.0.so.0
-Requires: libpthread.so.0
-Requires: libqt-mt.so.3
-Requires: libQtCore.so.4
-Requires: libQtGui.so.4
-Requires: libQtNetwork.so.4
-Requires: libQtOpenGL.so.4
-Requires: libQtSql.so.4
-Requires: libQtSvg.so.4
-Requires: libQtXml.so.4
-Requires: libstdc++.so.6
-Requires: libutil.so.1
-Requires: libz.so.1
-%endif
-
-%ifarch ppc64
-# archLSB PPC64 Base Libraries
-Requires: libatk-1.0.so.0()(64bit)
-Requires: libc.so.6()(64bit)
-Requires: libcrypt.so.1()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libgdk-x11-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
-Requires: libglib-2.0.so.0()(64bit)
-Requires: libgmodule-2.0.so.0()(64bit)
-Requires: libgobject-2.0.so.0()(64bit)
-Requires: libgthread-2.0.so.0()(64bit)
-Requires: libgtk-x11-2.0.so.0()(64bit)
-Requires: libm.so.6()(64bit)
-Requires: libncurses.so.5()(64bit)
-Requires: libpango-1.0.so.0()(64bit)
-Requires: libpangoft2-1.0.so.0()(64bit)
-Requires: libpangoxft-1.0.so.0()(64bit)
-Requires: libpthread.so.0()(64bit)
-Requires: libqt-mt.so.3()(64bit)
-Requires: libQtCore.so.4()(64bit)
-Requires: libQtGui.so.4()(64bit)
-Requires: libQtNetwork.so.4()(64bit)
-Requires: libQtOpenGL.so.4()(64bit)
-Requires: libQtSql.so.4()(64bit)
-Requires: libQtSvg.so.4()(64bit)
-Requires: libQtXml.so.4()(64bit)
-Requires: libstdc++.so.6()(64bit)
-Requires: libutil.so.1()(64bit)
-Requires: libz.so.1()(64bit)
-%endif
-
-%ifarch s390
-# archLSB S390 Base Libraries
-Requires: libatk-1.0.so.0
-Requires: libc.so.6
-Requires: libcrypt.so.1
-Requires: libdl.so.2
-Requires: libgcc_s.so.1
-Requires: libgdk-x11-2.0.so.0
-Requires: libgdk_pixbuf-2.0.so.0
-Requires: libgdk_pixbuf_xlib-2.0.so.0
-Requires: libglib-2.0.so.0
-Requires: libgmodule-2.0.so.0
-Requires: libgobject-2.0.so.0
-Requires: libgthread-2.0.so.0
-Requires: libgtk-x11-2.0.so.0
-Requires: libm.so.6
-Requires: libncurses.so.5
-Requires: libpango-1.0.so.0
-Requires: libpangoft2-1.0.so.0
-Requires: libpangoxft-1.0.so.0
-Requires: libpthread.so.0
-Requires: libqt-mt.so.3
-Requires: libQtCore.so.4
-Requires: libQtGui.so.4
-Requires: libQtNetwork.so.4
-Requires: libQtOpenGL.so.4
-Requires: libQtSql.so.4
-Requires: libQtSvg.so.4
-Requires: libQtXml.so.4
-Requires: libstdc++.so.6
-Requires: libutil.so.1
-Requires: libz.so.1
-%endif
-
-%ifarch s390x
-# archLSB S390X Base Libraries
-Requires: libatk-1.0.so.0()(64bit)
-Requires: libc.so.6()(64bit)
-Requires: libcrypt.so.1()(64bit)
-Requires: libdl.so.2()(64bit)
-Requires: libgcc_s.so.1()(64bit)
-Requires: libgdk-x11-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf-2.0.so.0()(64bit)
-Requires: libgdk_pixbuf_xlib-2.0.so.0()(64bit)
-Requires: libglib-2.0.so.0()(64bit)
-Requires: libgmodule-2.0.so.0()(64bit)
-Requires: libgobject-2.0.so.0()(64bit)
-Requires: libgthread-2.0.so.0()(64bit)
-Requires: libgtk-x11-2.0.so.0()(64bit)
-Requires: libm.so.6()(64bit)
-Requires: libncurses.so.5()(64bit)
-Requires: libpango-1.0.so.0()(64bit)
-Requires: libpangoft2-1.0.so.0()(64bit)
-Requires: libpangoxft-1.0.so.0()(64bit)
-Requires: libpthread.so.0()(64bit)
-Requires: libqt-mt.so.3()(64bit)
-Requires: libQtCore.so.4()(64bit)
-Requires: libQtGui.so.4()(64bit)
-Requires: libQtNetwork.so.4()(64bit)
-Requires: libQtOpenGL.so.4()(64bit)
-Requires: libQtSql.so.4()(64bit)
-Requires: libQtSvg.so.4()(64bit)
-Requires: libQtXml.so.4()(64bit)
-Requires: libstdc++.so.6()(64bit)
-Requires: libutil.so.1()(64bit)
-Requires: libz.so.1()(64bit)
-%endif
-
 %ifarch x86_64
 # archLSB AMD64 Base Libraries
 Requires: libatk-1.0.so.0()(64bit)
@@ -315,7 +145,7 @@ Requires: libpango-1.0.so.0()(64bit)
 Requires: libpangoft2-1.0.so.0()(64bit)
 Requires: libpangoxft-1.0.so.0()(64bit)
 Requires: libpthread.so.0()(64bit)
-Requires: libqt-mt.so.3()(64bit)
+#Requires: libqt-mt.so.3()(64bit)
 Requires: libQtCore.so.4()(64bit)
 Requires: libQtGui.so.4()(64bit)
 Requires: libQtNetwork.so.4()(64bit)
@@ -356,7 +186,7 @@ Requires: libpangoft2-1.0.so.0%{qual}
 Requires: libpangoxft-1.0.so.0%{qual}
 Requires: libpng16.so.16%{qual}
 Requires: libpthread.so.0%{qual}
-Requires: libqt-mt.so.3%{qual}
+#Requires: libqt-mt.so.3%{qual}
 Requires: libQtCore.so.4%{qual}
 Requires: libQtGui.so.4%{qual}
 Requires: libQtNetwork.so.4%{qual}
@@ -627,6 +457,10 @@ fi
 /bin/mailx
 
 %changelog
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 4.0-5
+- made not to require qt3.
+- removed stuff for unsuppoted architectures.
+
 * Fri Sep 02 2016 Toshiaki Ara <ara_t@384.jp> 4.0-4
 - rebuild with gcc-5.4.0
 

o/openjpeg2/openjpeg2-vl.spec

@@ -10,7 +10,7 @@
 
 Name:           openjpeg2
 Version:        2.3.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 Summary:        C-Library for JPEG 2000
 Summary(ja):    JPEG 2000 用の C ライブラリ
 
@@ -34,6 +34,8 @@ Source1: data.tar.xz
 
 # Remove bundled libraries
 Patch0:         openjpeg2_remove-thirdparty.patch
+# opj_* to opj2_*
+Patch1:         openjpeg2_opj2.patch
 
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -66,6 +68,8 @@ Summary:        Development files for OpenJPEG 2
 Summary(ja):    OpenJPEG 2 の開発用ファイル
 Group:          Development/Libraries
 Requires:       %{name}%{?_isa} = %{version}-%{release}
+# OpenJPEGTargets.cmake refers to the tools
+Requires:       %{name}-tools%{?_isa} = %{version}-%{release}
 
 %description devel
 The %{name}-devel package contains libraries and header files for developing
@@ -220,6 +224,7 @@ OpenJPEG2 JP3D module command line tools
 %setup -q -n %{upname}-%{version} %{?runcheck:-a 1}
 
 %patch0 -p1
+%patch1 -p1
 
 # Remove all third party libraries just to be sure
 rm -rf thirdparty
@@ -230,9 +235,13 @@ mkdir %{_target_platform}
 pushd %{_target_platform}
 # TODO: Consider
 # -DBUILD_JPIP_SERVER=ON -DBUILD_JAVA=ON 
-%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENJPEG_INSTALL_LIB_DIR=%{_lib} \
+%cmake \
+    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DOPENJPEG_INSTALL_LIB_DIR=%{_lib} \
     %{?optional_components:-DBUILD_MJ2=ON -DBUILD_JPWL=ON -DBUILD_JPIP=ON -DBUILD_JP3D=ON} \
     -DBUILD_DOC=ON \
+    -DBUILD_STATIC_LIBS=OFF \
+    -DBUILD_SHARED_LIBS=ON \
     %{?runcheck:-DBUILD_TESTING:BOOL=ON -DOPJ_DATA_ROOT=$PWD/../data} \
     ..
 popd
@@ -244,9 +253,6 @@ make VERBOSE=1 -C %{_target_platform} %{?_smp_mflags}
 %make_install -C %{_target_platform}
 
 # Rename to avoid conflicts with openjpeg-1.x
-for file in %{buildroot}%{_bindir}/opj_*; do
-    mv $file ${file/opj_/opj2_}
-done
 mv %{buildroot}%{_mandir}/man1/opj_compress.1 %{buildroot}%{_mandir}/man1/opj2_compress.1
 mv %{buildroot}%{_mandir}/man1/opj_decompress.1 %{buildroot}%{_mandir}/man1/opj2_decompress.1
 mv %{buildroot}%{_mandir}/man1/opj_dump.1 %{buildroot}%{_mandir}/man1/opj2_dump.1
@@ -264,8 +270,6 @@ EOF
 chmod +x %{buildroot}%{_bindir}/opj2_jpip_viewer
 %endif
 
-# drop a static library.
-rm -f %{buildroot}%{_libdir}/libopenjp2.a
 
 %post -p /sbin/ldconfig
 
@@ -352,6 +356,9 @@ make test -C %{_target_platform}
 
 
 %changelog
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.1-2
+- fixed files for cmake.
+
 * Mon Aug 12 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.3.1-1
 - new upstream release.
 

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

@@ -1,22 +1,19 @@
-%define name	poppler-data
-%define version	0.4.7
-%define release	3%{?_dist_release}
-
-Summary:	Poppler encoding data.
-Summary(ja): 	Poppler 用のエンコード用データ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.gz
-License:	GPLv2 with exceptions
-Group:		System Environment/Libraries
-URL:		http://poppler.freedesktop.org/
-
-BuildArch:	noarch
-BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-
-Vendor: Project Vine
-Distribution: Vine Linux
+Name:           poppler-data
+Summary:        Poppler encoding data.
+Summary(ja):    Poppler 用のエンコード用データ
+Version:        0.4.9
+Release:        1%{?_dist_release}
+Group:          System Environment/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+
+License:        GPLv2 with exceptions
+URL:            https://poppler.freedesktop.org/
+Source0:        https://poppler.freedesktop.org/%{name}-%{version}.tar.gz
+
+BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
 This package consists of encoding files for use with poppler.
@@ -34,6 +31,7 @@ Summary: Developer files for %{name}
 Summary(ja): %{name} の開発用ファイル
 Group: Development/Libraries
 Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
 
 %description devel
 This package consists of development files for poppler.
@@ -43,23 +41,27 @@ This package consists of development files for poppler.
 %setup -q
 
 %install
-%{__rm} -rf $RPM_BUILD_ROOT
-%{__make} DESTDIR=$RPM_BUILD_ROOT datadir=%{_datadir} install
+%{__rm} -rf %{buildroot}
+%{__make} DESTDIR=%{buildroot} datadir=%{_datadir} install
 
 
 %clean
-%{__rm} -rf $RPM_BUILD_ROOT
+%{__rm} -rf %{buildroot}
 
 
 %files
 %defattr(-,root,root)
-%doc COPYING COPYING.adobe COPYING.gpl2 README 
+%license COPYING COPYING.adobe COPYING.gpl2
+%doc README 
 %{_datadir}/poppler
 
 %files devel
 %{_datadir}/pkgconfig/poppler-data.pc
 
 %changelog
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.4.9-1
+- new upstream release.
+
 * Sun Nov 02 2014 Ryoichi INAGAKI <ryo1@toki.waseda.jp> 0.4.7-3
 - fixed typo...
 
@@ -86,7 +88,7 @@ This package consists of development files for poppler.
 * Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.4.0-1
 - new upstream release
 
-* Mon Nov  2 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.3.0-1
+* Sun Nov  2 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.3.0-1
 - new upstream release
 
 * Fri Oct 10 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.2.1-1

p/poppler/poppler-vl.spec

@@ -1,25 +1,25 @@
 %bcond_with doc
 
-%define name	poppler
-%define version	0.61.1
-%define release	1%{?_dist_release}
-
-Summary:	PDF rendering library.
-Summary(ja): 	PDF レンダリング用ライブラリ
-Name:		%{name}
-Version:	%{version}
-Release: 	%{release}
-
-Source0:	http://poppler.freedesktop.org/%{name}-%{version}.tar.xz
-
+Name:           poppler
+Summary:        PDF rendering library.
+Summary(ja):    PDF レンダリング用ライブラリ
+Version:        0.81.0
+Release:        2%{?_dist_release}
+Group:          System Environment/Libraries
+
+Vendor:         Project Vine
+Distribution:   Vine Linux
+Packager:       kazutaka, inagaki, daisuke
+
+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
-Patch0:  poppler-0.30.0-rotated-words-selection.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1113172
-Patch1:  0001-workaround-a-bug-in-nss-header.patch
-
-License:	GPLv2
-Group:		System Environment/Libraries
-URL:		http://poppler.freedesktop.org/
+Patch4:         poppler-0.30.0-rotated-words-selection.patch
 
 BuildRequires:	cmake
 BuildRequires:	gettext-devel
@@ -37,18 +37,18 @@ BuildRequires:	qt5-qtbase-devel
 BuildRequires:	libXmu-devel
 BuildRequires:  lcms2-devel
 BuildRequires:  libtiff-devel
+BuildRequires:	libboost-devel
+BuildRequires:  nss-devel
+BuildRequires:	freetype2-devel
+BuildRequires:	poppler-data
 
-Requires:	poppler-data >= 0.3.0
+Requires:	poppler-data
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 Obsoletes:	%{name}-qt < 0.18
 Obsoletes:	%{name}-qt-devel < 0.18
 
-Vendor:		Project Vine
-Distribution:	Vine Linux
-Packager:	kazutaka, inagaki, daisuke, Takemikaduchi
-
 %description
 Poppler is a PDF rendering library based on the xpdf-3.0 code base.
 
@@ -149,8 +149,10 @@ export CC="gcc -fPIC" # hack to make the cmake call pass
   -DENABLE_LIBOPENJPEG=openjpeg2 \
   -DENABLE_XPDF_HEADERS=ON \
   -DENABLE_ZLIB=OFF \
+  -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
   ..
 unset CC
+
 %{__make} %{?_smp_mflags}
 
 %install
@@ -178,7 +180,8 @@ cd build
 
 %files
 %defattr(-,root,root)
-%doc AUTHORS COPYING ChangeLog INSTALL NEWS README* TODO
+%license COPYING*
+%doc AUTHORS INSTALL NEWS README*
 %{_libdir}/lib*.so.*
 %{_libdir}/girepository-1.0/*.typelib
 %exclude %{_libdir}/libpoppler-qt4.so.*
@@ -226,6 +229,17 @@ cd build
 %{_mandir}/man1/pdf*
 
 %changelog
+* 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.
+
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.81.0-1
+- new upstream release.
+- renumbered Patch0 to 4 and updated.
+- dropped Patch1.
+- imported Patch1 from rawhide and updated to resurrect qt4 support.
+- added Patch2: synchronized poppler-qt4 with poppler-0.81.0.
+- imported Patch3 from rawhide and updated.
+
 * Sun Dec 31 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.61.1-1
 - new upstream release.
 - imported Patch0 and 1 from rawhide.

p/poppler061/poppler061-vl.spec

@@ -0,0 +1,325 @@
+%bcond_with doc
+
+%define name	poppler061
+%define version	0.61.1
+%define release	2%{?_dist_release}
+
+Summary:	PDF rendering library.
+Summary(ja): 	PDF レンダリング用ライブラリ
+Name:		%{name}
+Version:	%{version}
+Release: 	%{release}
+
+Source0:	http://poppler.freedesktop.org/poppler-%{version}.tar.xz
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=1185007
+Patch0:  poppler-0.30.0-rotated-words-selection.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1113172
+Patch1:  0001-workaround-a-bug-in-nss-header.patch
+
+License:	GPLv2
+Group:		System Environment/Libraries
+URL:		http://poppler.freedesktop.org/
+
+BuildRequires:	cmake
+BuildRequires:	gettext-devel
+BuildRequires:	gtk2-devel >= 2.2.0
+%if %{with doc}
+BuildRequires:	gtk-doc
+%endif
+BuildRequires:	gtk3-devel
+BuildRequires:	zlib-devel
+BuildRequires:  libjpeg-devel
+BuildRequires:  openjpeg2-devel
+BuildRequires:	cairo-devel
+BuildRequires:	libXmu-devel
+BuildRequires:  lcms2-devel
+BuildRequires:  libtiff-devel
+
+Requires:	poppler-data >= 0.3.0
+Obsoletes:	poppler < %{version}-%{release}
+
+BuildRoot:	%{_tmppath}/%{name}-%{version}-root
+
+Vendor:		Project Vine
+Distribution:	Vine Linux
+Packager:	kazutaka, inagaki, daisuke
+
+%description
+Poppler is a PDF rendering library based on the xpdf-3.0 code base.
+
+%description -l ja
+Popplerは xpdf-3.0 のコードをベースにした PDF レンダリング用ライブラリ
+です。
+
+%prep
+%autosetup -p1 -n poppler-%{version}
+
+%build
+mkdir build
+cd build
+export CC="gcc -fPIC" # hack to make the cmake call pass
+%cmake \
+  -DENABLE_CMS=lcms2 \
+  -DENABLE_DCTDECODER=libjpeg \
+%if %{with doc}
+  -DENABLE_GTK_DOC=ON \
+%endif
+  -DENABLE_LIBOPENJPEG=openjpeg2 \
+  -DENABLE_XPDF_HEADERS=ON \
+  -DENABLE_ZLIB=OFF \
+  -DENABLE_GLIB=OFF \
+  -DENABLE_QT4=OFF \
+  -DENABLE_QT5=OFF \
+  -DENABLE_UTILS=OFF \
+  ..
+unset CC
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf ${RPM_BUILD_ROOT}
+cd build
+%{__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
+
+%files
+%defattr(-,root,root)
+%license COPYING
+%doc AUTHORS ChangeLog INSTALL NEWS README* TODO
+%{_libdir}/lib*.so.*
+
+%exclude %{_libdir}/libpoppler-cpp.so.*
+%exclude %{_libdir}/lib*.so
+%exclude %{_libdir}/pkgconfig
+%exclude %{_includedir}/poppler
+%if %{with doc}
+%exclude %{_datadir}/gtk-doc
+%endif
+%exclude %{_bindir}/pdf*
+%exclude %{_mandir}
+
+%changelog
+* Mon Oct 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.61.1-2
+- changed %%name.
+
+* Sun Dec 31 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.61.1-1
+- new upstream release.
+- imported Patch0 and 1 from rawhide.
+
+* Thu Mar  9 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.43.0-4
+- new upstream release.
+- fixed qt5 stuff.
+
+* Mon Nov 21 2016 Toshiaki Ara <ara_t@384.jp> 0.43.0-3
+- add packages: poppler-qt5 / poppler-qt5-devel
+
+* Wed Jun 29 2016 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 0.43.0-2
+- rebuilt with new toolchain.
+
+* Mon May 09 2016 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.43.0-1
+- new upstream release
+
+* Sun Nov 01 2015 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.37.0-1
+- new upstream release
+
+* Sun Oct 26 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.26.5-1
+- new upstream release
+
+* Tue Jul 08 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.26.2-1
+- new upstream release
+
+* Wed Apr 30 2014 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.24.5-1
+- new upstream release with security fixes 
+
+* Sat Jan 04 2014 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.24.2-2
+- rebuild with VineSeed environment
+
+* Sat Oct 26 2013 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.24.2-1
+- new upstream release
+
+* Sat Sep 15 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.20.4-1
+- new upstream release
+- change BuildRequires: lcms2-devel instead of lcms-devel
+- add BuildRequires: libtiff-devel
+
+* Wed Apr 11 2012 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.18.4-1
+- new upstream release
+- remove Patch10
+- remove qt, qt-devel sub packages
+
+* Fri Sep 23 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.16.6-2
+- add Requires: gtk2-devel (-devel package)
+
+* Tue May 31 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.16.6-1
+- new upstream release
+
+* Tue Apr 19 2011 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 0.16.4-2
+- rebuild again on ppc with openjpeg-1.4
+
+* Thu Apr 14 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.16.4-1
+- new upstream release
+- built with openjpeg-1.4
+
+* Sat Mar 12 2011 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.16.3-1
+- new upstream release
+- added utils subpackage
+
+* Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.14.2-1
+- new upstream release
+- add BuildRequires: libXmu-devel
+
+* Sun Mar 21 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.4-1
+- new upstream release (including security fix CVE-2009-3607)
+- built with new toolchain
+- changed --enable-gtk-doc to --disable-gtk-doc
+
+* Mon Nov  2 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.12.1-1
+- new upstream release (including security fix based xpdf 3.02pl4)
+- added BR: openjpeg-devel
+
+* Sun Aug 16 2009 NAKAMURA Kenta <kenta@vinelinux.org> 0.10.7-3
+- added qt4 wrapper subpackage
+- added BuildRequires: qt4-devel
+
+* Mon Jul 20 2009 Daisuke SUZUKI <daisuke@linux.or.jp> 0.10.7-2
+- add Patch10 to support otf font with TrueType format. (<BTS:0727>)
+  (thanks to tomop)
+
+* Mon May 18 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.7-1
+- new upstream release
+
+* Sun May 10 2009 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.10.6-3
+- added qt3 wrapper subpackage
+
+* Fri May 01 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.6-2
+- add configure option --enable-shared and --disable-static
+- drop *.a from devel sub package 
+
+* Fri Apr 24 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.6-1
+- new upstream release
+- add Packager: kazutaka
+
+* Sun Mar 15 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.5-1
+- new upstream release
+
+* Mon Feb 23 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.4-1
+- new upstream release
+
+* Sun Feb 01 2009 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.3-1
+- new upstream release
+
+* Sat Dec 13 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.10.2-1
+- new upstream release
+
+* Fri Oct 10 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.7-1
+- new upstream release
+- built with cairo-1.8.0
+
+* Sat Aug 30 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.8.6-1
+- new upstream release
+
+* Tue Jul 29 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.5-1
+- new upstream release
+
+* Tue Jul 01 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.8.4-1
+- new upstream release
+
+* Thu Jun  5 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.3-1
+- new upstream release
+- spec in UTF-8
+
+* Tue Apr  1 2008 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.8.2-1
+- new upstream release.
+- rebuilt with cairo-1.6.4
+
+* Mon Mar 31 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.8.0-1
+- new upstream release.
+- apply new versioning policy.
+
+* Sun Mar 02 2008 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6.4-0vl1
+- new upstream release.
+
+* Sun Dec 30 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6.3-0vl1
+- new upstream release.
+
+* Tue Dec 11 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6.2-0vl1
+- new upstream release.
+
+* Sat Oct 27 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6.1-0vl1
+- new upstream release.
+
+* Sun Sep 09 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.6-0vl1
+- new upstream release.
+- add Requires to poppler-data.
+
+* Mon Jun 18 2007 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.9-0vl1
+- new upstream release.
+- drop Patch100. (Fixed in upstream)
+
+* Fri May 11 2007 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.4-0vl3
+- rebuild with new environment/toolchain
+
+* Mon Feb 05 2007 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.5.4-0vl2
+- rebuilt for VineSeed
+
+* Sat Jan 20 2007 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 0.5.4-0vl1.1
+- add patch100 for fix CVE-2007-0104 (Catalog Dictionary Handling Dos)
+- add Vendor/Distribution Tag
+
+* Tue Sep 26 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.4-0vl1
+- source update.
+- remove unnecessary .la files in %%install section.
+
+* Thu Jun 22 2006 Daisuke SUZUKI <daisuke@linux.or.jp> 0.5.3-0vl2
+- add Requires: xpdf-common >= 3.01
+- fix Url
+
+* Sat Jun 17 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.3-0vl1
+- source update.
+- add BuildRequires gtk-doc.
+
+* Sun May 28 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.2-0vl1
+- source update.
+
+* Sat Mar 11 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.1-0vl2
+- add --enable-xpdf-headers configure option.
+
+* Wed Mar 01 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.5.1-0vl1
+- source update.
+- add %%{_datadir}/gtk-doc/html/poppler in %%files section.
+- add --disable-utils and --enable-zlib configure option.
+  (--disable-utis needed to aboid conflict with xpdf)
+- delete --enable-a4-paper configure option.(no longer supported)
+
+* Wed Jan 25 2006 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.4.4-0vl1
+- source update.
+
+* Wed Sep 21 2005 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.4.2-0vl1
+- source update.
+- add configure option --disable-poppler-{qt.qt4}, --enable-a4-paper.
+- del BuildReq: libpixman-devel.(Obsolete by cairo)
+
+* Thu Aug 18 2005 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.4.0-0vl1
+- source update.
+
+* Sat Jun 25 2005 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.3.3-0vl1
+- source update.
+
+* Thu May 19 2005 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.3.2-0vl1
+- source update.
+
+* Thu May 05 2005 Kazutaka HARADA <kazutaka@dc4.so-net.ne.jp> 0.3.1-0vl1
+- initial build for VineSeed Plus.