Request 2945 (accepted)

Overview

Request 2945 (accepted)

New mirror & simplified repository layout.

Created by mollekopf over 2 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen

Submit kolab-release

Submit package Kolab:16:Testing / kolab-release to package Kolab:16 / kolab-release

kolab-release.spec Changed

@@ -1,125 +1,36 @@
-# The repository type (feature, custom)
-%global repository_type feature
-%global repository_stage private
 %global repository_name kolab
 %global repository_version 16
 
 # Fedora or Enterprise Linux?
 %if 0%{?fedora} > 0
 %global dist_full_name Fedora
-%global dist_lower_name fedora
-%global dist_tag_prefix f
 %global dist_version %{fedora}
-
-%if 0%{?fedora} == 12
-%global gpgkey_name constantine
-%endif
-
-%if 0%{?fedora} == 13
-%global gpgkey_name goddard
-%endif
-
-%if 0%{?fedora} == 14
-%global gpgkey_name laughlin
-%endif
-
-%if 0%{?fedora} == 15
-%global gpgkey_name lovelock
-%endif
-
-%if 0%{?fedora} == 16
-%global gpgkey_name verne
-%endif
-
-%if 0%{?fedora} == 17
-%global gpgkey_name beefymiracle
-%endif
-
-%if 0%{?fedora} == 26
-%global gpgkey_name twentysix
-%endif
-
 %else
 %global dist_full_name Enterprise Linux
-%if 0%{?plesk}
-%global dist_lower_name plesk-%{?plesk}
-%else
-%global dist_lower_name redhat
-%endif
-%global dist_tag_prefix el
 %global dist_version %{rhel}
-%if 0%{?rhel} == 5
-%global gpgkey_name tikanga
-%endif
-%if 0%{?rhel} == 6
-%global gpgkey_name santiago
-%endif
-%if 0%{?rhel} == 7
-%global gpgkey_name maipo
-%endif
-%if 0%{?rhel} == 8
-%global gpgkey_name ootpa
-%endif
 %endif
 
 # Runtime settings
-%global dist_tag %{dist_tag_prefix}%{dist_version}
-
-%if %{?repository_type} == "feature"
 %global desc %{dist_full_name} %{dist_version} Kolab %{repository_version}
-%if %{?repository_stage} == "public"
-%global repository_base_url http://mirror.kolabenterprise.com/pub/%{dist_lower_name}/
-%else
-%global repository_base_url https://mirror.kolabenterprise.com/%{dist_lower_name}/
-%endif
 %global repository_full_name %{repository_name}-%{repository_version}
-%global repository_tag_name %{repository_name}-%{repository_version}
-%else
-%global desc %{dist_full_name} %{dist_version} Custom Kolab %{repository_version}
-%global repository_base_url https://mirror.kolabenterprise.com/%{dist_lower_name}/custom/
-%global repository_full_name custom-%{repository_name}
-%global repository_tag_name %{repository_name}
-%endif
 
-Summary:    Kolab Systems release files
-%if %{repository_stage} == "private"
+Summary:    Apheleia IT release files
 Name:       %{repository_name}-release
-%else
-Name:       %{repository_name}-community-release
-%endif
 Version:    %{repository_version}.%{dist_version}
-Release:    13%{?dist}
+Release:    17%{?dist}
 License:    GPLv2
 Group:      System Environment/Base
-URL:        http://www.kolabenterprise.com
+URL:        https://www.apheleia-it.ch
 Source0:    kolab-repository-template.repo.tpl
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:  noarch
 Requires:   %{repository_name}(release) = %{repository_version}
 
 %description
-Kolab Systems repository configuration files, such as YUM repository configuration files
-
-%if %{repository_stage} == "public"
-%package -n %{repository_full_name}-community-release
-Summary:    Kolab release files
-Group:      System Environment/Base
-
-Obsoletes:  %{repository_full_name}-release < %{version}
-Provides:   %{repository_full_name}-release = %{version}
-Provides:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-%if 0%{?rhel} < 8
-Requires:   pyliblzma
-%endif
-%endif
+Apheleia IT repository configuration files, such as YUM repository configuration files
 
-%description -n %{repository_full_name}-community-release
-This package provides the repository configuration for Kolab
-%else
 %package -n %{repository_full_name}-release
