diff --git a/_service b/_service
deleted file mode 100644
index f4a643c..0000000
--- a/_service
+++ /dev/null
@@ -1,19 +0,0 @@
-<services>
-  <service  mode="disabled" name="obs_scm">
-    <param name="url">https://github.com/dolfinus/setuptools-git-versioning.git</param>
-    <param name="scm">git</param>
-    <param name="revision">@PARENT_TAG@</param>
-    <param name="package-meta">yes</param>
-    <param name="versionformat">@PARENT_TAG@</param>
-    <param name="versionrewrite-pattern">v(.*)</param>
-    <param name="versionrewrite-replacement">\1</param>
-  </service>
-  <service mode="disabled" name="tar">
-    <param name="package-meta">yes</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>
diff --git a/python-setuptools-git-versioning.changes b/python-setuptools-git-versioning.changes
index 0b769b3..7a27379 100644
--- a/python-setuptools-git-versioning.changes
+++ b/python-setuptools-git-versioning.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Jan 28 08:08:11 UTC 2025 - Steve Kowalik <steven.kowalik@suse.com>
+
+- Update to 2.1.0:
+  * [breaking] Drop get_branch_tags function which was deprecated
+    since 1.8.0.
+  * [breaking] version_file option now have precedence over any tags in
+    the current branch.
+  * [breaking] Drop version_config keyword from setup.py, which was
+    deprecated since 1.8.0.
+  * [breaking] Does not allow passing setuptools_git_versioning=False
+    and setuptools_git_versioning=True to config. Always use
+    setuptools_git_versioning={"enabled": True}.
+  * [feature] Test Python 3.13 compatibility
+  * [feature] Test Python 3.12 compatibility
+  * [feature] Remove useless warning if tag_filter, tag_formatter or
+    branch_formatter is a regexp instead of function reference.
+  * [bugfix] Replace outdated toml package with modern tomli.
+- Rip out _service and all of its gubbins, we can successfully test with
+  the GitHub tarball, so switch to that.
+
 -------------------------------------------------------------------
 Mon Dec 25 11:20:47 UTC 2023 - Ben Greiner <code@bnavigator.de>
 
diff --git a/python-setuptools-git-versioning.spec b/python-setuptools-git-versioning.spec
index 2335677..07a2261 100644
--- a/python-setuptools-git-versioning.spec
+++ b/python-setuptools-git-versioning.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-setuptools-git-versioning
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,14 +18,13 @@
 
 %{?sle15_python_module_pythons}
 Name:           python-setuptools-git-versioning
-Version:        1.13.5
+Version:        2.1.0
 Release:        0
 Summary:        Use git repo data for building a version number according PEP-440
 License:        MIT
 URL:            https://setuptools-git-versioning.readthedocs.io
 # SourceDist:    https://github.com/dolfinus/setuptools-git-versioning
-# the sdist on PyPI does not have the tests, we needs full git metadata for bootstrap, run osc service runall to update
-Source:         setuptools-git-versioning-%{version}.tar.xz
+Source:         https://github.com/dolfinus/setuptools-git-versioning/archive/refs/tags/v2.1.0.tar.gz#/setuptools-git-versioning-%{version}.tar.gz
 BuildRequires:  %{python_module pip}
 BuildRequires:  %{python_module setuptools}
 BuildRequires:  %{python_module wheel}
@@ -35,12 +34,9 @@ Requires:       git-core
 Requires:       python-packaging
 Requires:       python-setuptools
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Provides:       python-setuptools_git_versioning = %{version}-%{release}
 BuildArch:      noarch
-%if 0%{python_version_nodots} < 311
-Requires:       python-toml >= 0.10.2
-%endif
 # SECTION test
 BuildRequires:  %{python_module build}
 BuildRequires:  %{python_module coverage}
@@ -65,10 +61,9 @@ version number according PEP440.
   - Templates support a lot of substitutions including git and environment information
 
 %prep
-%setup -q -n setuptools-git-versioning-%{version}
-# avoid dirty version
-echo '_build*' >> .git/info/exclude
-echo _current_flavor >> .git/info/exclude
+%autosetup -p1 -n setuptools-git-versioning-%{version}
+# Set version
+echo "Version: %{version}" > PKG-INFO
 
 %build
 %pyproject_wheel
@@ -94,7 +89,7 @@ donttest="test_substitution_env"
 %files %{python_files}
 %python_alternative %{_bindir}/setuptools-git-versioning
 %{python_sitelib}/setuptools_git_versioning.py*
-%{python_sitelib}/setuptools_git_versioning-%{version}*-info
+%{python_sitelib}/setuptools_git_versioning-%{version}.dist-info
 %pycache_only %{python_sitelib}/__pycache__/setuptools_git_versioning*.pyc
 
 %changelog
diff --git a/setuptools-git-versioning-1.13.5.tar.xz b/setuptools-git-versioning-1.13.5.tar.xz
deleted file mode 100644
index 346e91a..0000000
--- a/setuptools-git-versioning-1.13.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:27a97d5366a4fd9fa58088b3054ac1ce6f5b6aebe8061f7b4f81f1a17bffc03e
-size 313648
diff --git a/setuptools-git-versioning-2.1.0.tar.gz b/setuptools-git-versioning-2.1.0.tar.gz
new file mode 100644
index 0000000..c939ead
--- /dev/null
+++ b/setuptools-git-versioning-2.1.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:36a5c9bd91d75f12faba2c6fd87b1b1807cb9eabeca2ce0951f14ad4f47642e0
+size 44315
diff --git a/setuptools-git-versioning.obsinfo b/setuptools-git-versioning.obsinfo
deleted file mode 100644
index 1e5160f..0000000
--- a/setuptools-git-versioning.obsinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-name: setuptools-git-versioning
-version: 1.13.5
-mtime: 1691491394
-commit: 3cd11bcd38f15e2e9b25bee7485e81840f3e16dd