better info filehandling

3 files changed, 41 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 195527a9c1e1..d80183af1000 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = guile-git
 	pkgdesc = A portable, embeddable Scheme implementation (Git snapshot)
 	pkgver = 3.0.4.r38.g64c89458e
-	pkgrel = 1
+	pkgrel = 2
 	epoch = 1
 	url = http://www.gnu.org/software/guile/
 	arch = i686
@@ -22,7 +22,9 @@ pkgbase = guile-git
 	options = !makeflags
 	options = libtool
 	source = git+https://git.savannah.gnu.org/git/guile.git
+	source = rename_infofile.diff
 	sha256sums = SKIP
+	sha256sums = 555e6d5491ddbe66a30fdec4a8e1897d4bbbb4131083b831e41af33c172010b9
 
 pkgname = guile-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 240247480ad6..fbbbbb84e6df 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgname=guile-git
 epoch=1
 _majorver=3.0
 pkgver=3.0.4.r38.g64c89458e
-pkgrel=1
+pkgrel=2
 pkgdesc="A portable, embeddable Scheme implementation (Git snapshot)"
 arch=('i686' 'x86_64' 'aarch64')
 license=('GPL')
@@ -14,15 +14,23 @@ depends=('gc' 'libtool' 'libffi' 'libunistring' 'gmp' 'readline')
 provides=('guile')
 conflicts=('guile4emacs')
 options=('!strip' '!makeflags' 'libtool')
-source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git")
+source=("git+https://git.savannah.gnu.org/git/${pkgname%-git}.git" rename_infofile.diff)
 url="http://www.gnu.org/software/guile/"
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '555e6d5491ddbe66a30fdec4a8e1897d4bbbb4131083b831e41af33c172010b9')
 
 pkgver() {
   cd ${pkgname%-git}
   git describe --tags | sed 's+-+.r+' | sed 's+^v++' | tr - .
 }
 
+prepare() {
+  cd ${pkgname%-git}
+  git apply "$srcdir"/rename_infofile.diff
+  cd doc/ref
+  mv guile.texi guile-3.0.texi 
+}
+
 build() {
   cd ${pkgname%-git}
   ./autogen.sh
@@ -33,16 +41,7 @@ build() {
 package() {
   cd ${pkgname%-git}
   make DESTDIR="$pkgdir/" install
-  cd "$pkgdir"/usr/share/info
-  for i in guile*
-  do
-    mv $i guile-${_majorver}${i#guile}
-  done
-  sed -i "s/guile.info/guile-${_majorver}.info/g" guile-${_majorver}*
-  sed -i "s/guile.texi/guile-${_majorver}.texi/g" guile-${_majorver}*
-  sed -i "s/* Guile Reference: (guile)/* Guile-${_majorver} Reference: (guile-${_majorver})/g" guile-${_majorver}*
-  sed -i "s/The Guile reference manual./The Guile-${_majorver} reference manual./g" guile-${_majorver}*
-  mv r5rs.info r5rs-${_majorver}.info
+
   mv "$pkgdir"/usr/share/aclocal/guile.m4 "$pkgdir"/usr/share/aclocal/guile-${_majorver}.m4
   rm "$pkgdir"/usr/lib/libguile-3.0.so.*-gdb.scm
 }
diff --git a/rename_infofile.diff b/rename_infofile.diff
new file mode 100644
index 000000000000..f279f458170f
--- /dev/null
+++ b/rename_infofile.diff
@@ -0,0 +1,26 @@
+diff --git a/doc/ref/Makefile.am b/doc/ref/Makefile.am
+index 2f4b8ca88..c6fe2ec93 100644
+--- a/doc/ref/Makefile.am
++++ b/doc/ref/Makefile.am
+@@ -22,7 +22,7 @@
+ 
+ AUTOMAKE_OPTIONS = gnu
+ 
+-info_TEXINFOS = guile.texi
++info_TEXINFOS = guile-3.0.texi
+ 
+ guile_TEXINFOS = preface.texi			\
+                  intro.texi			\
+diff --git a/doc/ref/guile.texi b/doc/ref/guile.texi
+index 9f3fe2d72..2f40b9dba 100644
+--- a/doc/ref/guile.texi
++++ b/doc/ref/guile.texi
+@@ -1,7 +1,7 @@
+ \input texinfo
+ @c -*-texinfo-*-
+ @c %**start of header
+-@setfilename guile.info
++@setfilename guile-3.0.info
+ @documentencoding UTF-8
+ @settitle Guile Reference Manual
+ @set guile