-Summary:    Kolab Enterprise release files by Kolab Systems
+Summary:    Kolab Enterprise release files by Apheleia IT
 Group:      System Environment/Base
 
 Obsoletes:  %{repository_full_name}-release < %{version}
@@ -138,90 +49,7 @@
 Provides:   %{repository_name}-community-release = %{version}
 
 %description -n %{repository_full_name}-release
-This package provides the repository configuration for Kolab Systems' Enterprise version of Kolab
-
-%endif
-
-%if %{?repository_type} == "feature"
-%if %{repository_stage} == "public"
-%package -n %{repository_full_name}-community-release-development
-%else
-%package -n %{repository_full_name}-release-development
-%endif
-Summary:    Development repository definitions
-Group:      System Environment/Base
-Requires:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-Requires:   pyliblzma
-%endif
-
-%if %{repository_stage} == "public"
-%description -n %{repository_full_name}-community-release-development
-%else
-%description -n %{repository_full_name}-release-development
-%endif
-This package provides the development repository definitions.
-%endif
-
-%if %{repository_type} == "feature"
-%if %{repository_stage} == "private"
-%if %{repository_version} >= 14
-%if 0%{?plesk} < 1
-%package -n %{repository_full_name}-extras-audit
-Summary:    Audit trail packages for Kolab Enterprise %{repository_version}
-Group:      System Environment/Base
-Requires:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-Requires:   pyliblzma
-%endif # 0%{?rhel}
-
-%description -n %{repository_full_name}-extras-audit
-Extras repository for Bonnie and Egara on Kolab Enterprise %{repository_version}
-
-%package -n %{repository_full_name}-extras-puppet
-Summary:    Puppet 3 packages for Kolab Enterprise %{repository_version}
-Group:      System Environment/Base
-Requires:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-Requires:   pyliblzma
-%endif # 0%{?rhel}
-
-%description -n %{repository_full_name}-extras-puppet
-Puppet 3 repository for Kolab Enterprise %{repository_version}
-
-%if 0%{?rhel} >= 6
-%package -n %{repository_full_name}-extras-fasttrack
-Summary:    Fasttrack packages for Kolab Enterprise %{repository_version}
-Group:      System Environment/Base
-Requires:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-Requires:   pyliblzma
-%endif # 0%{?rhel}
-
-%description -n %{repository_full_name}-extras-fasttrack
-Fasttrack repository for Kolab Enterprise %{repository_version}
-
-%package -n %{repository_full_name}-extras-collab
-Summary:    Collabora Online packages for Kolab Enterprise %{repository_version}
-Group:      System Environment/Base
-Requires:   %{repository_name}(release) = %{repository_version}
-%if 0%{?rhel}
-Requires:   epel-release = %{rhel}
-Requires:   pyliblzma
-%endif # 0%{?rhel}
-
-%description -n %{repository_full_name}-extras-collab
-Extras repository for Collabora Online on Kolab Enterprise %{repository_version}
-
-%endif # 0%{?rhel} >= 6
-%endif # 0%{?plesk} < 1
-%endif # %{repository_version} >= 14
-%endif # %{repository_stage} == "private"
-%endif # %{repository_type} == "feature"
+This package provides the repository configuration for Apheleia IT' Enterprise version of Kolab
 
 %prep
 
@@ -237,153 +65,73 @@
 
 install -d -m 755 %{buildroot}/%{_sysconfdir}/yum.repos.d
 
-%if %{?repository_type} == "feature"
-for repo in release updates updates-testing development; do
-    [ "$repo" == "release" ] && status="" || status="-$repo"
-    [ "$repo" == "updates-testing" ] && enabled="0" || enabled="1"
-
-    cat %{SOURCE0} | \
-        sed \
-                -e 's/@@desc@@/%{desc}/g' \
-                -e 's/@@dist_full_name@@/%{dist_full_name}/g' \
-                -e 's/@@dist_tag@@/%{dist_tag}/g' \
-                -e 's/@@dist_version@@/%{dist_version}/g' \
-                -e "s/@@enabled@@/$enabled/g" \
-                -e 's|@@repository_base_url@@|%{repository_base_url}|g' \
-                -e 's/@@repository_full_name@@/%{repository_full_name}/g' \
-                -e 's/@@repository_name@@/%{repository_name}/g' \
-                -e "s|@@repository_status@@|$repo/|g" \
-                -e "s/@@_repository_status@@/$status/g" \
-                -e "s/@@_repository_status@@/$status/g" \
-                -e 's/@@repository_tag_name@@/%{repository_tag_name}/g' \
-        > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{repository_full_name}-$repo.repo
-done
+for repo in base testing testing-candidate; do
+    if [ "$repo" == "base" ]; then
+        enabled="1"
+        suffix=""
+        reponame=""
+    else
+        enabled="0"
+        suffix="-$repo"
+    fi
 
