fix: db 和 rule-set 包内容错误

2 files changed, 19 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d0448090aae5..22f4d33a16dc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = sing-geoip
-	pkgdesc = sing-geoip database
+	pkgdesc = sing-geoip
 	pkgver = 20231212
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/SagerNet/sing-geoip
 	arch = any
 	license = GPL3
@@ -9,11 +9,14 @@ pkgbase = sing-geoip
 	source = sing-geoip-20231212.tar.gz::https://github.com/SagerNet/sing-geoip/archive/refs/tags/20231212.tar.gz
 	sha256sums = e1055c8190a7f79a00ce3870b4f482161483ff68ffb10ed6f7915849ec513bd9
 
-pkgname = sing-geoip-db
-	depends = sing-geoip-common
-	replaces = sing-geoip
+pkgname = sing-geoip-common
+	pkgdesc = sing-geosite (common files)
 
 pkgname = sing-geoip-rule-set
+	pkgdesc = sing-geoip (rule sets)
 	depends = sing-geoip-common
+	replaces = sing-geoip
 
-pkgname = sing-geoip-common
+pkgname = sing-geoip-db
+	pkgdesc = sing-geoip (database)
+	depends = sing-geoip-common
diff --git a/PKGBUILD b/PKGBUILD
index cf46e34231eb..2d841072927c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: everyx <lunt.luo#gmail.com>
 
 pkgbase=sing-geoip
-pkgname=(sing-geoip-db sing-geoip-rule-set sing-geoip-common)
+pkgname=(sing-geoip-common sing-geoip-rule-set sing-geoip-db)
 pkgver=20231212
-pkgrel=3
+pkgrel=4
 
-pkgdesc='sing-geoip database'
+pkgdesc='sing-geoip'
 arch=('any')
 url="https://github.com/SagerNet/sing-geoip"
 license=('GPL3')
@@ -19,14 +19,17 @@ sha256sums=('e1055c8190a7f79a00ce3870b4f482161483ff68ffb10ed6f7915849ec513bd9')
 
 build() {
     cd "${_srcbase}" || exit
-    go run -v .
+    NO_SKIP=true go run -v .
 }
 
 package_sing-geoip-common() {
+    pkgdesc='sing-geosite (common files)'
+
     install -Dm644 "${_srcbase}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
 }
 
-package_sing-geoip-db() {
+package_sing-geoip-rule-set() {
+    pkgdesc='sing-geoip (rule sets)'
     depends=(sing-geoip-common)
     replaces=(sing-geoip)
 
@@ -34,7 +37,8 @@ package_sing-geoip-db() {
     install -Dm644 "${_srcbase}/rule-set/"* "${pkgdir}/usr/share/${pkgbase}/rule-set"
 }
 
-package_sing-geoip-rule-set() {
+package_sing-geoip-db() {
+    pkgdesc='sing-geoip (database)'
     depends=(sing-geoip-common)
 
     install -dm755 "${pkgdir}/usr/share/${pkgbase}"