Mercurial > libpst
changeset 382:7eab29e13e61
changes for building on fedora 30
author | Carl Byington <carl@five-ten-sg.com> |
---|---|
date | Thu, 25 Jul 2019 07:18:19 -0700 |
parents | d52cc63db773 |
children | 2379a4d8d9c7 |
files | libpst.spec.in m4/ax_python.m4 |
diffstat | 2 files changed, 13 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/libpst.spec.in Wed Aug 01 08:49:01 2018 -0700 +++ b/libpst.spec.in Thu Jul 25 07:18:19 2019 -0700 @@ -1,11 +1,9 @@ Summary: Utilities to convert Outlook .pst files to other formats Name: @PACKAGE@ Version: @VERSION@ -Release: 1%{?dist} +Release: 4%{?dist} License: GPLv2+ -Group: Applications/Productivity Source: http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) URL: http://www.five-ten-sg.com/%{name}/ Requires: ImageMagick libgsf Requires: %{name}-libs = %{version}-%{release} @@ -13,6 +11,7 @@ BuildRequires: ImageMagick gd-devel zlib-devel boost-devel libgsf-devel %if 0%{?fedora} > 27 BuildRequires: python3 python3-devel boost-python3 boost-python3-devel +Requires: boost-python3 %else BuildRequires: python-devel %endif @@ -31,7 +30,6 @@ %package libs Summary: Shared library used by the pst utilities -Group: Development/Libraries %description libs The libpst-libs package contains the shared library used by the pst @@ -47,7 +45,6 @@ Requires: python %endif Summary: Python bindings for libpst -Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} %if 0%{?fedora} >= 20 @@ -71,7 +68,6 @@ %package devel Summary: Library links and header files for libpst application development -Group: Development/Libraries Requires: pkgconfig Requires: %{name}-libs = %{version}-%{release} @@ -84,7 +80,6 @@ %package devel-doc Summary: Documentation for libpst.so for libpst application development -Group: Documentation Requires: %{name}-doc = %{version}-%{release} %description devel-doc @@ -94,7 +89,6 @@ %package doc Summary: Documentation for the pst utilities in html format -Group: Documentation %description doc The libpst-doc package contains the html documentation for the pst @@ -129,14 +123,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name} -%clean -rm -rf $RPM_BUILD_ROOT - - -%post libs -p /sbin/ldconfig - - -%postun libs -p /sbin/ldconfig +%ldconfig_scriptlets libs %files @@ -191,6 +178,15 @@ %changelog +* Fri Jun 07 2019 Carl Byington <carl@five-ten-sg.com> 0.6.72-4 +- fixes for python3 + +* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.72-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Jonathan Wakely <jwakely@redhat.com> - 0.6.72-2 +- Rebuilt for Boost 1.69 + * Wed Aug 01 2018 Carl Byington <carl@five-ten-sg.com> 0.6.72-1 - allow all 7 days in bydays recurring appointment - update for fedora python packaging
--- a/m4/ax_python.m4 Wed Aug 01 08:49:01 2018 -0700 +++ b/m4/ax_python.m4 Thu Jul 25 07:18:19 2019 -0700 @@ -55,7 +55,7 @@ AC_DEFUN([AX_PYTHON], [AC_MSG_CHECKING(for python build information) AC_MSG_RESULT([]) -for python in python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do +for python in python3.8 python3.7 python3.6 python3.5 python3.4 python3.3 python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python; do AC_CHECK_PROGS(PYTHON_BIN, [$python]) ax_python_bin=$PYTHON_BIN if test x$ax_python_bin != x; then