.gitignore

@@ -1 +1 @@
-SOURCES/libmwaw-0.3.14.tar.xz
+SOURCES/libmwaw-0.3.21.tar.xz

.libmwaw.metadata

@@ -1 +1 @@
-f317eeb678e04bc854fc4905ac221bc2c0bce27d SOURCES/libmwaw-0.3.14.tar.xz
+198d281b63ddfe0a6d3c9678ffe62b458fbbdabf SOURCES/libmwaw-0.3.21.tar.xz

SPECS/libmwaw.spec

@@ -1,7 +1,7 @@
 %global apiversion 0.3
 
 Name: libmwaw
-Version: 0.3.14
+Version: 0.3.21
 Release: 1%{?dist}
 Summary: A library for import of many old Mac document formats
 
@@ -15,6 +15,7 @@ BuildRequires: help2man
 BuildRequires: pkgconfig(librevenge-0.0)
 BuildRequires: pkgconfig(librevenge-generators-0.0)
 BuildRequires: pkgconfig(librevenge-stream-0.0)
+BuildRequires: make
 
 %description
 %{name} is a library for import of old Mac documents. It supports many
@@ -51,12 +52,12 @@ Supported output formats are CSV, HTML, SVG, plain text and raw.
 %autosetup -p1
 
 %build
-%configure --disable-static --disable-werror --disable-zip --enable-docs --with-sharedptr=c++11
+%configure --disable-static --disable-werror --disable-zip --enable-docs
 sed -i \
     -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
     -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
     libtool
-make %{?_smp_mflags} V=1
+%make_build
 
 export LD_LIBRARY_PATH=`pwd`/src/lib/.libs${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
 help2man -N -n 'convert Mac spreadsheet into CSV' -o mwaw2csv.1 ./src/conv/csv/.libs/mwaw2csv
@@ -66,7 +67,7 @@ help2man -N -n 'convert Mac drawing into SVG' -o mwaw2svg.1 ./src/conv/svg/.libs
 help2man -N -n 'convert Mac text document into plain text' -o mwaw2text.1 ./src/conv/text/.libs/mwaw2text
 
 %install
-make install DESTDIR=%{buildroot}
+%make_install
 rm -f %{buildroot}/%{_libdir}/*.la
 # it seems this tool is only useful on MacOS
 rm -f %{buildroot}/%{_bindir}/mwawFile
@@ -76,8 +77,7 @@ rm -rf %{buildroot}/%{_docdir}/%{name}
 install -m 0755 -d %{buildroot}/%{_mandir}/man1
 install -m 0644 mwaw2*.1 %{buildroot}/%{_mandir}/man1
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %doc CHANGES README
@@ -107,6 +107,56 @@ install -m 0644 mwaw2*.1 %{buildroot}/%{_mandir}/man1
 %{_mandir}/man1/mwaw2text.1*
 
 %changelog
+* Tue Dec 14 2021 Caolán McNamara <caolanm@redhat.com> - 0.3.21-1
+- rhbz#2031658 merge in fedora 34 changes
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.20-2
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Mon Jul 26 2021 David Tardon <dtardon@redhat.com> - 0.3.20-1
+- new upstream release
+
+* Mon May 10 2021 David Tardon <dtardon@redhat.com> - 0.3.19-1
+- new upstream release
+
+* Fri May 07 2021 David Tardon <dtardon@redhat.com> - 0.3.18-1
+- new upstream release
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.17-3
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.17-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Sep 21 2020 David Tardon <dtardon@redhat.com> - 0.3.17-1
+- new upstream release
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.16-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.3.16-2
+- Use make macros
+- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
+
+* Sun Apr 05 2020 David Tardon <dtardon@redhat.com> - 0.3.16-1
+- new upstream release
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Thu Apr 18 2019 David Tardon <dtardon@redhat.com> - 0.3.15-1
+- new upstream release
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Tue Apr 24 2018 David Tardon <dtardon@redhat.com> - 0.3.14-1
 - new upstream release