-%if %{repository_stage} == "private"
-%if %{repository_version} >= 14
+%if 0%{?plesk}
+    plesk_suffix="_Plesk_17"
+%else
+    plesk_suffix=""
+%endif
 
-%if 0%{?plesk} < 1
-repos="extras-audit extras-puppet"
+    repository_name="%{repository_full_name}"
 
-%if 0%{?rhel} >= 6
-repos="${repos} extras-fasttrack"
-%endif # 0%{?rhel} >= 6
+    if [ "$repo" == "testing" ]; then
+        reposuffix=":/Testing"
+        repository_name="%{repository_full_name}-testing"
+    fi
 
-%if 0%{?repository_version} >= 16
-repos="${repos} extras-collab"
-%endif # 0%{?repository_version} >= 16
+    if [ "$repo" == "testing-candidate" ]; then
+        reposuffix=":/Testing:/Candidate"
+        repository_name="%{repository_full_name}-testing-candidate"
+    fi
 
-%endif # 0%{?plesk} < 1
+%if 0%{?fedora} > 0
+    repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/Fedora_%{dist_version}$plesk_suffix"
+%else
+    repository_url="https://mirror.apheleia-it.ch/repos/Kolab:/16$reposuffix/CentOS_%{dist_version}$plesk_suffix"
+%endif
+    repository_url_src="$repository_url/src"
 
-for repo in ${repos}; do
-    status="-${repo}"
     cat %{SOURCE0} | \
         sed \
                 -e 's/@@desc@@/%{desc}/g' \
                 -e 's/@@dist_full_name@@/%{dist_full_name}/g' \
-                -e 's/@@dist_tag@@/%{dist_tag}/g' \
                 -e 's/@@dist_version@@/%{dist_version}/g' \
                 -e "s/@@enabled@@/$enabled/g" \
-                -e 's|@@repository_base_url@@|%{repository_base_url}|g' \
-                -e 's/@@repository_full_name@@/%{repository_full_name}/g' \
-                -e 's/@@repository_name@@/%{repository_name}/g' \
-                -e "s|@@repository_status@@|$repo/|g" \
-                -e "s/@@_repository_status@@/$status/g" \
-                -e "s/@@_repository_status@@/$status/g" \
-                -e 's/@@repository_tag_name@@/%{repository_tag_name}/g' \
-        > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{repository_full_name}-$repo.repo
+                -e "s|@@repository_url@@|$repository_url|g" \
+                -e "s|@@repository_url_src@@|$repository_url_src|g" \
+                -e "s/@@repository_name@@/$repository_name/g" \
+        > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{repository_full_name}$suffix.repo
 done
 
-%endif # %{repository_version} >= 14
-%endif # %{repository_stage} == "private"
-
-%else # %if %{?repository_type} == "feature"
-    cat %{SOURCE0} | \
-        sed \
-                -e 's/@@desc@@/%{desc}/g' \
-                -e 's/@@dist_full_name@@/%{dist_full_name}/g' \
-                -e 's/@@dist_tag@@/%{dist_tag}/g' \
-                -e 's/@@dist_version@@/%{dist_version}/g' \
-                -e "s/@@enabled@@/1/g" \
-                -e 's|@@repository_base_url@@|%{repository_base_url}|g' \
-                -e 's/@@repository_full_name@@/%{repository_full_name}/g' \
-                -e 's/@@repository_name@@/%{repository_name}/g' \
-                -e "s/@@repository_status@@/$repo/g" \
-                -e "s/@@_repository_status@@//g" \
-                -e 's/@@repository_tag_name@@/%{repository_tag_name}/g' \
-        > %{buildroot}/%{_sysconfdir}/yum.repos.d/%{repository_full_name}.repo
-%endif # %if %{?repository_type} == "feature"
-
 sed -i \
     -e 's|@@gpgcheck@@|1|g' \
