upgpkg: icecast-git 2.5.0.beta.2.r438.gde3a075-1

2 files changed, 11 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c734c5b991ce..3ca7e1739628 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = icecast-git
 	pkgdesc = A streaming media (audio/video) server
-	pkgver = 2.5.0.beta.1.r179.gfa86f2d
+	pkgver = 2.5.0.beta.2.r438.gde3a075
 	pkgrel = 1
 	url = http://www.icecast.org/
 	arch = i686
@@ -20,11 +20,9 @@ pkgbase = icecast-git
 	conflicts = icecast
 	backup = etc/icecast.xml
 	backup = etc/logrotate.d/icecast
-	source = git+https://git.xiph.org/icecast-server.git
+	source = git+https://gitlab.xiph.org/xiph/icecast-server.git
 	source = icecast.logrotate::https://git.archlinux.org/svntogit/community.git/plain/trunk/icecast.logrotate?h=packages/icecast
 	source = icecast.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/icecast.service?h=packages/icecast
-	source = start-by-nobody.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/start-by-nobody.patch?h=packages/icecast
-	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4be5a950c2ce..0576dbf33fa0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Chocobo1 <chocobo1 AT archlinux DOT net>
 
 pkgname=icecast-git
-pkgver=2.5.0.beta.1.r179.gfa86f2d
+pkgver=2.5.0.beta.2.r438.gde3a075
 pkgrel=1
 pkgdesc="A streaming media (audio/video) server"
 arch=('i686' 'x86_64')
@@ -13,24 +13,20 @@ provides=('icecast')
 conflicts=('icecast')
 backup=('etc/icecast.xml'
         'etc/logrotate.d/icecast')
-source=("git+https://git.xiph.org/icecast-server.git"
+source=("git+https://gitlab.xiph.org/xiph/icecast-server.git"
         "icecast.logrotate::https://git.archlinux.org/svntogit/community.git/plain/trunk/icecast.logrotate?h=packages/icecast"
-        "icecast.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/icecast.service?h=packages/icecast"
-        "start-by-nobody.patch::https://git.archlinux.org/svntogit/community.git/plain/trunk/start-by-nobody.patch?h=packages/icecast")
+        "icecast.service::https://git.archlinux.org/svntogit/community.git/plain/trunk/icecast.service?h=packages/icecast")
 sha256sums=('SKIP'
             'SKIP'
-            'SKIP'
             'SKIP')
 
 
 prepare() {
   cd "icecast-server"
 
-  sed -i 's|url = \.\.|url = https://git.xiph.org|' ".gitmodules"
+  sed -i 's|url = \.\.|url = https://gitlab.xiph.org/xiph|' ".gitmodules"
   git submodule sync
   git submodule update --init --recursive
-
-  patch -Np1 -i "$srcdir/start-by-nobody.patch"
 }
 
 pkgver() {
@@ -43,7 +39,10 @@ build() {
   cd "icecast-server"
 
   ./autogen.sh
-  ./configure --prefix="/usr" --sysconfdir="/etc" --localstatedir="/var"
+  ./configure \
+    --prefix="/usr" \
+    --sysconfdir="/etc" \
+    --localstatedir="/var"
   make
 }
 
@@ -53,6 +52,6 @@ package() {
   make DESTDIR="$pkgdir" install
 
   install -Dm644 "$srcdir/icecast.logrotate" "$pkgdir/etc/logrotate.d/icecast"
-  install -Dm644 "$srcdir/icecast.service" "$pkgdir/usr/lib/systemd/system/icecast.service"
+  install -Dm644 "$srcdir/icecast.service" -t "$pkgdir/usr/lib/systemd/system"
   install -d -g99 -o99 "$pkgdir/var/log/icecast"
 }