fix repl, improve test, fix repl rules

share/eterbuild/functions/repl

@@ -93,7 +93,7 @@ tolocal_anyrepl()
 	# return if no chance to replace
 	[ "$FIXNEWRESULT" = "$GREP" ] && return 1
 	# HACK: return if we get complex result
-	[ "$FIXNEWRESULT" = "$NEWRESULT" ] && return 0
+	[ "$FIXNEWRESULT" != "$NEWRESULT" ] && return 0
 
 	# try to resolve recursive
 	tolocal_anyrepl "$FIXNEWRESULT" $@

share/eterbuild/pkgrepl/pkgrepl.mdv.2012

@@ -29,3 +29,10 @@ libgphoto2|libgphoto6
 
 zlib|libz1
 zlib-devel|libz-devel
+
+ImageMagick-tools|imagemagick
+
+libalsa-devel|libasound-devel
+#libalsa|alsa-lib
+
+glibc-devel|glibc-devel libtirpc-devel

share/eterbuild/pkgrepl/pkgrepl.rhel

@@ -25,3 +25,5 @@ libaudiofile|audiofile
 
 libgphoto2-devel|gphoto2-devel
 libgphoto2|gphoto2
+
+gettext-tools|gettext-devel

share/eterbuild/pkgrepl/pkgrepl.rosa.2012

 #libudev1|libudev1
-#libalsa-devel|libasound-devel
+libalsa-devel|libasound-devel
+#libalsa|alsa-lib
 python-modules-logging|
+libreadline-devel|libreadline-devel
+libreadline|libreadline6
+
+libwxGTK-devel|libwxgtku2.8-devel
+libwxGTK|libwxgtku2.8
+wxGTK|libwxgtku2.8

share/eterbuild/pkgrepl/pkgrepl.rosa.2012.x86_64

+libreadline-devel|lib64readline-devel
+libreadline|lib64readline6
+
+libwxGTK-devel|lib64wxgtku2.8-devel
+libwxGTK|lib64wxgtku2.8
+wxGTK|lib64wxgtku2.8

share/eterbuild/pkgrepl/pkgrepl.rpm

@@ -165,7 +165,7 @@ freenx-server|
 libwxGTK-devel|wxGTK-devel
 libwxGTK|wxGTK
 
-libfontconfig-devel|fontconfig-devel
+#libfontconfig-devel|fontconfig-devel
 libfontconfig|fontconfig
 perl-base|perl
 

share/eterbuild/pkgrepl/pkgrepl.suse

@@ -145,8 +145,6 @@ libgtkmm2|libgtkmm-2_4-1
 libreadline|libreadline5
 gettext-tools|gettext-tools
 libpython|libpython2_6-1_0
-libfontconfig-devel|fontconfig-devel
-libfontconfig|fontconfig
 
 lsb-release|lsb
 fonts-bitmap-misc|xorg-x11-fonts

tests/test_repl_find.sh

@@ -31,29 +31,16 @@ for i in `print_grprepl_list` ; do
 done
 }
 
-PKGVENDOR=fedora
-PKGFORMAT=rpm
-DISTRVERSION=10
-
-echo "PkgRepl:"
-get_pkglist
-echo
-#check pkgrepl "fedora" `get_pkglist`
-
-echo "GrpRepl:"
-get_grplist
-echo
-
 check_repl()
 {
-	check $1 "`print_replace $1`" $2
+	check "$1" "`print_replace $1`" "$2"
 }
 
-echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
-check_repl rpm-build-compat rpm-build-altlinux-compat
-check_repl libusb-devel libusb-devel
+# global
+BUILDNAME=wine
 
 
+DISTRNAME=Ubuntu
 PKGVENDOR=ubuntu
 PKGFORMAT=deb
 DISTRVERSION=11.04
@@ -67,8 +54,9 @@ check_repl libusb-devel libusb-1.0-0-dev
 check_repl libstdc++ libstdc++
 
 
+DISTRNAME=Mandriva
 PKGVENDOR=mdv
-DISTRVERSION=2010.1
+DISTRVERSION=2011
 BUILDARCH=x86_64
 PKGFORMAT=rpm
 #FINDPKG=$PKGREPLBASE.pkgrepl.$VENDOR.$DISTRVERSION
@@ -85,23 +73,50 @@ print_grprepl_list
 DISTRNAME=ArchLinux
 PKGVENDOR=archlinux
 PKGFORMAT=pkg.gz
-DISTRVERSION=2011.08
+DISTRVERSION=2012.04
 
 echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
 
 print_pkgrepl_list
 
-check_repl rpm-build-intro rpm-build-altlinux-intro
+check_repl rpm-build-intro rpm-build-altlinux-compat
 check_repl libusb-devel libusb
 check_repl libX11 libx11
 
+############################# Slackware ##########################
+
 DISTRNAME=Slackware
 PKGVENDOR=slackware
 PKGFORMAT=pkg.gz
-DISTRVERSION=2011.08
+DISTRVERSION=14
 
 echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
 
 print_pkgrepl_list
 
 check_repl libX11-devel libX11
+
+############################# Fedora ##########################
+DISTRNAME=Fedora
+PKGVENDOR=fedora
+DISTRVERSION=17
+BUILDARCH=x86_64
+PKGFORMAT=rpm
+
+echo
+echo "Replacement files for $PKGVENDOR/$DISTRVERSION (target $PKGFORMAT):"
+print_pkgrepl_list
+
+check_repl fontconfig-devel "fontconfig-devel fontconfig-devel(x86-32)"
+check_repl unknown-devel "unknown-devel unknown-devel(x86-32)"
+BUILDARCH=i586
+check_repl fontconfig-devel "fontconfig-devel"
+check_repl unknown-devel "unknown-devel"
+BUILDARCH=x86_64
+BUILDNAME=test
+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
+