small fixes

share/eterbuild/functions/repl

@@ -72,11 +72,11 @@ tolocal_anyrepl()
 	for i in $@ ; do
 		REPLRULE=`grep -v "^#" "$i" 2>/dev/null | grep -- "^ *$GREP *|" | sed -e "$WARULES" | head -n1`
 		# For broken rule
-		echo $REPLRULE | grep "|" >/dev/null || REPLRULE=""
+		rhas "$REPLRULE" "|" || REPLRULE=""
 		#REPLRULE=`echo $REPLRULE | sed -r -e 's,|,!,g'`
 		ALTPKGNAME=`echo $REPLRULE | cut -d"|" -f1 | sed -e "s|\+|\\\\\+|g"`
 		TARGETPKGNAME=`echo $REPLRULE | cut -d"|" -f2 | sed -e "s|\+|\\\\\+|g"`
-		test -n "$REPLRULE" && TARGETPKGNAME=$(add_32bit_requires $TARGETPKGNAME) && return 0
+		test -n "$REPLRULE" && TARGETPKGNAME=$(add_32bit_requires "$TARGETPKGNAME") && return 0
 	done
 
 	# Part of local hack
@@ -105,7 +105,7 @@ tolocal_anyrepl()
 
 	FIXNEWRESULT=$(add_32bit_requires $NEWRESULT)
 
-	ALTPKGNAME=$GREP
+	ALTPKGNAME="$GREP"
 	TARGETPKGNAME="$FIXNEWRESULT"
 	# return if no chance to replace
 	[ "$FIXNEWRESULT" = "$GREP" ] && return 1

tests/test_repl_find.sh

@@ -99,7 +99,7 @@ check_repl libX11-devel libX11
 ############################# Fedora ##########################
 DISTRNAME=Fedora
 PKGVENDOR=fedora
-DISTRVERSION=17
+DISTRVERSION=21
 BUILDARCH=x86_64
 PKGFORMAT=rpm
 
@@ -118,5 +118,22 @@ check_repl fontconfig-devel "fontconfig-devel"
 check_repl unknown-devel "unknown-devel"
 
 check_repl rpm-build-compat rpm-build-altlinux-compat
-check_repl libusb-devel libusb1-devel
+check_repl libusb-devel libusbx-devel
 
+
+
+############################# SUSE ##########################
+BUILDNAME=wine
+
+DISTRNAME=SUSE
+PKGVENDOR=suse
+DISTRVERSION=12.3
+BUILDARCH=x86_64
+PKGFORMAT=rpm
+
+echo
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+print_pkgrepl_list
+
+check_repl libgphoto2-devel "libgphoto2-devel"
+check_repl libgphoto2-6 "libgphoto2-6-32bit"