Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-repos for openSUSE:Factory
checked in at 2023-08-04 15:04:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-repos (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-repos.new.22712 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-repos"
Fri Aug 4 15:04:31 2023 rev:9 rq:1102322 version:20230804.41e41a9
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-repos/openSUSE-repos.changes
2023-08-01 14:15:44.983565129 +0200
+++ /work/SRC/openSUSE:Factory/.openSUSE-repos.new.22712/openSUSE-repos.changes
2023-08-04 15:04:46.392785382 +0200
@@ -1,0 +2,10 @@
+Fri Aug 04 09:12:36 UTC 2023 - opensuse-releaset...@opensuse.org
+
+- Update to version 20230804.41e41a9:
+ * Add NVIDIA repo. Issue #28
+ * Add supplements for all NVIDIA cards
+ * Add NVIDIA obsoletes for migration from Leap 15
+ * Add spec comment about suggests in release package
+ * Add download.opensuse.org-non-oss.repo in legacy backup list
+
+-------------------------------------------------------------------
Old:
----
openSUSE-repos-20230731.a018a46.obscpio
New:
----
openSUSE-repos-20230804.41e41a9.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-repos.spec ++++++
--- /var/tmp/diff_new_pack.WMREOY/_old 2023-08-04 15:04:47.144790069 +0200
+++ /var/tmp/diff_new_pack.WMREOY/_new 2023-08-04 15:04:47.148790093 +0200
@@ -23,6 +23,7 @@
ExclusiveArch: do_not_build
%endif
+# Each openSUSE release package has a suggests for openSUSE-repos-$flavor.
%global flavor @BUILD_FLAVOR@%nil
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
@@ -66,7 +67,7 @@
%else
Name: openSUSE-repos-%{theme}
%endif
-Version: 20230731.a018a46
+Version: 20230804.41e41a9
Release: 0
Summary: openSUSE package repositories
License: MIT
@@ -76,6 +77,9 @@
#boo#1203715
BuildRequires: -post-build-checks
Requires: zypper
+# Ensure we install matching packages on given distribution
+# openSUSE-release has suggest on particular theme based on distribution
+Suggests: openSUSE-repos-%{theme}-NVIDIA
Conflicts: otherproviders(openSUSE-repos)
Provides: openSUSE-repos
%if "%{?theme}" == "Tumbleweed"
@@ -94,6 +98,27 @@
%description
Definitions for openSUSE repository management via zypp-services
+%package NVIDIA
+Summary: openSUSE NVIDIA repository definitions
+Requires: openSUSE-repos
+Supplements: modalias(pci:v000010DEd*sv*sd*bc03sc*i*)
+Provides: openSUSE-repos-NVIDIA
+%if "%{?theme}" == "Tumbleweed"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+%if "%{?theme}" == "MicroOS"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+%if "%{?theme}" == "Leap16"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+
+%description NVIDIA
+Definitions for NVIDIA repository management via zypp-services
+
%files
%dir %{_datadir}/zypp/local/
@@ -140,6 +165,16 @@
%endif
%endif
+%if "0%{?with_nvidia}"
+%files NVIDIA
+%dir %{_datadir}/zypp/local/service/NVIDIA
+%dir %{_datadir}/zypp/local/service/NVIDIA/repo
+%ghost %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+%{_datadir}/zypp/local/service/NVIDIA/repo/nvidia-%{branding}-repoindex.xml
+%ghost %{_sysconfdir}/zypp/services.d/openSUSE.service
+%{_datadir}/zypp/local/service/NVIDIA/repo/nvidia-%{branding}-repoindex.xml
+%endif
+
%prep
%setup -q -n openSUSE-repos-%{version}
@@ -149,6 +184,7 @@
%install
mkdir -p %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
+mkdir -p %{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo
mkdir -p %{buildroot}%{_sysconfdir}/zypp/vars.d/
# Setup for primary arches
@@ -180,6 +216,10 @@
%endif
%endif
+%if "0%{?with_nvidia}"
+install nvidia-%{branding}-repoindex.xml -pm 0644
%{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo
+%endif
+
%ifarch %{ix86}
echo "x86" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
%endif
@@ -241,15 +281,15 @@
%endif
%endif
-# Disable all non-zypp-service managed repos with default fileanmes
+# Disable all non-zypp-service managed repos with default filenames
for repo_file in \
repo-backports-debug-update.repo repo-oss.repo repo-backports-update.repo \
repo-sle-debug-update.repo repo-debug-non-oss.repo repo-sle-update.repo \
repo-debug.repo repo-source.repo repo-debug-update.repo repo-update.repo \
repo-debug-update-non-oss.repo repo-update-non-oss.repo repo-non-oss.repo \
-openSUSE-*-0.repo download.opensuse.org-oss.repo
download.opensuse.org-tumbleweed.repo \
-repo-openh264.repo; do
+download.opensuse.org-oss.repo download.opensuse.org-non-oss.repo
download.opensuse.org-tumbleweed.repo \
+repo-openh264.repo openSUSE-*-0.repo; do
if [ -f %{_sysconfdir}/zypp/repos.d/$repo_file ]; then
echo "Content of $repo_file will be newly managed by zypp-services."
echo "Storing old copy as {_sysconfdir}/zypp/repos.d/$repo_file.rpmsave"
@@ -260,6 +300,24 @@
# We hereby declare that running this will not influence existing transaction
ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE
openSUSE
+%if "0%{?with_nvidia}"
+%post NVIDIA
+ln -sf nvidia-%{branding}-repoindex.xml
%{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+
+# Disable user-defined with default filename from wiki
+# https://en.opensuse.org/SDB:NVIDIA_drivers#Zypper
+for repo_file in NVIDIA.repo ; do
+ if [ -f %{_sysconfdir}/zypp/repos.d/$repo_file ]; then
+ echo "Content of $repo_file will be newly managed by zypp-services."
+ echo "Storing old copy as {_sysconfdir}/zypp/repos.d/$repo_file.rpmsave"
+ mv %{_sysconfdir}/zypp/repos.d/$repo_file
%{_sysconfdir}/zypp/repos.d/$repo_file.rpmsave
+ fi
+done
+
+# We hereby declare that running this will not influence existing transaction
+ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/NVIDIA
NVIDIA
+%endif
+
%postun
if [ "$1" = 0 ] ; then
# We hereby declare that running this will not influence existing transaction
@@ -269,4 +327,13 @@
fi
fi
+%postun NVIDIA
+if [ "$1" = 0 ] ; then
+ # We hereby declare that running this will not influence existing transaction
+ ZYPP_READONLY_HACK=1 zypper removeservice NVIDIA
+ if [ -L "%{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml" ] ; then
+ rm -f %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+ fi
+fi
+
%changelog
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.WMREOY/_old 2023-08-04 15:04:47.220790543 +0200
+++ /var/tmp/diff_new_pack.WMREOY/_new 2023-08-04 15:04:47.224790568 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/openSUSE-repos.git</param>
- <param
name="changesrevision">a018a46b504e6a50e7ab1ece9af0515ae3d55303</param></service></servicedata>
+ <param
name="changesrevision">41e41a99bdc5b3b5b5f4dc3588508f6e1fda6526</param></service></servicedata>
(No newline at EOF)
++++++ openSUSE-repos-20230731.a018a46.obscpio ->
openSUSE-repos-20230804.41e41a9.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-repos-20230731.a018a46/dist/package/openSUSE-repos.spec
new/openSUSE-repos-20230804.41e41a9/dist/package/openSUSE-repos.spec
--- old/openSUSE-repos-20230731.a018a46/dist/package/openSUSE-repos.spec
2023-07-31 12:12:29.000000000 +0200
+++ new/openSUSE-repos-20230804.41e41a9/dist/package/openSUSE-repos.spec
2023-08-04 11:10:50.000000000 +0200
@@ -1,7 +1,7 @@
#
-# spec file
+# spec file for package openSUSE-repos
#
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
# Copyright (c) 2022 Neal Gompa <ngomp...@gmail.com>
#
# All modifications and additions to the file contributed by third parties
@@ -23,6 +23,7 @@
ExclusiveArch: do_not_build
%endif
+# Each openSUSE release package has a suggests for openSUSE-repos-$flavor.
%global flavor @BUILD_FLAVOR@%nil
%if 0%{?is_opensuse} && 0%{?suse_version} >= 1550
@@ -76,6 +77,9 @@
#boo#1203715
BuildRequires: -post-build-checks
Requires: zypper
+# Ensure we install matching packages on given distribution
+# openSUSE-release has suggest on particular theme based on distribution
+Suggests: openSUSE-repos-%{theme}-NVIDIA
Conflicts: otherproviders(openSUSE-repos)
Provides: openSUSE-repos
%if "%{?theme}" == "Tumbleweed"
@@ -94,6 +98,27 @@
%description
Definitions for openSUSE repository management via zypp-services
+%package NVIDIA
+Summary: openSUSE NVIDIA repository definitions
+Requires: openSUSE-repos
+Supplements: modalias(pci:v000010DEd*sv*sd*bc03sc*i*)
+Provides: openSUSE-repos-NVIDIA
+%if "%{?theme}" == "Tumbleweed"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+%if "%{?theme}" == "MicroOS"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+%if "%{?theme}" == "Leap16"
+Obsoletes: openSUSE-repos-Leap-NVIDIA
+Obsoletes: openSUSE-repos-LeapMicro-NVIDIA
+%endif
+
+%description NVIDIA
+Definitions for NVIDIA repository management via zypp-services
+
%files
%dir %{_datadir}/zypp/local/
@@ -140,6 +165,16 @@
%endif
%endif
+%if "0%{?with_nvidia}"
+%files NVIDIA
+%dir %{_datadir}/zypp/local/service/NVIDIA
+%dir %{_datadir}/zypp/local/service/NVIDIA/repo
+%ghost %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+%{_datadir}/zypp/local/service/NVIDIA/repo/nvidia-%{branding}-repoindex.xml
+%ghost %{_sysconfdir}/zypp/services.d/openSUSE.service
+%{_datadir}/zypp/local/service/NVIDIA/repo/nvidia-%{branding}-repoindex.xml
+%endif
+
%prep
%setup -q -n openSUSE-repos-%{version}
@@ -149,6 +184,7 @@
%install
mkdir -p %{buildroot}%{_datadir}/zypp/local/service/openSUSE/repo
+mkdir -p %{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo
mkdir -p %{buildroot}%{_sysconfdir}/zypp/vars.d/
# Setup for primary arches
@@ -180,6 +216,10 @@
%endif
%endif
+%if "0%{?with_nvidia}"
+install nvidia-%{branding}-repoindex.xml -pm 0644
%{buildroot}%{_datadir}/zypp/local/service/NVIDIA/repo
+%endif
+
%ifarch %{ix86}
echo "x86" > %{buildroot}%{_sysconfdir}/zypp/vars.d/DIST_ARCH
%endif
@@ -241,15 +281,15 @@
%endif
%endif
-# Disable all non-zypp-service managed repos with default fileanmes
+# Disable all non-zypp-service managed repos with default filenames
for repo_file in \
repo-backports-debug-update.repo repo-oss.repo repo-backports-update.repo \
repo-sle-debug-update.repo repo-debug-non-oss.repo repo-sle-update.repo \
repo-debug.repo repo-source.repo repo-debug-update.repo repo-update.repo \
repo-debug-update-non-oss.repo repo-update-non-oss.repo repo-non-oss.repo \
-openSUSE-*-0.repo download.opensuse.org-oss.repo
download.opensuse.org-tumbleweed.repo \
-repo-openh264.repo; do
+download.opensuse.org-oss.repo download.opensuse.org-non-oss.repo
download.opensuse.org-tumbleweed.repo \
+repo-openh264.repo openSUSE-*-0.repo; do
if [ -f %{_sysconfdir}/zypp/repos.d/$repo_file ]; then
echo "Content of $repo_file will be newly managed by zypp-services."
echo "Storing old copy as {_sysconfdir}/zypp/repos.d/$repo_file.rpmsave"
@@ -260,6 +300,24 @@
# We hereby declare that running this will not influence existing transaction
ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/openSUSE
openSUSE
+%if "0%{?with_nvidia}"
+%post NVIDIA
+ln -sf nvidia-%{branding}-repoindex.xml
%{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+
+# Disable user-defined with default filename from wiki
+# https://en.opensuse.org/SDB:NVIDIA_drivers#Zypper
+for repo_file in NVIDIA.repo ; do
+ if [ -f %{_sysconfdir}/zypp/repos.d/$repo_file ]; then
+ echo "Content of $repo_file will be newly managed by zypp-services."
+ echo "Storing old copy as {_sysconfdir}/zypp/repos.d/$repo_file.rpmsave"
+ mv %{_sysconfdir}/zypp/repos.d/$repo_file
%{_sysconfdir}/zypp/repos.d/$repo_file.rpmsave
+ fi
+done
+
+# We hereby declare that running this will not influence existing transaction
+ZYPP_READONLY_HACK=1 zypper addservice %{_datadir}/zypp/local/service/NVIDIA
NVIDIA
+%endif
+
%postun
if [ "$1" = 0 ] ; then
# We hereby declare that running this will not influence existing transaction
@@ -269,4 +327,13 @@
fi
fi
+%postun NVIDIA
+if [ "$1" = 0 ] ; then
+ # We hereby declare that running this will not influence existing transaction
+ ZYPP_READONLY_HACK=1 zypper removeservice NVIDIA
+ if [ -L "%{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml" ] ; then
+ rm -f %{_datadir}/zypp/local/service/NVIDIA/repo/repoindex.xml
+ fi
+fi
+
%changelog
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-repos-20230731.a018a46/nvidia-leap-repoindex.xml
new/openSUSE-repos-20230804.41e41a9/nvidia-leap-repoindex.xml
--- old/openSUSE-repos-20230731.a018a46/nvidia-leap-repoindex.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-repos-20230804.41e41a9/nvidia-leap-repoindex.xml
2023-08-04 11:10:50.000000000 +0200
@@ -0,0 +1,14 @@
+<repoindex ttl="0"
+ disturl="https://download.nvidia.com";
+ distsub="leap/"
+ distver="${releasever}"
+ debugenable="false"
+ sourceenable="false">
+
+<repo url="%{disturl}/opensuse/%{distsub}%{distver}"
+ alias="repo-non-free"
+ name="%{alias} (%{distver})"
+ enabled="true"
+ autorefresh="true"/>
+
+</repoindex>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-repos-20230731.a018a46/nvidia-microos-repoindex.xml
new/openSUSE-repos-20230804.41e41a9/nvidia-microos-repoindex.xml
--- old/openSUSE-repos-20230731.a018a46/nvidia-microos-repoindex.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-repos-20230804.41e41a9/nvidia-microos-repoindex.xml
2023-08-04 11:10:50.000000000 +0200
@@ -0,0 +1,13 @@
+<repoindex ttl="0"
+ disturl="https://download.nvidia.com";
+ distsub="tumbleweed/"
+ debugenable="false"
+ sourceenable="false">
+
+<repo url="%{disturl}/opensuse/%{distsub}"
+ alias="repo-non-free"
+ name="%{alias}"
+ enabled="true"
+ autorefresh="true"/>
+
+</repoindex>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/openSUSE-repos-20230731.a018a46/nvidia-tumbleweed-repoindex.xml
new/openSUSE-repos-20230804.41e41a9/nvidia-tumbleweed-repoindex.xml
--- old/openSUSE-repos-20230731.a018a46/nvidia-tumbleweed-repoindex.xml
1970-01-01 01:00:00.000000000 +0100
+++ new/openSUSE-repos-20230804.41e41a9/nvidia-tumbleweed-repoindex.xml
2023-08-04 11:10:50.000000000 +0200
@@ -0,0 +1,13 @@
+<repoindex ttl="0"
+ disturl="https://download.nvidia.com";
+ distsub="tumbleweed/"
+ debugenable="false"
+ sourceenable="false">
+
+<repo url="%{disturl}/opensuse/%{distsub}"
+ alias="repo-non-free"
+ name="%{alias}"
+ enabled="true"
+ autorefresh="true"/>
+
+</repoindex>
++++++ openSUSE-repos.obsinfo ++++++
--- /var/tmp/diff_new_pack.WMREOY/_old 2023-08-04 15:04:47.336791266 +0200
+++ /var/tmp/diff_new_pack.WMREOY/_new 2023-08-04 15:04:47.340791290 +0200
@@ -1,5 +1,5 @@
name: openSUSE-repos
-version: 20230731.a018a46
-mtime: 1690798349
-commit: a018a46b504e6a50e7ab1ece9af0515ae3d55303
+version: 20230804.41e41a9
+mtime: 1691140250
+commit: 41e41a99bdc5b3b5b5f4dc3588508f6e1fda6526
