Applying naming according to #comment-768039

2 files changed, 17 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aabe356b6d50..e63f4577ddcd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
 pkgbase = f2c
 	pkgdesc = Fortran to C code translator
 	pkgver = 20200916
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.netlib.org/f2c
 	arch = x86_64
 	license = custom
 	makedepends = unzip
 	depends = glibc
 	noextract = libf2c.zip
-	source = https://www.netlib.org/f2c/src.tgz
-	source = https://www.netlib.org/f2c/libf2c.zip
+	source = f2c-20200916.tar.gz::https://www.netlib.org/f2c/src.tgz
+	source = libf2c-20200916.zip::https://www.netlib.org/f2c/libf2c.zip
 	sha256sums = d4847456aa91c74e5e61e2097780ca6ac3b20869fae8864bfa8dcc66f6721d35
 	sha256sums = ca404070e9ce0a9aaa6a71fc7d5489d014ade952c5d6de7efb88de8e24f2e8e0
 
diff --git a/PKGBUILD b/PKGBUILD
index 170c866cc92c..a297f3314e71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,45 +6,45 @@
 
 pkgname=f2c
 pkgver=20200916
-pkgrel=1
+pkgrel=2
 pkgdesc='Fortran to C code translator'
 url='https://www.netlib.org/f2c'
 license=('custom')
 arch=('x86_64')
 depends=('glibc')
 makedepends=('unzip')
-source=("$url/src.tgz"
-        "$url/libf2c.zip")
+source=("$pkgname-$pkgver.tar.gz::$url/src.tgz"
+        "lib$pkgname-$pkgver.zip::$url/libf2c.zip")
 noextract=("libf2c.zip")
 sha256sums=('d4847456aa91c74e5e61e2097780ca6ac3b20869fae8864bfa8dcc66f6721d35'
             'ca404070e9ce0a9aaa6a71fc7d5489d014ade952c5d6de7efb88de8e24f2e8e0')
 
 prepare() {
   cd "$srcdir"
-  mv src f2c
-  mkdir libf2c
-  unzip -q libf2c.zip -d libf2c
-  sed -i "s@-O@-O -ansi -fPIC@g" libf2c/makefile.u
-  sed -i "/MAIN__/d" libf2c/main.c
+  mv src $pkgname-$pkgver
+  mkdir lib$pkgname
+  unzip -q lib$pkgname-$pkgver.zip -d lib$pkgname-$pkgver
+  sed -i "s@-O@-O -ansi -fPIC@g" lib$pkgname-$pkgver/makefile.u
+  sed -i "/MAIN__/d" lib$pkgname-$pkgver/main.c
 }
 
 build() {
-  cd "$srcdir/libf2c"
+  cd "$srcdir/lib$pkgname-$pkgver"
   make hadd -f makefile.u
   make -f makefile.u
   make -f makefile.u libf2c.so
   
-  cd "$srcdir/f2c"
+  cd "$srcdir/$pkgname-$pkgver"
   make -f makefile.u
 }
 
 package() {
   cd "$pkgdir"
   install -dm755 usr/{bin,include,lib,share/{licenses/$pkgname,man/man1}}
-  install -m755 "$srcdir/f2c/f2c" usr/bin
-  install -m755 "$srcdir/libf2c/libf2c.so" usr/lib
-  install -m755 "$srcdir/libf2c/f2c.h" usr/include
-  install -m755 "$srcdir/f2c/f2c.1t" usr/share/man/man1/f2c.1
+  install -m755 "$srcdir/$pkgname-$pkgver/f2c" usr/bin
+  install -m755 "$srcdir/lib$pkgname-$pkgver/libf2c.so" usr/lib
+  install -m755 "$srcdir/lib$pkgname-$pkgver/f2c.h" usr/include
+  install -m755 "$srcdir/$pkgname-$pkgver/f2c.1t" usr/share/man/man1/f2c.1
   cat <<EOF > usr/share/licenses/$pkgname/LICENSE
 Copyright 1990-1996, 2000-2001 by AT&T, Lucent Technologies and Bellcore.