From b2832d709d4486928a08ff944da607a88fcd978a Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Wed, 16 Mar 2005 13:43:58 +0000
Subject: [PATCH] Clifford Wolf: 	Fixed packages with rebuild problems:
 xsane, john, hesiod

[2005030320500620291] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@5726 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/public/xsane/xsane.conf            | 3 +--
 package/tsa/hesiod/hesiod_3.0.2-15.1.patch | 2 +-
 package/tsa/john/john.conf                 | 6 +++---
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/public/xsane/xsane.conf b/package/public/xsane/xsane.conf
index 122b379bc..03bec2b9e 100644
--- a/package/public/xsane/xsane.conf
+++ b/package/public/xsane/xsane.conf
@@ -20,6 +20,5 @@
 # 
 # --- ROCK-COPYRIGHT-NOTE-END ---
 
-
 pkginstalled gimp && \
-	hook_add postmake 1 "ln -s $root/$prefix/bin/xsane $root/$ROCKCFG_PKG_GNOME28_CORE_PREFIX/lib/gimp/2.0/plug-ins/"
+	hook_add postmake 1 "ln -sf $root/$prefix/bin/xsane $root/$ROCKCFG_PKG_GNOME28_CORE_PREFIX/lib/gimp/2.0/plug-ins/"
diff --git a/package/tsa/hesiod/hesiod_3.0.2-15.1.patch b/package/tsa/hesiod/hesiod_3.0.2-15.1.patch
index 268c0c6d7..717cd796b 100644
--- a/package/tsa/hesiod/hesiod_3.0.2-15.1.patch
+++ b/package/tsa/hesiod/hesiod_3.0.2-15.1.patch
@@ -5847,7 +5847,7 @@
  	${RANLIB} ${DESTDIR}${libdir}/libhesiod.a
  	chmod u-w ${DESTDIR}${libdir}/libhesiod.a
 +	${INSTALL} -c -m 644 libhesiod.so ${DESTDIR}${libdir}/libhesiod.so.0
-+	ln -s libhesiod.so.0 ${DESTDIR}${libdir}/libhesiod.so
++	ln -sf libhesiod.so.0 ${DESTDIR}${libdir}/libhesiod.so
  	${INSTALL_PROGRAM} -c -m 555 hesinfo ${DESTDIR}${lbindir}
  	${INSTALL} -c -m 444 ${srcdir}/hesiod.h ${DESTDIR}${includedir}
  	${INSTALL} -c -m 444 ${srcdir}/hesinfo.1 ${DESTDIR}${mandir}/man1
diff --git a/package/tsa/john/john.conf b/package/tsa/john/john.conf
index 9bf46514b..4ea8a80d5 100644
--- a/package/tsa/john/john.conf
+++ b/package/tsa/john/john.conf
@@ -26,9 +26,9 @@ install_john() {
   install -m0644 run/john.ini $root/etc/
   install -d -m0755 $root/usr/share/john/
   install -m0644 run/*chr run/password.lst $root/usr/share/john/
-  ln -s $root/usr/bin/john $root/usr/bin/unafs
-  ln -s $root/usr/bin/john $root/usr/bin/unique
-  ln -s $root/usr/bin/john $root/usr/bin/unshadow
+  ln -sf $root/usr/bin/john $root/usr/bin/unafs
+  ln -sf $root/usr/bin/john $root/usr/bin/unique
+  ln -sf $root/usr/bin/john $root/usr/bin/unshadow
 }
 
 makeopt="-C src generic"