Browse Source

updated 2 packages

gpgme-1.22.0-2

poppler-23.10.0-1
Tomohiro "Tomo-p" KATO 5 months ago
parent
commit
87bad920a7
2 changed files with 75 additions and 50 deletions
  1. 68 48
      g/gpgme/gpgme-vl.spec
  2. 7 2
      p/poppler/poppler-vl.spec

+ 68 - 48
g/gpgme/gpgme-vl.spec

@@ -1,13 +1,13 @@
-%define _gnupg_ver		1.4.0
-%define _libgpg_error_ver	1.4
+%define _gnupg_ver		2.4.3
+%define _libgpg_error_ver	1.36
 
 %define _unpackaged_files_terminate_build 1
 
 Summary:	GPGME - GnuPG Made Easy
 Summary(ja):	GPGME - GnuPG Made Easy
 Name:		gpgme
-Version:	1.15.1
-Release:	1%{?_dist_release}
+Version:	1.22.0
+Release:	2%{?_dist_release}
 Group:		system
 Vendor:		Project Vine
 Distribution:	Vine Linux
@@ -16,20 +16,36 @@ License:	LGPL
 URL:		https://gnupg.org/software/gpgme/index.html
 Source:		https://gnupg.org/ftp/gcrypt/gpgme/%{name}-%{version}.tar.bz2
 
+## downstream patches
+# Don't add extra libs/cflags in gpgme-config/cmake equivalent
+Patch1001:      0001-don-t-add-extra-libraries-for-linking.patch
+# add -D_FILE_OFFSET_BITS... to gpgme-config, upstreamable
+Patch1002:      gpgme-1.3.2-largefile.patch
+# Let's fix stupid AX_PYTHON_DEVEL
+Patch1003:      0001-fix-stupid-ax_python_devel.patch
+# Allow extra options to be passed to setup.py during installation
+Patch1004:      0002-setup_py_extra_opts.patch
+
+## temporary downstream fixes
+# Skip lang/qt/tests/t-remarks on gnupg 2.4+
+Patch3001:      1001-qt-skip-test-remarks-for-gnupg2-2.4.patch
+
+# fix FTBFS caused by include path order, for <= 1.22.0
+Patch3002:	gpgme-1.22.0-ftbfs-aee18a2a.patch
+Patch3003:	gpgme-1.22.0-ftbfs-d23528ca.patch
+
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
-BuildRequires:	gnupg >= %{_gnupg_ver}
+BuildRequires:	gnupg2 >= %{_gnupg_ver}
 BuildRequires:	libgpg-error-devel >= %{_libgpg_error_ver}
-BuildRequires:	libassuan-devel >= 2.0.2
+BuildRequires:	libassuan-devel >= 2.4.2
 BuildRequires:	chrpath
 BuildRequires:	swig
-BuildRequires:	python-devel
-BuildRequires:	python-setuptools
 BuildRequires:	python-rpm-macros
 BuildRequires:	python3-devel
 BuildRequires:	python3-setuptools
 BuildRequires:	python3-rpm-macros
 
-Requires:	gnupg >= %{_gnupg_ver}
+Requires:	gnupg2 >= %{_gnupg_ver}
 Requires:	libgpg-error >= %{_libgpg_error_ver}
 
 Obsoletes:	gpgme10
@@ -57,8 +73,6 @@ Group:		programming
 Requires:	%{name} = %{version}
 Requires:	libgpg-error-devel >= 0.5
 Requires:	libassuan-devel >= 2.0.2
-Requires(post):	install-info
-Requires(preun): install-info
 Obsoletes:	%{name} < 0.3.16-0vl2
 Obsoletes:	gpgme10-devel
 Provides:	gpgme10-devel
@@ -78,16 +92,6 @@ GPGME ライブラリを使用するアプリケーションを開発するの
 ジをインストールしてください。
 
 
-%package -n python-gpg
-Summary:        %{name} bindings for Python 2
-Group:		programming
-%{?python_provide:%python_provide python2-gpg}
-Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
-
-%description -n python-gpg
-%{summary}.
-
-
 %package -n python3-gpg
 Summary:        %{name} bindings for Python 3
 Group:		programming
@@ -99,16 +103,44 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 
 
 %prep
-%setup -q
+%autosetup -p1
+## HACK ALERT
+# The config script already suppresses the -L if it's /usr/lib, so cheat and
+# set it to a value which we know will be suppressed.
+sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g' src/gpgme-config.in
+
+# The build machinery does not support Python 3.9+ yet
+# https://github.com/gpg/gpgme/pull/4
+sed -i 's/3.8/%{python3_version}/g' configure
 
 
 %build
