[arch-commits] Commit in opensp/trunk (PKGBUILD)

[Andreas Radke]

    Date: Tuesday, June 21, 2016 @ 19:21:38
  Author: andyrtr
Revision: 270453

upgpkg: opensp 1.5.2-7

fix conlicts with jade and file conflicts - FS#49792+FS49775

Modified:
  opensp/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-06-21 19:16:34 UTC (rev 270452)
+++ PKGBUILD	2016-06-21 19:21:38 UTC (rev 270453)
@@ -5,7 +5,7 @@
 
 pkgname=opensp
 pkgver=1.5.2
-pkgrel=6
+pkgrel=7
 pkgdesc="A library and a set of tools for validating, parsing and manipulating SGML and XML documents"
 arch=('i686' 'x86_64')
 url="http://openjade.sourceforge.net/"
@@ -12,7 +12,6 @@
 license=('BSD')
 depends=('sgml-common' 'perl')
 makedepends=('xmlto' 'docbook-xsl')
-conflicts=('jade')
 source=("http://downloads.sourceforge.net/project/openjade/opensp/$pkgver/OpenSP-$pkgver.tar.gz")
 sha1sums=('b4e903e980f8a8b3887396a24e067bef126e97d5')
 
@@ -36,16 +35,17 @@
 package() {
   cd OpenSP-$pkgver
   make DESTDIR="${pkgdir}" install
-  
+
   # add symlinks for compatibility with jade, see FS#49775
-  ln -v -sf onsgmls   $pkgdir/usr/bin/nsgmls
-  ln -v -sf osgmlnorm $pkgdir/usr/bin/sgmlnorm
-  ln -v -sf ospam     $pkgdir/usr/bin/spam
-  ln -v -sf ospcat    $pkgdir/usr/bin/spcat
-  ln -v -sf ospent    $pkgdir/usr/bin/spent
-  ln -v -sf osx       $pkgdir/usr/bin/sx
-  ln -v -sf osx       $pkgdir/usr/bin/sgml2xml
+  for file in nsgmls sgmlnorm spam spcat spent sx ; do
+    ln -s o$file $pkgdir/usr/bin/$file
+    echo ".so man1/o${file}.1" > $pkgdir/usr/share/man/man1/${file}.1
+  done
   ln -v -sf libosp.so $pkgdir/usr/lib/libsp.so
+
+  # Rename sx to sgml2xml; FS#49792
+  mv $pkgdir/usr/bin/sx $pkgdir/usr/bin/sgml2xml
+  mv $pkgdir/usr/share/man/man1/{sx,sgml2xml}.1
   
   install -D -m644 COPYING "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
 }