From 790e3fbf410860ca245436c43997f1713f65ebb8 Mon Sep 17 00:00:00 2001
From: Carl Byington <carl@five-ten-sg.com>
Date: Thu, 26 Mar 2020 10:11:07 -0700
Subject: [PATCH] update for libpst-0.6.75-1.fc33

---
 libpst.spec | 59 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 54 insertions(+), 5 deletions(-)

diff --git a/libpst.spec b/libpst.spec
index ecd0713..2b4dd57 100644
--- a/libpst.spec
+++ b/libpst.spec
@@ -1,18 +1,27 @@
 Summary:            Utilities to convert Outlook .pst files to other formats
 Name:               libpst
-Version:            0.6.74
-Release:            2%{?dist}
+Version:            0.6.75
+Release:            1%{?dist}
 License:            GPLv2+
 URL:                http://www.five-ten-sg.com/%{name}/
 Source:             %{url}/packages/%{name}-%{version}.tar.gz
 
 BuildRequires:      libtool gcc-c++
 BuildRequires:      ImageMagick gd-devel zlib-devel boost-devel libgsf-devel gettext-devel
+
+%if 0%{?fedora} > 27
 BuildRequires:      python3 python3-devel boost-python3 boost-python3-devel
+Requires:           boost-python3
+%else
+BuildRequires:      python-devel
+%endif
 
 Requires:           ImageMagick%{?_isa} libgsf gettext
 Requires:           %{name}-libs%{?_isa} = %{version}-%{release}
-Requires:           boost-python3
+
+%{!?python_sitelib:  %global python_sitelib  %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 
 %description
 The Libpst utilities include readpst which can convert email messages
@@ -30,15 +39,32 @@ The libpst-libs package contains the shared library used by the pst
 utilities.
 
 
+%if 0%{?fedora} > 27
 %package -n python3-%{name}
+Requires:           python3
+Provides: %{name}-python = %{version}-%{release}
+%else
+%package python
+Requires:           python
+%endif
 Summary:            Python bindings for libpst
-Provides:           %{name}-python = %{version}-%{release}
 Requires:           %{name}-libs%{?_isa} = %{version}-%{release}
 
+%if 0%{?fedora} >= 20
 %global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{python_sitearch}/_.*\.so$
+%else
+%{?filter_setup:
+%filter_provides_in %{python_sitearch}/_.*\.so$
+%filter_setup
+}
+%endif
 
 
+%if 0%{?fedora} > 27
 %description -n python3-%{name}
+%else
+%description python
+%endif
 The libpst-python package allows you to use the libpst shared object
 from Python code.
 
@@ -82,18 +108,31 @@ libpst utilities.
 autoreconf -fiv
 %configure --enable-libpst-shared \
            --with-boost-python=boost_python%{python3_version_nodots}
+%if 0%{?fedora} > 27
 %make_build
+%else
+make %{?_smp_mflags}
+%endif
 
 
 %install
+%if 0%{?fedora} > 27
 %make_install
+%else
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=$RPM_BUILD_ROOT install
+%endif
 #Remove libtool archives.
 find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
 mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{name}
 
 
+%if 0%{?fedora} > 27
 %ldconfig_scriptlets libs
-
+%else
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
+%endif
 
 %files
 %{_bindir}/*
@@ -106,8 +145,14 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{
 %doc COPYING
 
 
+%if 0%{?fedora} > 27
 %files -n python3-%{name}
+%defattr(-,root,root,-)
 %{python3_sitearch}/_*.so
+%else
+%files python
+%{python_sitearch}/_*.so
+%endif
 
 
 %files devel
@@ -131,6 +176,9 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{
 
 
 %changelog
+* Sun Mar 22 2020 Carl Byington <carl@five-ten-sg.com> 0.6.75-1
+- Markus Schnalke - fix from Debian for vcard version format.
+
 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.74-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
@@ -580,3 +628,4 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{
 
 * Sun Feb 19 2006 Carl Byington <carl@five-ten-sg.com> - 0.5.3
 - initial spec file using autoconf and http://www.fedora.us/docs/rpm-packaging-guidelines.html
+