File openSUSE-release.spec.patch of Package release-packages
diff --git openSUSE-release.spec openSUSE-release.spec.new
index 986c052..8148937 100644
--- openSUSE-release.spec
+++ openSUSE-release.spec.new
@@ -19,6 +19,7 @@
%define product openSUSE
#define betaversion %{nil}
%define codename Tumbleweed-Slowroll
+%define channel slowroll
Name: openSUSE-release
Version: 20250101
Release: 0
@@ -30,11 +31,6 @@ Source100: weakremovers.inc
BuildRequires: skelcd-control-openSUSE-Slowroll
BuildRequires: skelcd-openSUSE
Suggests: branding-openSUSE
-Requires: distribution-logos-openSUSE-Slowroll
-Obsoletes: distribution-logos-openSUSE-Tumbleweed
-Obsoletes: distribution-logos-openSUSE-Aeon
-Obsoletes: distribution-logos-openSUSE-MicroOS
-Obsoletes: distribution-logos-openSUSE-Kubic
Suggests: java-21-openjdk
Suggests: java-21-openjdk-devel
Suggests: mariadb
@@ -54,8 +50,6 @@ Provides: aaa_version
Provides: distribution-release
Provides: suse-release = %{version}-%{release}
Provides: suse-release-oss = %{version}-%{release}
-# Give zypp a hint that this product must be kept up-to-date using zypper dup, not up (boo#1061384)
-Provides: product-update() = dup
# Since we have more than one product in the FTP tree, we need to give yast a hint
Provides: system-installation() = openSUSE
Obsoletes: aaa_version
@@ -207,7 +201,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64
Provides: product-label() = openSUSE
Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20250101
Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm
-Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F
+Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2F%{channel}%2Frepo%2Foss%2F
Requires: product_flavor(openSUSE)
@@ -525,15 +519,15 @@ VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
NAME="openSUSE Tumbleweed-Slowroll"
# VERSION="%{version}%{?betaversion: %{betaversion}}"
-ID="opensuse-slowroll"
+ID="opensuse-%{channel}"
ID_LIKE="opensuse-tumbleweed opensuse suse"
VERSION_ID="$VERSION_ID"
PRETTY_NAME="openSUSE Tumbleweed-Slowroll"
ANSI_COLOR="0;32"
# CPE 2.3 format, boo#1217921
-CPE_NAME="cpe:2.3:o:opensuse:slowroll:%{version}:*:*:*:*:*:*:*"
+CPE_NAME="cpe:2.3:o:opensuse:%{channel}:%{version}:*:*:*:*:*:*:*"
#CPE 2.2 format
-#CPE_NAME="cpe:/o:opensuse:slowroll:%{version}"
+#CPE_NAME="cpe:/o:opensuse:%{channel}:%{version}"
BUG_REPORT_URL="https://bugzilla.opensuse.org"
SUPPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org"
@@ -544,27 +538,6 @@ ln -s ..%{_prefix}/lib/os-release %{buildroot}%{_sysconfdir}/os-release
mkdir -p %{buildroot}%{_prefix}/lib/motd.d/
echo "Have a lot of fun..." > %{buildroot}%{_prefix}/lib/motd.d/welcome
-# Bug 404141 - /etc/YaST/control.xml should be owned by some package
-mkdir -p %{buildroot}%{_sysconfdir}/YaST2/
-echo %{buildroot}
-if [ -f /CD1/control.xml ]; then
- install -m 644 /CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
-elif [ -f %{_prefix}/lib/skelcd/CD1/control.xml ]; then
- install -m 644 %{_prefix}/lib/skelcd/CD1/control.xml %{buildroot}%{_sysconfdir}/YaST2/
-fi
-
-# enable vendor change openSUSE,SUSE for DUP from 15.3 to TW (boo#1198332)
-mkdir -p %{buildroot}%{_sysconfdir}/zypp/vendors.d
-echo -e "[main]\nvendors=openSUSE,SUSE,SUSE LLC <https://www.suse.com/>\n" > %{buildroot}%{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf
-
-# fate#319341, make openSUSE-release own YaST license files.
-install -D -d -m 755 "%{buildroot}%_defaultlicensedir/product/base"
-install -D -d -m 755 "%{buildroot}%_defaultlicensedir"
-cp -a license "%{buildroot}%_defaultlicensedir/%name"
-pushd license
-for i in *; do
- ln -s "%_defaultlicensedir/%name/$i" %{buildroot}%_defaultlicensedir/product/base/$i
-done
mkdir -p %{buildroot}%{_sysconfdir}/products.d
cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF
@@ -617,7 +590,7 @@ cat >%{buildroot}%{_sysconfdir}/products.d/openSUSE.prod << EOF
</linguas>
<urls>
<url name="releasenotes">http://doc.opensuse.org/release-notes/x86_64/openSUSE/Tumbleweed/release-notes-openSUSE.rpm</url>
- <url name="repository">http://download.opensuse.org/slowroll/repo/oss/</url>
+ <url name="repository">http://download.opensuse.org/%{channel}/repo/oss/</url>
</urls>
<buildconfig>
<producttheme>openSUSE</producttheme>
@@ -764,15 +737,9 @@ fi
%files
%defattr(644,root,root,755)
-%dir %_defaultlicensedir/product
-%_defaultlicensedir/product/base
%license license/*
%{_sysconfdir}/os-release
%{_prefix}/lib/os-release
-# Bug 404141 - /etc/YaST/control.xml should be owned by some package
-%dir %{_sysconfdir}/YaST2/
-%config %{_sysconfdir}/YaST2/control.xml
-%config %{_sysconfdir}/zypp/vendors.d/00-openSUSE.conf
%{_prefix}/lib/motd.d/welcome
%config(noreplace) %{_sysconfdir}/issue.net
%dir %{_sysconfdir}/products.d