-%configure --disable-gpgsm-test
-%__make
+# Since 1.16.0, we need to explicitly pass -D_LARGEFILE_SOURCE and
+# -D_FILE_OFFSET_BITS=64 for the QT binding to build successfully on 32-bit
+# platforms.
+export CFLAGS='%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+export CXXFLAGS='%{optflags} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64'
+# Explicit new lines in C(XX)FLAGS can break naive build scripts
+export CFLAGS="$(echo ${CFLAGS} | tr '\n\\' '  ')"
+export CXXFLAGS="$(echo ${CXXFLAGS} | tr '\n\\' '  ')"
+export SETUPTOOLS_USE_DISTUTILS=local
+
+%configure \
+	--disable-static \
+	--disable-silent-rules \
+	--enable-languages=cpp,python \
+	--disable-gpgsm-test
+%make_build
+
 
 %install
 %__rm -rf %{buildroot}
-%{makeinstall}
+# When using distutils from setuptools 60+, ./setup.py install use
+# the .egg format. This forces setuptools to use .egg-info format.
+# SETUP_PY_EXTRA_OPTS is introduced by the Patch1004 above.
+export SETUPTOOLS_USE_DISTUTILS=local
+export SETUP_PY_EXTRA_OPTS="--single-version-externally-managed --root=/"
+%make_install
 
 # remove unneeded files
 %__rm -rf %{buildroot}%{_datadir}/common-lisp
@@ -116,6 +148,7 @@ Requires:       %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
 %__rm -f %{buildroot}%{_infodir}/dir
 
 chrpath -d %{buildroot}%{_bindir}/%{name}-tool
+chrpath -d %{buildroot}%{_bindir}/%{name}-json
 chrpath -d %{buildroot}%{_libdir}/lib%{name}*.so*
 
 # autofoo installs useless stuff for uninstall
@@ -127,24 +160,6 @@ rm -vf %{buildroot}%{python3_sitelib}/gpg/install_files.txt
 %__rm -rf %{buildroot}
 
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%triggerun -- %{name} < 0.3.16-0vl2
-/sbin/install-info --delete %{_infodir}/gpgme.info.gz %{_infodir}/dir
-
-%post devel
-/sbin/install-info %{_infodir}/gpgme.info.gz %{_infodir}/dir
-
-%preun devel
-if [ "$1" = 0 ] ; then
-	/sbin/install-info --delete %{_infodir}/gpgme.info.gz %{_infodir}/dir
-fi
-
-%triggerpostun devel -- %{name} < 0.3.16-0vl2, gpgme10-devel
-/sbin/install-info %{_infodir}/gpgme.info.gz %{_infodir}/dir
-
-
 %files
 %defattr(-,root,root)
 %license COPYING*
@@ -163,17 +178,22 @@ fi
 %{_includedir}/*
 %{_infodir}/*
 
-%files -n python-gpg
-%doc lang/python/README
-%{python_sitearch}/gpg-*.egg-info
-%{python_sitearch}/gpg/
-
 %files -n python3-gpg
 %doc lang/python/README
 %{python3_sitearch}/gpg-*.egg-info
 %{python3_sitearch}/gpg/
 
+
 %changelog
+* Thu Oct 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.0-2
+- fixed cmake files.
+
+* Thu Oct 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.22.0-1
+- new upstream release.
+- dropped python2 support.
+- dropped install-info scriptlets.
+- dropped ldconfig scriptlets.
+
 * Thu Feb 11 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.15.1-1
 - new upstream release.
 

+ 7 - 2
p/poppler/poppler-vl.spec

@@ -3,7 +3,7 @@
 Name:           poppler
 Summary:        PDF rendering library.
 Summary(ja):    PDF レンダリング用ライブラリ
-Version:        22.09.0
+Version:        23.10.0
 Release:        1%{?_dist_release}
 Group:          system
 
@@ -24,13 +24,13 @@ BuildRequires:	gettext-devel
 %if %{with doc}
 BuildRequires:	gtk-doc
 %endif
+BuildRequires:	curl-devel
 BuildRequires:	glib2-devel
 BuildRequires:	gtk3-devel
 BuildRequires:	zlib-devel
 BuildRequires:  libjpeg-devel
 BuildRequires:  openjpeg2-devel
 BuildRequires:	cairo-devel
-BuildRequires:	qt4-devel >= 4.4.0
 BuildRequires:	qt5-qtbase-devel
 BuildRequires:	libXmu-devel
 BuildRequires:  lcms2-devel
@@ -38,6 +38,7 @@ BuildRequires:  libtiff-devel
 BuildRequires:	libboost-devel
 BuildRequires:  nss-devel
 BuildRequires:	freetype2-devel
+BuildRequires:	gpgme-devel
 BuildRequires:	poppler-data
 
 Requires:	poppler-data
@@ -130,6 +131,7 @@ chmod -x poppler/CairoFontEngine.cc
   -DENABLE_GTK_DOC=ON \
 %endif
   -DENABLE_LIBOPENJPEG=openjpeg2 \
+  -DENABLE_QT6=OFF \
   -DENABLE_XPDF_HEADERS=ON \
   -DENABLE_ZLIB=OFF \
   -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
@@ -185,6 +187,9 @@ chmod -x poppler/CairoFontEngine.cc
 
 
 %changelog
+* Thu Oct 19 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 23.10.0-1
+- new upstream release.
+
 * Sun Sep 11 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 22.09.0-1
 - new upstream release.
 - dropped Patch4.