improving package build (7ff39dc5) · Commits · ww8it / packaging / ww8-lo-release

.gitignore

0 → 100644

+1 −0

Original line number	Diff line number	Diff line
		*~
		No newline at end of file

.target

+29 −19

Original line number	Diff line number	Diff line
		--- # ppbuilder target definition v1

		- release: epel-7-x86_64
		objects:
		- ww8-lo-release-61
		- ww8-lo-release-62
		- ww8-lo-release-63
		packages:
		- ww8-lo-release-64
		- ww8-lo-release-70
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/centos7/x86_64"
		spms: "release/centos7/SRPMS"
		rpms: "release/el7/x86_64"
		spms: "release/el7/SRPMS"

		- release: epel-8-x86_64
		objects:
		- ww8-lo-release-61
		- ww8-lo-release-62
		- ww8-lo-release-63
		packages:
		- ww8-lo-release-64
		- ww8-lo-release-70
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/centos8/x86_64"
		spms: "release/centos8/SRPMS"
		rpms: "release/el8/x86_64"
		spms: "release/el8/SRPMS"

		- release: fedora-30-x86_64
		objects:
		- ww8-lo-release-62
		- ww8-lo-release-63
		packages:
		- ww8-lo-release-64
		- ww8-lo-release-70
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/fedora30/x86_64"
		spms: "release/fedora30/SRPMS"

		- release: fedora-31-x86_64
		objects:
		- ww8-lo-release-63
		packages:
		- ww8-lo-release-64
		- ww8-lo-release-70
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/fedora31/x86_64"
		@@ -41,10 +42,19 @@
		mock-cfg: "{{release}}-ww8"

		- release: fedora-32-x86_64
		objects:
		- ww8-lo-release-64
		packages:
		- ww8-lo-release-70
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/fedora32/x86_64"
		spms: "release/fedora32/SRPMS"
		mock-cfg: "{{release}}-ww8"

		- release: fedora-33-x86_64
		packages:
		- ww8-lo-release-71
		src:
		- ww8-lo-release
		rpms: "release/fedora33/x86_64"
		spms: "release/fedora33/SRPMS"

ww8-lo-release.spec

+15 −12

Original line number	Diff line number	Diff line
		@@ -9,10 +9,10 @@

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

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

		@@ -25,21 +25,19 @@ Source3: ww8-lo-71.repo
		BuildRoot: %{_tmppath}/%{name}-%{version}
		BuildArchitectures: noarch

		%description
		This package contains configuration for the "ww8-libreoffice" RPM Repository,
		no public GPG keys used to sign them yet.

		%if 0%{?el} <= 7
		Requires: yum
		%else
		Requires: dnf
		%endif

		Requires: /etc/yum.repos.d


		%description
		This package contains configuration for the "ww8-libreoffice" RPM Repository,
		no public GPG keys used to sign them yet.


		%if 0%{?el} <= 7
		%package 64
		Summary: RPM configuration for ww8's libreoffice 6.4 repository
		%description 64
		@@ -48,6 +46,7 @@ providing LibreOffice 6.4
		Obsoletes: ww8-lo-release-63
		Obsoletes: ww8-lo-release-62
		Obsoletes: ww8-lo-release-61
		%endif

		%package 70
		Summary: RPM configuration for ww8's libreoffice 7.0 repository
		@@ -58,6 +57,7 @@ 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
		@@ -67,6 +67,7 @@ Obsoletes: ww8-lo-release-63
		Obsoletes: ww8-lo-release-62
		Obsoletes: ww8-lo-release-61


		%prep
		#echo empty prep

		@@ -83,20 +84,22 @@ Obsoletes: ww8-lo-release-61
		rm -rf $RPM_BUILD_ROOT

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


		%files 64
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-64.repo
		%defattr(-,root,root,-)

		%files 70
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-70.repo
		%defattr(-,root,root,-)

		%files 71
		%config %{_sysconfdir}/yum.repos.d/ww8-lo-71.repo
		%defattr(-,root,root,-)

		%changelog
		* Thu Apr 29 2021 Christof Schulze <christof.schulze@fau.de> - 7.1-4
		- improving package build

		* 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)