diff --git a/.gitignore b/.gitignore index f466fce..e7e5471 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ libpst-0.6.47.tar.gz /libpst-0.6.69.tar.gz /libpst-0.6.70.tar.gz /libpst-0.6.71.tar.gz +/libpst-0.6.72.tar.gz diff --git a/libpst.spec b/libpst.spec index 15d35c5..dc2f536 100644 --- a/libpst.spec +++ b/libpst.spec @@ -1,15 +1,25 @@ Summary: Utilities to convert Outlook .pst files to other formats Name: libpst -Version: 0.6.71 -Release: 8%{?dist} +Version: 0.6.72 +Release: 1%{?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} -BuildRequires: libtool +BuildRequires: libtool gcc-c++ BuildRequires: ImageMagick gd-devel zlib-devel boost-devel libgsf-devel -BuildRequires: python2-devel +%if 0%{?fedora} > 27 +BuildRequires: python3 python3-devel boost-python3 boost-python3-devel +%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)")} + %description The Libpst utilities include readpst which can convert email messages @@ -21,28 +31,47 @@ Summation. %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 utilities. -%package -n python2-libpst -%{?python_provide:%python_provide python2-libpst} -# Remove before F30 -Provides: %{name}-python2 = %{version}-%{release} -Provides: %{name}-python2%{?_isa} = %{version}-%{release} -Obsoletes: %{name}-python2 < %{version}-%{release} +%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 +Group: Development/Libraries Requires: %{name}-libs = %{version}-%{release} -%description -n python2-libpst +%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. %package devel Summary: Library links and header files for libpst application development +Group: Development/Libraries Requires: pkgconfig Requires: %{name}-libs = %{version}-%{release} @@ -55,6 +84,7 @@ utilities. %package devel-doc Summary: Documentation for libpst.so for libpst application development +Group: Documentation Requires: %{name}-doc = %{version}-%{release} %description devel-doc @@ -64,6 +94,7 @@ documentation for the libpst.so shared library. %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 @@ -79,49 +110,77 @@ libpst utilities. %build 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 +%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} +%clean +rm -rf $RPM_BUILD_ROOT + + %post libs -p /sbin/ldconfig + %postun libs -p /sbin/ldconfig %files +%defattr(-,root,root,-) %{_bindir}/* %{_mandir}/man1/* %{_mandir}/man5/* %files libs +%defattr(-,root,root,-) %{_libdir}/libpst.so.* %doc COPYING -%files -n python2-libpst -%{python2_sitearch}/_*.so -%exclude %{python2_sitearch}/*.a -%exclude %{python2_sitearch}/*.la +%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 @@ -132,6 +191,11 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/ %changelog +* Wed Aug 01 2018 Carl Byington 0.6.72-1 +- allow all 7 days in bydays recurring appointment +- 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 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index c8f9578..f0e5714 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libpst-0.6.71.tar.gz) = 7e03d8e7c37acdae3bd2fd9f3eca03de2c683146416d2a17ed4e673a69cb553dc59932fd8388a751de399e9063f559eaa8d2511f6d3407eebfa6b211763d83aa +SHA512 (libpst-0.6.72.tar.gz) = f2aeb2dc1b9d3e4e33bfddffac6dc3484e8bede432fdaf05a2250d375872db9514a16ff3e19aa823c674fc5ac82d03e257dc06b76e00195439077fd63657b5a5