Compare commits

...

No commits in common. "27a02353e46f53d60629b612ecdc8a9da9f89ab4" and "c8s" have entirely different histories.

5 changed files with 7 additions and 81 deletions

12
.gitignore vendored
View File

@ -1,12 +1,2 @@
/libmspub-0.0.0.tar.xz SOURCES/libmspub-0.1.4.tar.xz
/libmspub-0.0.1.tar.xz
/libmspub-0.0.2.tar.xz
/libmspub-0.0.3.tar.xz
/libmspub-0.0.4.tar.xz
/libmspub-0.0.5.tar.xz
/libmspub-0.0.6.tar.xz
/libmspub-0.1.0.tar.xz
/libmspub-0.1.1.tar.xz
/libmspub-0.1.2.tar.xz
/libmspub-0.1.3.tar.xz
/libmspub-0.1.4.tar.xz /libmspub-0.1.4.tar.xz

View File

@ -1 +0,0 @@
dcfe4dba518b44cc500385e878b66f53c5734df6 libmspub-0.1.4.tar.xz

View File

@ -1,6 +1,6 @@
--- !Policy --- !Policy
product_versions: product_versions:
- rhel-9 - rhel-8
decision_context: osci_compose_gate decision_context: osci_compose_gate
rules: rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional} - !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -1,11 +0,0 @@
diff -Nrup a/src/lib/MSPUBMetaData.h b/src/lib/MSPUBMetaData.h
--- a/src/lib/MSPUBMetaData.h 2018-02-28 04:54:49.000000000 -0700
+++ b/src/lib/MSPUBMetaData.h 2019-09-23 16:55:47.100951113 -0600
@@ -13,6 +13,7 @@
#include <map>
#include <utility>
#include <vector>
+#include <cstdint>
#include <librevenge/librevenge.h>

View File

@ -2,15 +2,13 @@
Name: libmspub Name: libmspub
Version: 0.1.4 Version: 0.1.4
Release: 17%{?dist} Release: 1%{?dist}
Summary: A library for import of Microsoft Publisher documents Summary: A library for import of Microsoft Publisher documents
License: MPLv2.0 License: MPLv2.0
URL: http://wiki.documentfoundation.org/DLP/Libraries/libmspub URL: http://wiki.documentfoundation.org/DLP/Libraries/libmspub
Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz Source: http://dev-www.libreoffice.org/src/%{name}/%{name}-%{version}.tar.xz
Patch0: gcc10.patch
BuildRequires: boost-devel BuildRequires: boost-devel
BuildRequires: doxygen BuildRequires: doxygen
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -20,7 +18,6 @@ BuildRequires: pkgconfig(librevenge-0.0)
BuildRequires: pkgconfig(librevenge-generators-0.0) BuildRequires: pkgconfig(librevenge-generators-0.0)
BuildRequires: pkgconfig(librevenge-stream-0.0) BuildRequires: pkgconfig(librevenge-stream-0.0)
BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(zlib)
BuildRequires: make
%description %description
Libmspub is library providing ability to interpret and import Microsoft Libmspub is library providing ability to interpret and import Microsoft
@ -59,10 +56,10 @@ sed -i \
-e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \ -e 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' \
-e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \ -e 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' \
libtool libtool
%make_build make %{?_smp_mflags}
%install %install
%make_install make install DESTDIR=%{buildroot}
rm -f %{buildroot}/%{_libdir}/*.la rm -f %{buildroot}/%{_libdir}/*.la
# rhbz#1001245 we install API docs directly from build # rhbz#1001245 we install API docs directly from build
rm -rf %{buildroot}/%{_docdir}/%{name} rm -rf %{buildroot}/%{_docdir}/%{name}
@ -75,7 +72,8 @@ rm -rf %{buildroot}/%{_docdir}/%{name}
install -m 0755 -d %{buildroot}/%{_mandir}/man1 install -m 0755 -d %{buildroot}/%{_mandir}/man1
install -m 0644 pub2*.1 %{buildroot}/%{_mandir}/man1 install -m 0644 pub2*.1 %{buildroot}/%{_mandir}/man1
%ldconfig_scriptlets %post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files %files
%doc AUTHORS NEWS README %doc AUTHORS NEWS README
@ -99,56 +97,6 @@ install -m 0644 pub2*.1 %{buildroot}/%{_mandir}/man1
%{_mandir}/man1/pub2xhtml.1* %{_mandir}/man1/pub2xhtml.1*
%changelog %changelog
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.1.4-17
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.1.4-16
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jul 14 2020 Tom Stellard <tstellar@redhat.com> - 0.1.4-13
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Sat May 16 2020 Pete Walter <pwalter@fedoraproject.org> - 0.1.4-12
- Rebuild for ICU 67
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 0.1.4-10
- Fix missing #include for gcc-10
* Fri Nov 01 2019 Pete Walter <pwalter@fedoraproject.org> - 0.1.4-9
- Rebuild for ICU 65
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jan 25 2019 Jonathan Wakely <jwakely@redhat.com> - 0.1.4-6
- Rebuilt for Boost 1.69
* Wed Jan 23 2019 Pete Walter <pwalter@fedoraproject.org> - 0.1.4-5
- Rebuild for ICU 63
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 0.1.4-3
- Rebuild for ICU 62
* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 0.1.4-2
- Rebuild for ICU 61.1
* Wed Feb 28 2018 David Tardon <dtardon@redhat.com> - 0.1.4-1 * Wed Feb 28 2018 David Tardon <dtardon@redhat.com> - 0.1.4-1
- new upstream release - new upstream release