From 2f860f51943da21765f96f410e3e9265a673a2c6 Mon Sep 17 00:00:00 2001 From: Carl Byington Date: Sun, 12 Jan 2020 12:05:59 -0800 Subject: [PATCH] update for libpst-0.6.74-1.fc32 --- libpst.spec | 109 +++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 79 insertions(+), 30 deletions(-) diff --git a/libpst.spec b/libpst.spec index 038a2ac..f6c3ee3 100644 --- a/libpst.spec +++ b/libpst.spec @@ -3,16 +3,22 @@ Name: libpst Version: 0.6.74 Release: 1%{?dist} License: GPLv2+ +Source: http://www.five-ten-sg.com/%{name}/packages/%{name}-%{version}.tar.gz URL: http://www.five-ten-sg.com/%{name}/ -Source: %{url}/packages/%{name}-%{version}.tar.gz - +Requires: ImageMagick libgsf +Requires: %{name}-libs = %{version}-%{release} BuildRequires: libtool gcc-c++ 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 + +%{!?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)")} -Requires: ImageMagick%{?_isa} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description The Libpst utilities include readpst which can convert email messages @@ -30,22 +36,40 @@ 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} +Requires: %{name}-libs = %{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. +from Python code. %package devel Summary: Library links and header files for libpst application development -Requires: %{name}-libs%{?_isa} = %{version}-%{release} +Requires: pkgconfig +Requires: %{name}-libs = %{version}-%{release} %description devel The libpst-devel package contains the library links and header files @@ -78,48 +102,72 @@ libpst utilities. %build -autoreconf -fiv -%configure --enable-libpst-shared \ - --with-boost-python=boost_python%{python3_version_nodots} +autoreconf -v -f -i +%configure --enable-libpst-shared +%if 0%{?fedora} > 27 %make_build +%else +make %{?_smp_mflags} +%endif %install +%if 0%{?fedora} > 27 %make_install -#Remove libtool archives. -find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f -mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{name} +%else +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +%endif +rm $RPM_BUILD_ROOT%{_libdir}/libpst.la +rm $RPM_BUILD_ROOT%{_libdir}/libpst.a +mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/doc/%{name} %ldconfig_scriptlets libs %files +%defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %files libs +%defattr(-,root,root,-) %{_libdir}/libpst.so.* %doc COPYING +%if 0%{?fedora} > 27 %files -n python3-%{name} +%defattr(-,root,root,-) %{python3_sitearch}/_*.so +%exclude %{python3_sitearch}/*.a +%exclude %{python3_sitearch}/*.la +%else +%files python +%defattr(-,root,root,-) +%{python_sitearch}/_*.so +%exclude %{python_sitearch}/*.a +%exclude %{python_sitearch}/*.la +%endif %files devel +%defattr(-,root,root,-) %{_libdir}/libpst.so %{_includedir}/%{name}-4/ %{_libdir}/pkgconfig/libpst.pc %files devel-doc +%defattr(-,root,root,-) %{_datadir}/doc/%{name}/devel/ %files doc +%defattr(-,root,root,-) %dir %{_datadir}/doc/%{name}/ %{_datadir}/doc/%{name}/*.html %{_datadir}/doc/%{name}/AUTHORS @@ -165,7 +213,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ * Wed Aug 01 2018 Carl Byington 0.6.72-1 - allow all 7 days in bydays recurring appointment -- update for fedora python packaging +- update for Fedora Python packaging - Alfredo Esteban - add -l and -f options to lspst * Fri Jul 13 2018 Fedora Release Engineering - 0.6.71-8 @@ -192,7 +240,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild * Fri Jul 21 2017 Carl Byington 0.6.71-1 -- fedora python naming scheme changes +- Fedora Python naming scheme changes - Zachary Travis - Add support for the OST 2013 format, and Content-Disposition filename key fix for outlook compatibility @@ -250,7 +298,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - Rebuilt for GCC 5 C++11 ABI change * Mon Mar 09 2015 Carl Byington 0.6.64-1 -- fix line wrap on python provides_exclude_from +- fix line wrap on Python provides_exclude_from - fix unchecked errors found by cppcheck - AJ Shankar fixes for attachment processing and body encodings that contain embedded null chars. @@ -312,7 +360,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - merge -m .msg files code into main branch * Thu Aug 09 2012 Carl Byington - 0.6.55-2 -- rebuild for python +- rebuild for Python * Thu Jul 19 2012 Fedora Release Engineering - 0.6.54-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild @@ -329,7 +377,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild * Sat Dec 24 2011 Carl Byington - 0.6.54-3 -- bump versions and prep for fedora build +- bump versions and prep for Fedora build * Wed Nov 30 2011 Petr Pisar - 0.6.53-3 - Rebuild against boost-1.48 @@ -358,7 +406,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - fix for buffer overrun; attachment size from the secondary list of mapi elements overwrote proper size from the primary list of mapi elements. - fedora bugzilla 696263 + Fedora bugzilla 696263 * Tue Feb 08 2011 Fedora Release Engineering - 0.6.49-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild @@ -375,7 +423,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ * Mon Sep 13 2010 Carl Byington - 0.6.49-1 - fix to ignore embedded objects that are not email messages - fedora bugzilla 633498 + Fedora bugzilla 633498 * Thu Sep 02 2010 Carl Byington - 0.6.48-1 - fix for broken internet headers from Outlook @@ -384,10 +432,10 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - use no from quoting for output formats with single message per file * Sat Jul 31 2010 Carl Byington - 0.6.47-6 -- rebuild for python dependencies +- rebuild for Python dependencies * Mon Jul 26 2010 David Malcolm - 0.6.47-4 -- hack up configure so that it looks for python 2.7 +- hack up configure so that it looks for Python 2.7 * Wed Jul 21 2010 David Malcolm - 0.6.47-3 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild @@ -430,17 +478,17 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ * Tue Jun 23 2009 Carl Byington - 0.6.41-1 - fix ax_python detection - should not use locate command -- checking for fedora versions is not needed +- checking for Fedora versions is not needed * Tue Jun 23 2009 Carl Byington - 0.6.40-1 -- fedora 11 has python2.6 +- Fedora 11 has python2.6 - remove pdf version of the man pages * Sun Jun 21 2009 Carl Byington - 0.6.39-1 -- fedora > 10 moved to boost-python-devel +- Fedora > 10 moved to boost-python-devel * Sun Jun 21 2009 Carl Byington - 0.6.38-1 -- add python interface to the shared library. +- add Python interface to the shared library. - bump soname to version 4 for many changes to the interface. - better decoding of recurrence data in appointments. - remove readpstlog since debug log files are now plain text. @@ -471,7 +519,7 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - fix ppc64 compile error * Sat Mar 14 2009 Carl Byington - 0.6.31-1 -- bump version for fedora cvs tagging mistake +- bump version for Fedora cvs tagging mistake * Sat Mar 14 2009 Carl Byington - 0.6.30-1 - track character set individually for each mapi element. @@ -546,13 +594,13 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ - Fix for missing length on lz decompression, bug found by Chris White. * Sun Jun 15 2008 Carl Byington - 0.6.14-1 -- Fix my mistake in debian packaging. +- Fix my mistake in Debian packaging. * Fri Jun 13 2008 Carl Byington - 0.6.13-1 - Patch from Robert Simpson for encryption type 2. * Tue Jun 10 2008 Carl Byington - 0.6.12-1 -- Patch from Joachim Metz for debian packaging and +- Patch from Joachim Metz for Debian packaging and - fix for incorrect length on lz decompression * Tue Jun 03 2008 Carl Byington - 0.6.11-1 @@ -576,3 +624,4 @@ mv %{buildroot}%{_datadir}/doc/%{name}-%{version} %{buildroot}%{_datadir}/doc/%{ * Sun Feb 19 2006 Carl Byington - 0.5.3 - initial spec file using autoconf and http://www.fedora.us/docs/rpm-packaging-guidelines.html +