Have the theme no longer conflict with upstream Adwaita

Thanks https://aur.archlinux.org/account/Robotic-Brain

1 files changed, 4 insertions, 2 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 808b7ec68ec6..fa4cd66e7c3e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=adwaita-icon-theme-41
 basename=adwaita-icon-theme
 pkgver=41.0
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME standard icons, version 41"
 url="https://gitlab.gnome.org/GNOME/adwaita-icon-theme"
 arch=(any)
@@ -14,7 +14,6 @@ license=(LGPL3 CCPL:by-sa)
 depends=(hicolor-icon-theme gtk-update-icon-cache librsvg)
 makedepends=(git gtk3)
 provides=(adwaita-icon-theme)
-conflicts=(adwaita-icon-theme)
 _commit=8670d0eb2414c1ac16d927da5d1a22142ba5e346  # tags/41.0^0
 source=("git+https://gitlab.gnome.org/GNOME/adwaita-icon-theme.git#commit=$_commit")
 sha256sums=('SKIP')
@@ -43,4 +42,7 @@ check() {
 package() {
   cd $basename
   make DESTDIR="$pkgdir" install
+  mv -v "${pkgdir}/usr/share/pkgconfig/adwaita-icon-theme.pc" "${pkgdir}/usr/share/pkgconfig/adwaita-icon-theme-41.pc"
+  mv -v "${pkgdir}/usr/share/icons/Adwaita" "${pkgdir}/usr/share/icons/Adwaita41"
+  sed -i 's/^Name=Adwaita$/Name=Adwaita 41/' "${pkgdir}/usr/share/icons/Adwaita41/index.theme"
 }