diff --git a/README.md b/README.md index b419fd0..2fc27f3 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # openmamba-release -Release file and Smart Package Manager configuration for openmamba 4.20201108 . +Release files for openmamba 2020.11 . diff --git a/openmamba-release.spec b/openmamba-release.spec index 6edf211..3025e8d 100644 --- a/openmamba-release.spec +++ b/openmamba-release.spec @@ -17,9 +17,9 @@ %endif Name: openmamba-release -Version: 4.20201108 +Version: 2020.11 Release: 1mamba -Summary: Release file and Smart Package Manager configuration for %{distroid} %{fullversion} %{?codename:(%codename)} +Summary: Release files for %{distroid} %{fullversion} %{?codename:(%codename)} Group: System/Configuration Vendor: openmamba Distribution: openmamba @@ -30,6 +30,8 @@ License: GPL Obsoletes: mambaSoft-devel-sc Obsoletes: openmamba-upgrade Obsoletes: bootsplash +Provides: openmamba-devel +Obsoletes: openmamba-devel BuildRoot: %{_tmppath}/%{name}-%{version}-root ## AUTOBUILDREQ-BEGIN ## AUTOBUILDREQ-END @@ -37,25 +39,7 @@ Requires(post):gnupg #Requires(post):rpm %description -Release file and Smart Package Manager configuration for %{distroid} %{fullversion} %{?codename:(%codename)}. - -%package -n openmamba-devel -Group: System/Configuration -Summary: Smart Package Manager configuration for the %{distroid} devel repositories -Requires: %{name} = %{?epoch:%epoch:}%{version}-%{release} -#Requires(post):rpm -Requires: openmamba-release = %{?epoch:%epoch:}%{version}-%{release} -Provides: openmamba-devel-games -Obsoletes: openmamba-devel-games -Provides: openmamba-devel-contrib -Obsoletes: openmamba-devel-contrib -Provides: openmamba-devel-embedded -Obsoletes: openmamba-devel-embedded -Provides: openmamba-devel-makedist -Obsoletes: openmamba-devel-makedist - -%description -n openmamba-devel -Smart Package Manager configuration for the %{distroid} devel repositories. +Release files for %{distroid} %{fullversion} %{?codename:(%codename)}. %prep %setup -q @@ -64,10 +48,7 @@ Smart Package Manager configuration for the %{distroid} devel repositories. %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall \ -%ifarch x86_64 - install-x86_64 -%endif +%makeinstall install -d %{buildroot}%{_sysconfdir}/sysconfig echo "\ @@ -118,12 +99,6 @@ echo "\ %%_openmamba_release %{distroid} release %{fullversion} for %{_target_cpu} %{?codename:(%codename)}" \ > %{buildroot}%{_sysconfdir}/rpm/macros.openmamba_release -%ifarch x86_64 -sed -i "s|\%ARCH\%|i586 %{_host_cpu}|" %{buildroot}%{_sysconfdir}/smart/distro.d/* -%else -sed -i "s|\%ARCH\%|%{_host_cpu}|" %{buildroot}%{_sysconfdir}/smart/distro.d/* -%endif - %ifnarch x86_64 rm -f %{buildroot}%{_sysconfdir}/yum/repos.d/openmamba-rolling-i586.repo rm -f %{buildroot}%{_sysconfdir}/yum/repos.d/openmamba-rolling-unstable-i586.repo @@ -148,7 +123,7 @@ fi %dir %{_sysconfdir}/pki/rpm-gpg %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-Mambasoft %{_sysconfdir}/profile.d/gpg-key-openmamba.sh -%{_sysconfdir}/xprofile.d/gpg-key-openmamba.sh +#%{_sysconfdir}/xprofile.d/gpg-key-openmamba.sh %{_sysconfdir}/%{distroid}-release %{_sysconfdir}/os-release %{_usr}/lib/os-release @@ -157,27 +132,17 @@ fi %{_sysconfdir}/sysconfig/release %{_sysconfdir}/issue %{_sysconfdir}/issue.net -%{_sysconfdir}/smart/distro.d/10-%{distroid}-milestone4-repositories.py -%ifarch x86_64 -%{_sysconfdir}/smart/distro.d/93-multiarch-update-x86_64.py -%endif -%{_sysconfdir}/smart/distro.d/95-multi-version-select.py -%{_sysconfdir}/smart/distro.d/95-virtual-packages-select.py -%{_sysconfdir}/smart/distro.d/98-configure-once.py %ifarch x86_64 %config %{_sysconfdir}/yum/repos.d/openmamba-rolling-i586.repo -%endif -%config %{_sysconfdir}/yum/repos.d/openmamba-rolling.repo - -%files -n openmamba-devel -%defattr(-,root,root) -%{_sysconfdir}/smart/distro.d/90-%{distroid}-devel-repositories.py -%ifarch x86_64 %config %{_sysconfdir}/yum/repos.d/openmamba-rolling-unstable-i586.repo %endif +%config %{_sysconfdir}/yum/repos.d/openmamba-rolling.repo %config %{_sysconfdir}/yum/repos.d/openmamba-rolling-unstable.repo %changelog +* Sat Nov 21 2020 Silvan Calarco 2020.11-1mamba +- update to 2020.11 + * Sun Nov 08 2020 Silvan Calarco 4.20201108-1mamba - update to 4.20201108