[pacman] Move from core group to base group

Also update pacman.conf to use the core repo Related to #166
jhuntwork · Sep 5, 2021 · 4d84187 · 4d84187
1 parent 0605502
commit 4d84187
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 59 deletions.
diff --git a/packages/pacman/ChangeLog b/packages/pacman/ChangeLog
@@ -1,133 +1,112 @@
-2021-08-22  Jeremy Huntwork <jeremy@merelinux.org>
+5.2.2-8 (2021-09-05)
+
+	Move from core group to base group
+	Update pacman.conf to use the core repo
+
+5.2.2-7 (2021-08-22)
 
-	* 5.2.2-7 :
 	Use fedup for dedup.sh
 
-2021-08-18  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-6 (2021-08-18)
 
-	* 5.2.2-6 :
 	Set std prefix to /usr in std build functions
 
-2021-04-11  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-5 (2021-04-11)
 
-	* 5.2.2-5 :
 	Adjust makepkg.conf: Use -Os in CFLAGS instead of -O2
 	Adjust makepkg.conf: Use $(arch) instead of hard-coding it
 
-2021-04-09  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-4 (2021-04-09)
 
-	* 5.2.2-4 :
 	Add a dependency condition for libc.so
 
-2021-04-09  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-3 (2021-04-09)
 
-	* 5.2.2-3 :
 	Don't error on lib deps if the same package provides them
 
-2021-04-08  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-2 (2021-04-08)
 
-	* 5.2.2-2 :
 	Use openssl instead of libressl
 	Add to new core group
 	Update dependencies.sh linter to detect library names
 
-2021-02-23  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.2.2-1 (2021-02-23)
 
-	* 5.2.2-1 :
 	Upgrade to 5.2.2
 
-2019-08-03  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.2-3 (2019-08-03)
 
-	* 5.1.2-3 :
 	Use pkgs.merelinux.org as the main server
 
-2019-07-30  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.2-2 (2019-07-30)
 
-	* 5.1.2-2 :
 	Add std-build-functions.sh for PKGBUILD helper functions
 
-2019-04-11  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.2-1 (2019-04-11)
 
-	* 5.1.2-1 :
 	Upgrade to 5.1.2
 
-2019-04-10  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.1-4 (2019-04-10)
 
-	* 5.1.1-4 :
 	Use xz for default package compression
 
-2018-12-02  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.1-3 (2018-12-02)
 
-	* 5.1.1-3 :
 	Add a portable version prefixed to /mere
 
-2018-11-26  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.1-2 (2018-11-26)
 
-	* 5.1.1-2 :
 	Move pkgdelta to pacman-build
 
-2018-11-13  Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.1.1-1 (2018-11-13)
 
-	* 5.1.1-1 :
 	Upgrade to 5.1.1
 
-2017-03-31 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-9 (2017-03-31)
 
-	* 5.0.1-9 :
 	Add a fakefakeroot script
 
-2017-01-19 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-8 (2017-01-19)
 
-	* 5.0.1-8 :
 	Default to pixz for xz compression
 
-2017-01-10 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-7 (2017-01-10)
 
-	* 5.0.1-7 :
 	Update description
 
-2017-01-09 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-6 (2017-01-09)
 
-	* 5.0.1-6 :
 	Add a libalpm-dev package
 
-2016-11-06 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-5 (2016-11-06)
 
-	* 5.0.1-5 :
 	Cleanup some features in makepkg.conf
 
-2016-10-10 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-4 (2016-10-10)
 
-	* 5.0.1-4 :
 	Link against libressl
 
-2016-10-10 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-3 (2016-10-10)
 
-	* 5.0.1-3 :
 	Unset default CFLAGS and CXXFLAGS
 
-2016-10-03 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-2 (2016-10-03)
 
-	* 5.0.1-2 :
 	Backup configuration files on installation of new package
 	Add new binaries bin/pactree, bin/pacman-optimize
 
-2016-09-29 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+5.0.1-1 (2016-09-29)
 
-	* 5.0.1-1 :
 	Upgrade to 5.0.1-1
 
-2016-03-03 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+4.1.2-3 (2016-03-03)
 
-	* 4.1.2-3 :
 	Use repo.merelinux.org as the stable package repository
 
-2016-02-16 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+4.1.2-2 (2016-02-16)
 
-	* 4.1.2-2 :
 	Build with support for package signing
 
-2014-05-19 Jeremy Huntwork <jhuntwork@lightcubesolutions.com>
+4.1.2-1 (2014-05-19)
 
-	* 4.1.2-1 :
 	Initial version
diff --git a/packages/pacman/PKGBUILD b/packages/pacman/PKGBUILD
@@ -1,10 +1,9 @@
 #!/bin/bash
 # shellcheck disable=SC2034,SC2154,SC2068
-# Maintainer: Jeremy Huntwork <jeremy@merelinux.org>
 
 pkgname=(pacman pacman-portable pacman-build libalpm-dev)
 pkgver=5.2.2
-pkgrel=7
+pkgrel=8
 pkgdesc='A lightweight Package Manager'
 arch=(x86_64)
 url='https://www.archlinux.org/pacman/'
@@ -38,7 +37,7 @@ source=(
 sha256sums=(
     bb201a9f2fb53c28d011f661d50028efce6eef2c1d2a36728bdd0130189349a0
     c58ece17155f655c320509979e0116e93ac9b515dd8b1c9cd7966bbf33accfe5
-    52e0ee2b729f48a7cebbd4d348758b74892932d2956a5e92ab155468eb612f5a
+    9b51c011fade056ff7d2a653e03c4ed23cb19d4600d6ae7232bfaff7ba98fac4
     f2c3b003d37c674eb003a69ce389585f14348894de3c5c3bae3f5dd1f96cc1a6
     689b6064bea140990b6655cba26bc8cb16d1590c090688d169e5c3929d12a1e3
     bf8bf662c85a8020023a0eb4f4d652398ef3ddc0ced3b9409ed0750bf88a8df9
@@ -87,7 +86,7 @@ package_pacman() {
         etc/pacman.conf*
         var
     )
-    groups=(core)
+    groups=(base)
 
     cd "${srcdir}/${pkgbase}-${pkgver}" || return 1
     make DESTDIR="${pkgdirbase}/dest" install

diff --git a/packages/pacman/pacman-dev.conf b/packages/pacman/pacman-dev.conf
@@ -2,6 +2,7 @@
 HoldPkg      = pacman busybox
 Architecture = auto
 CheckSpace
+Color
 
 [buildlocal]
 Server = file:///mere/pkgs

diff --git a/packages/pacman/pacman.conf b/packages/pacman/pacman.conf
@@ -1,7 +1,8 @@
 [options]
-HoldPkg      = pacman busybox busybox-static
+HoldPkg      = pacman busybox
 Architecture = auto
 CheckSpace
+Color
 
-[main]
-Server = http://pkgs.merelinux.org/stable
+[core]
+Server = http://pkgs.merelinux.org/core