Add LibreOffice 7.0 (fb28412c) · Commits · ww8it / packaging / ww8-lo-release

.gitlab-ci.yml

0 → 100644

+15 −0

Original line number	Diff line number	Diff line
		image: centos:8


		before_script:
		- dnf -y install rpmlint rpm-build


		stages:
		- Static Analysis

		rpmlint:
		stage: Static Analysis
		script:
		- rpmlint --version
		- rpmlint -i *.spec

README.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -12,6 +12,6 @@ mock -r epel-7-x86_64 --init

		# On Buildserver (mock) call:
		```bash
		LO_VERSION='6.0'
		LO_VERSION='7.0'
		mock -r epel-7-x86_64 --scm-enable --scm-option method=git --scm-option package=ww8-lo-release --scm-option git_get=set --scm-option spec=ww8-lo-release.spec --scm-option branch=master --scm-option git_get="git clone https://simlab.ww.uni-erlangen.de/ww8it/packaging/ww8-lo-release.git"
		```

ww8-lo-70.repo

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		[ww8-libreoffice70]
		name=WW8's RPM repository - LibreOffice 7.0
		baseurl=http://infra.ww8kd.fau.de/rpm/release/libreoffice/7.0/
		enabled=1
		metadata_expire=1h
		skip_if_unavailable=True
		gpgcheck=0
		cost=100

		[ww8-libreoffice70-testing]
		name=WW8's RPM repository - LibreOffice 7.0 testing
		baseurl=http://infra.ww8kd.fau.de/rpm/testing/libreoffice/7.0/
		enabled=0
		metadata_expire=1h
		skip_if_unavailable=True
		gpgcheck=0

ww8-lo-release.spec

+17 −4

Original line number	Diff line number	Diff line
		@@ -8,8 +8,8 @@
		#

		Name: ww8-lo-release
		Version: 1
		Release: 6%{?dist}
		Version: 7
		Release: 2%{?dist}

		Summary: RPM configuration for ww8's libreoffice repository
		Group: System Environment/Base
		@@ -20,6 +20,7 @@ Source1: ww8-lo-61.repo
		Source2: ww8-lo-62.repo
		Source3: ww8-lo-63.repo
		Source4: ww8-lo-64.repo
		Source5: ww8-lo-70.repo
		#Source6: RPM-GPG-KEY-ww8


		@@ -32,9 +33,9 @@ Requires: yum
		%else
		Requires: dnf
		%endif

		Requires: /etc/yum.repos.d

		#Requires: fedora-release >= 3

		%description
		This package contains configuration for the "ww8-libreoffice" RPM Repository,
		@@ -64,6 +65,12 @@ Summary: RPM configuration for ww8's libreoffice 6.4 repository
		This package contains configuration for the "ww8-lo-release64" RPM Repository,
		providing LibreOffice 6.4

		%package 70
		Summary: RPM configuration for ww8's libreoffice 7.0 repository
		%description 70
		This package contains configuration for the "ww8-lo-release70" RPM Repository,
		providing LibreOffice 7.0

		%prep
		echo empty prep

		@@ -74,7 +81,7 @@ rm -rf $RPM_BUILD_ROOT
		%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-62.repo
		%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-63.repo
		%{__install} -Dp -m0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-64.repo

		%{__install} -Dp -m0644 %{SOURCE5} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-70.repo
		#%{__install} -Dp -m0644 %{SOURCE6} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8

		%clean
		@@ -96,8 +103,14 @@ rm -rf $RPM_BUILD_ROOT
		%files 64
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-64.repo

		%files 70
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-70.repo


		%changelog
		* Fri Sep 25 2020 Christof Schulze <christof.schulze@fau.de> - 7.0-1
		- adding ww8-lo-7.0

		* Tue Feb 04 2020 Christof Schulze <christof.schulze@fau.de> - 6.4-6
		- apply repo naming convention