Compare commits

...

No commits in common. "c8s" and "imports/c8/libreoffice-voikko-5.0-2.el8" have entirely different histories.

8 changed files with 4 additions and 78 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
/libreoffice-voikko-5.0.tar.gz SOURCES/libreoffice-voikko-5.0.tar.gz

View File

@ -0,0 +1 @@
e61b4d443cc8475c2f7941c1947e10c1e90c207e SOURCES/libreoffice-voikko-5.0.tar.gz

View File

@ -1,36 +0,0 @@
From 83e27fc67d81b76daea4ab0741cf5799456d867f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Thu, 23 Jan 2020 10:16:38 +0000
Subject: [PATCH] make install-unpacked flattens the python hierarchy so result
doesn't work
the original oxt has the correct hierarchy but 'install' flattened it
Resolves:
https://github.com/voikko/libreoffice-voikko/issues/11
https://bugzilla.redhat.com/show_bug.cgi?id=1676830
https://bugs.documentfoundation.org/show_bug.cgi?id=122984
---
Makefile | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 18eaff6..da085f3 100644
--- a/Makefile
+++ b/Makefile
@@ -98,10 +98,8 @@ all: oxt
install-unpacked: extension-files
install -m 755 -d "$(DESTDIR)" "$(DESTDIR)/META-INF"
- install -m 644 build/oxt/META-INF/manifest.xml "$(DESTDIR)/META-INF"
- install -m 644 build/oxt/description.xml \
- $(patsubst %,build/oxt/%,$(STANDALONE_EXTENSION_FILES)) \
- $(patsubst %,build/oxt/%,$(COPY_TEMPLATES)) $(DESTDIR)
+ install -m 755 -d "$(DESTDIR)" "$(DESTDIR)/pythonpath"
+ cd oxt && find . -type f -exec install -D {} $(DESTDIR)/{} \;
# Sed scripts for modifying templates
DESCRIPTION_SEDSCRIPT:=s/VOIKKO_VERSION/$(VOIKKO_VERSION)/g
--
2.24.1

View File

@ -11,7 +11,7 @@
Name: libreoffice-voikko Name: libreoffice-voikko
Version: 5.0 Version: 5.0
Release: 6%{?dist} Release: 2%{?dist}
Summary: Finnish spellchecker and hyphenator extension for LibreOffice Summary: Finnish spellchecker and hyphenator extension for LibreOffice
License: GPLv3+ License: GPLv3+
@ -20,11 +20,8 @@ URL: http://voikko.puimula.org/
Source0: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz Source0: http://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz
# The usual format of test release URLs # The usual format of test release URLs
#Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz #Source0: http://www.puimula.org/htp/testing/%{name}-%{version}rc2.tar.gz
# https://github.com/voikko/libreoffice-voikko/pull/12
Patch0: 0001-make-install-unpacked-flattens-the-python-hierarchy-.patch
BuildRequires: python3-devel BuildRequires: python3-devel
BuildRequires: make
Requires: python3-libvoikko Requires: python3-libvoikko
Requires: libreoffice-core%{?_isa} Requires: libreoffice-core%{?_isa}
Requires: libreoffice-pyuno%{?_isa} Requires: libreoffice-pyuno%{?_isa}
@ -37,33 +34,20 @@ provided by the Voikko library.
%prep %prep
%setup -q %setup -q
%patch0 -p1 -b .fix.install-unpacked
%build %build
make extension-files %{?_smp_mflags} make extension-files %{?_smp_mflags}
%install %install
make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext} make install-unpacked DESTDIR=$RPM_BUILD_ROOT%{voikkoext}
chmod 644 %{buildroot}%{voikkoext}/{icon.png,SettingsDialog_en_US.default}
%py_byte_compile %{__python3} %{buildroot}%{voikkoext} %py_byte_compile %{__python3} %{buildroot}%{voikkoext}
%files %files
%{voikkoext} %{voikkoext}
%doc ChangeLog COPYING README %doc ChangeLog COPYING README
%changelog %changelog
* Tue Apr 20 2021 Mike FABIAN <mfabian@redhat.com> - 5.0-6
- Related: rhbz#1862385 keep permissions 644 for icon.png and SettingsDialog_en_US.default
* Tue Apr 20 2021 Mike FABIAN <mfabian@redhat.com> - 5.0-5
- Related: rhbz#1862385 add tests/ folder and test script
* Mon Apr 19 2021 Mike FABIAN <mfabian@redhat.com> - 5.0-4
- Related: rhbz#1862385 add gating.yaml
* Mon Apr 12 2021 Mike FABIAN <mfabian@redhat.com> - 5.0-3
- Resolves: rhbz#1862385 fix make install-unpacked to keep hierarchy
* Sun Aug 5 2018 Ville-Pekka Vainio <vpvainio AT iki.fi> - 5.0-2 * Sun Aug 5 2018 Ville-Pekka Vainio <vpvainio AT iki.fi> - 5.0-2
- Fix dependencies - Fix dependencies

View File

@ -1,6 +0,0 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

View File

@ -1 +0,0 @@
SHA512 (libreoffice-voikko-5.0.tar.gz) = 58f139c190acf5c56a8506365c296d06efd95b4422bb66c50e8058231bd10410b202d2a01ad0a2bf82dc0f41565c1e3a07ed86a4ae070d32af8cfd0e56d7eec0

View File

@ -1,7 +0,0 @@
#!/bin/bash
# Check whether the libreoffice-voikko extension is installed.
# exit with 0 if yes, exit with 1 if no:
unopkg list --bundled | grep 'Identifier.*voikko'
exit $?

View File

@ -1,9 +0,0 @@
- hosts: localhost
roles:
- role: standard-test-basic
tags:
- classic
tests:
- simple:
dir: scripts/
run: ./run_tests.sh