adding ww8-lo-7.1 and removing eol versions (6.3, 6.2, 6.1) (cb6e5cd0) · Commits · ww8it / packaging / ww8-lo-release

README.md

+4 −3

Original line number	Diff line number	Diff line
		ww8-lo-release - Libreoffice
		---------------------------
		# ww8-lo-release
		## alternate versions of LibreOffice for Fedora and EL


		Repository release package for more current versions of Libreoffice

		@@ -12,6 +13,6 @@ mock -r epel-7-x86_64 --init

		# On Buildserver (mock) call:
		```bash
		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-61.repo

deleted100644 → 0

+0 −8

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

ww8-lo-63.repo

deleted100644 → 0

+0 −16

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

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

ww8-lo-62.repo→ww8-lo-71.repo

+16 −0

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

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

ww8-lo-release.spec

+33 −41

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

		Name: ww8-lo-release
		Version: 7
		Release: 2%{?dist}
		Version: 7.1
		Release: 3%{?dist}

		Summary: RPM configuration for ww8's libreoffice repository
		Group: System Environment/Base
		License: GPL
		URL: https://infra.ww8kd.fau.de/packages/

		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
		Source1: ww8-lo-64.repo
		Source2: ww8-lo-70.repo
		Source3: ww8-lo-71.repo
		#Source6: RPM-GPG-KEY-ww8


		@@ -41,64 +39,53 @@ Requires: /etc/yum.repos.d
		This package contains configuration for the "ww8-libreoffice" RPM Repository,
		no public GPG keys used to sign them yet.

		%package 61
		Summary: RPM configuration for ww8's libreoffice 6.1 repository
		%description 61
		This package contains configuration for the "ww8-lo-release61" RPM Repository,
		providing LibreOffice 6.1

		%package 62
		Summary: RPM configuration for ww8's libreoffice 6.2 repository
		%description 62
		This package contains configuration for the "ww8-lo-release62" RPM Repository,
		providing LibreOffice 6.2

		%package 63
		Summary: RPM configuration for ww8's libreoffice 6.3 repository
		%description 63
		This package contains configuration for the "ww8-lo-release63" RPM Repository,
		providing LibreOffice 6.3

		%package 64
		Summary: RPM configuration for ww8's libreoffice 6.4 repository
		%description 64
		This package contains configuration for the "ww8-lo-release64" RPM Repository,
		providing LibreOffice 6.4
		Obsoletes: ww8-lo-release-63
		Obsoletes: ww8-lo-release-62
		Obsoletes: ww8-lo-release-61

		%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
		Obsoletes: ww8-lo-release-63
		Obsoletes: ww8-lo-release-62
		Obsoletes: ww8-lo-release-61

		%package 71
		Summary: RPM configuration for ww8's libreoffice 7.1 repository
		%description 71
		This package contains configuration for the "ww8-lo-release71" RPM Repository,
		providing LibreOffice 7.1
		Obsoletes: ww8-lo-release-63
		Obsoletes: ww8-lo-release-62
		Obsoletes: ww8-lo-release-61

		%prep
		echo empty prep
		#echo empty prep

		%build

		%install
		rm -rf $RPM_BUILD_ROOT
		%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-61.repo
		%{__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
		#rm -rf $RPM_BUILD_ROOT
		%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-64.repo
		%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-70.repo
		%{__install} -Dp -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/yum.repos.d/ww8-lo-71.repo
		#%{__install} -Dp -m0644 %{SOURCE6} %{buildroot} %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8

		%clean
		rm -rf $RPM_BUILD_ROOT

		#%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8
		%files
		%defattr(-,root,root,-)
		#%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-ww8

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

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

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

		%files 64
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-64.repo
		@@ -106,8 +93,13 @@ rm -rf $RPM_BUILD_ROOT
		%files 70
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-70.repo

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

		%changelog
		* Thu Apr 29 2021 Christof Schulze <christof.schulze@fau.de> - 7.1-3
		- adding ww8-lo-7.1 and removing eol versions (6.3, 6.2, 6.1)

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