Merge pull request #1139 from JPeterMugaas/drop_catgets

Drop the catgets library and facility from packages being offered. m…
msys2 · Feb 9, 2018 · dbde836 · dbde836
2 parents 581d16c + 662327d
commit dbde836
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 213 deletions.
diff --git a/catgets/PKGBUILD b/catgets/PKGBUILD
diff --git a/catgets/catgets-1.1-2.src.patch b/catgets/catgets-1.1-2.src.patch
diff --git a/catgets/catgets-1.1-msys2.patch b/catgets/catgets-1.1-msys2.patch
diff --git a/catgets/catgets-1.1.tar.bz2 b/catgets/catgets-1.1.tar.bz2
diff --git a/msys2-runtime/PKGBUILD b/msys2-runtime/PKGBUILD
@@ -4,7 +4,7 @@
 pkgbase=msys2-runtime
 pkgname=('msys2-runtime' 'msys2-runtime-devel')
 pkgver=2.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Cygwin POSIX emulation engine"
 arch=('i686' 'x86_64')
 url="https://www.cygwin.com/"
@@ -21,6 +21,7 @@ makedepends=('cocom'
              'gettext-devel'
              'libiconv-devel'
              'diffutils')
+replaces=('catgets')
 # options=('debug' '!strip')
 source=('msys2-runtime'::git://sourceware.org/git/newlib-cygwin.git#tag=cygwin-${pkgver//./_}-release
         0001-Add-MSYS-triplets.patch
@@ -166,8 +167,8 @@ package_msys2-runtime() {
   pkgdesc="Posix emulation engine for Windows"
   groups=('base')
   options=('!strip')
-  conflicts=('catgets')
-  replaces=('libcatgets')
+  conflicts=('catgets' 'libcatgets')
+  replaces=('catgets' 'libcatgets')
   #install=msys2-runtime.install
 
   mkdir -p "${pkgdir}"/usr