4 Commits

Author SHA1 Message Date
d65a356023 * Wed Mar 27 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- removing yum_repositories related elements [SME: 12558]
2024-03-27 11:26:20 -04:00
9ea30d9612 * Sat Mar 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
- drop dmraid support [SME: 12522]
- drop prelink support [SME: 12523]
2024-03-23 22:31:31 -04:00
eb592bec55 change Requires to reference smeserver-* not e-smith-* in spec 2024-03-23 15:56:50 +00:00
3d75412654 Update 2024-03-23 12:11:54 +00:00
2 changed files with 25 additions and 56 deletions

View File

@@ -1,26 +0,0 @@
{
my @add = split(/[,; ]+/, 'CENTOS_EXCLUDES');
my %remove = map { $_ => 1 } split(/[,; ]+/, 'CENTOS_REMOVE');
for my $name ( qw(base updates) )
{
my $repo = $DB->get($name) or next;
my @exclude = split(/,/, $repo->prop('Exclude') || '');
push @exclude, @add;
@exclude = grep(!defined $remove{$_} && !/^CENTOS_/, @exclude);
# remove duplicates
undef %saw;
@exclude = grep(!$saw{$_}++, @exclude);
if ($#exclude >= 0)
{
$repo->set_prop('Exclude', join(',', @exclude));
}
else
{
$repo->delete('Exclude');
}
}
}

View File

@@ -3,16 +3,8 @@
Summary: SME Server module to display support and licensing information
%define name smeserver-support
Name: %{name}
%define version 2.8.0
%define release 21
# These packages come from CentOS, but we need to use care when
# updating them - either we've patched them, or we need to do something
# prior to taking the update
# TODO: check mkinitrd,mdadm to see if needed
%define centos_excludes initscripts,libgsf
%define centos_remove kernel,kernel-smp,kernel-xenU,mkinitrd,mdadm,openssl,samba,samba-client,samba-client-libs,samba-common,samba-common-libs,samba-common-tools,samba-libs,samba*,libsmbclient,libwbclient,libtevent,python-tevent
%define version 11.0.0
%define release 4
Version: %{version}
Release: %{release}%{?dist}
@@ -21,7 +13,7 @@ Group: Networking/Daemons
Source: %{name}-%{version}.tar.xz
BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
BuildRequires: e-smith-devtools >= 1.7.5
BuildRequires: smeserver-devtools >= 1.7.5
BuildArchitectures: noarch
Provides: server-manager-images
AutoReqProv: no
@@ -33,22 +25,22 @@ Requires: perl(LWP::Protocol::https)
Requires: screen
Requires: smeserver-yum
Requires: smeserver-clamav
Requires: e-smith-spamassassin
Requires: smeserver-spamassassin
Requires: smeserver-audittools
Requires: e-smith-formmagick >= 1.4.0-9
Requires: smeserver-formmagick >= 1.4.0-9
# These packages weren't in 5.x, or were split from e-smith-base since then
Requires: e-smith-domains
Requires: e-smith-ibays
Requires: e-smith-nutUPS
Requires: e-smith-portforwarding
Requires: smeserver-domains
Requires: smeserver-ibays
Requires: smeserver-nutUPS
Requires: smeserver-portforwarding
Obsoletes: e-smith-starterwebsite
# 5.x used bind for name resolution - we need to pull in djbdns
Requires: e-smith-dnscache
Requires: e-smith-tinydns
Requires: smeserver-dnscache
Requires: smeserver-tinydns
Requires: e-smith-samba
Requires: smeserver-samba
# Pull in locales so we have a smooth language upgrade [SF: 1309520]
Requires: smeserver-locale-bg
@@ -93,11 +85,22 @@ Requires: mtr
Requires: nano
Requires: nc
Requires: mc
Requires: prelink
Requires: psacct
Requires: dmraid
%changelog
* Wed Mar 27 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-4.sme
- removing yum_repositories related elements [SME: 12558]
* Sat Mar 23 2024 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-3.sme
- drop dmraid support [SME: 12522]
- drop prelink support [SME: 12523]
* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-2.sme
- Change Requires: e-smith- to Requires:smeserver-
* Sat Mar 23 2024 Brian Read <brianr@koozali.org>11.0.0-1.sme
- Update Release and Version to base version and 1st release for SME11 [SME: 12518]
* Mon Jul 10 2023 cvs2git.sh aka Brian Read <brianr@koozali.org> 2.8.0-21.sme
- Roll up patches and move to git repo [SME: 12338]
@@ -944,14 +947,6 @@ perl createlinks
ln -s initial.cgi root/etc/e-smith/locale/en-us/etc/e-smith/web/functions/index.cgi
find root/ -type f | xargs grep -l ____COPYYEARS____ | xargs sed -i -e 's/____COPYYEARS____/%{copykooz}/g'
YUM_REPOS=root/etc/e-smith/db/yum_repositories/
for dir in base updates
do
mkdir -p $YUM_REPOS/defaults/$dir
echo %{centos_excludes} > $YUM_REPOS/defaults/$dir/Exclude
done
sed -i 's/CENTOS_EXCLUDES/%{centos_excludes}/' $YUM_REPOS/migrate/25CentOSExcludes
sed -i 's/CENTOS_REMOVE/%{centos_remove}/' $YUM_REPOS/migrate/25CentOSExcludes
%install
rm -rf $RPM_BUILD_ROOT