-    -e 's|@@gpgkeyname@@|%{gpgkey_name}|g' \
         %{buildroot}/%{_sysconfdir}/yum.repos.d/*.repo
 
 %clean
 rm -rf %{buildroot}
 
-%if %{repository_stage} == "public"
-%files -n %{repository_full_name}-community-release
-%else
+
 %files -n %{repository_full_name}-release
-%endif
 %defattr(-,root,root,-)
 %dir %{_sysconfdir}/yum.repos.d
-%if %{?repository_type} == "feature"
-%exclude %{_sysconfdir}/yum.repos.d/*development.repo
-%endif
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*release.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*updates.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/*updates-testing.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/kolab-16.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/kolab-16-testing.repo
+%config(noreplace) %{_sysconfdir}/yum.repos.d/kolab-16-testing-candidate.repo
 %dir %{_sysconfdir}/pki/rpm-gpg
-#%{_sysconfdir}/pki/rpm-gpg/*
-
-%if %{?repository_type} == "feature"
-%if %{repository_stage} == "public"
-%files -n %{repository_full_name}-community-release-development
-%else
-%files -n %{repository_full_name}-release-development
-%endif
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/*development.repo
-%endif
-
-%if 0%{?plesk} < 1
-%if %{repository_type} == "feature"
-%if %{repository_stage} == "private"
-%if %{repository_version} >= 14
-%files -n %{repository_full_name}-extras-audit
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/*extras-audit.repo
-
-%files -n %{repository_full_name}-extras-puppet
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/*extras-puppet.repo
-
-%if 0%{?rhel} >= 6
-%files -n %{repository_full_name}-extras-fasttrack
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/*extras-fasttrack.repo
-%endif
-
-%endif
-%endif
-%endif
-%endif
-
-%if %{repository_type} == "feature"
-%if %{repository_stage} == "private"
-%if 0%{?repository_version} >= 16
-%if 0%{?plesk} < 1
-%files -n %{repository_full_name}-extras-collab
-%defattr(-,root,root,-)
-%config(noreplace) /etc/yum.repos.d/*extras-collab.repo
-%endif
-%endif
-%endif
-%endif
 
 %changelog
+* Fri Jun 3 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 16.8-17
+- New simplified repository layout
+
 * Mon May 14 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 16.7-10
 - Add extras-collab for Plesk 17

kolab-repository-template.repo.tpl Changed

@@ -1,26 +1,17 @@
-[@@repository_full_name@@@@_repository_status@@]
+[@@repository_name@@]
 name = @@desc@@ Packages
-baseurl = @@repository_base_url@@@@repository_tag_name@@/@@dist_tag@@/@@repository_status@@$basearch
+baseurl = @@repository_url@@
 enabled = @@enabled@@
 priority = 60
 skip_if_unavailable = 1
 gpgcheck = @@gpgcheck@@
-gpgkey = https://mirror.kolabenterprise.com/@@gpgkeyname@@.asc
+gpgkey = https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc
 
-[@@repository_full_name@@@@_repository_status@@-debuginfo]
-name = @@desc@@ Packages - Debugging Symbols
-baseurl = @@repository_base_url@@@@repository_tag_name@@/@@dist_tag@@/@@repository_status@@$basearch/debug
-enabled = 0
-priority = 60
-skip_if_unavailable = 1
-gpgcheck = @@gpgcheck@@
-gpgkey = https://mirror.kolabenterprise.com/@@gpgkeyname@@.asc
-
-[@@repository_full_name@@@@_repository_status@@-source]
+[@@repository_name@@-source]
 name = @@desc@@ Packages - Sources
-baseurl = @@repository_base_url@@@@repository_tag_name@@/@@dist_tag@@/@@repository_status@@SRPMS
+baseurl = @@repository_url_src@@
 enabled = 0
 priority = 60
 skip_if_unavailable = 1
 gpgcheck = @@gpgcheck@@
-gpgkey = https://mirror.kolabenterprise.com/@@gpgkeyname@@.asc
+gpgkey = https://mirror.apheleia-it.ch/repos/Kolab:/16/key.asc

Build Results
RPM Lint

Refresh

Comments for request 2945 0

Request History

mollekopf created request over 2 years ago

New mirror & simplified repository layout.

mollekopf accepted request over 2 years ago