small fixes

bin/rpmcs

@@ -391,6 +391,7 @@ do
 
 	subst "s|^%__python setup.py build|%python_build|g" $i
 	subst "s|^%__python setup.py install --root.%buildroot|%python_install|g" $i
+	subst "s|^%__python setup.py install --skip-build --root %buildroot|%python_install|g" $i
 	subst "s|^%__python setup.py install -O1 --skip-build --root %buildroot|%python_install|g" $i
 	subst "s|^%__python setup.py install -O2 --root %buildroot|%python_install|g" $i
 	subst "s|^%__python setup.py install --optimize --root %buildroot|%python_install|g" $i

share/eterbuild/functions/spec

@@ -256,6 +256,7 @@ separate_changelog()
 	cat $SPEC | awk 'BEGIN{desk=0}{if (desk==1) {print}; if(/^%changelog/&&desk==0){desk++}}' > "$3"
 }
 
+# TODO: do standalone command
 # for rpm + (d)ash
 # http://mywiki.wooledge.org/Bashism
 remove_bashism()

share/eterbuild/pkgrepl/pkgrepl.deb

@@ -312,3 +312,7 @@ libwine-devel|libwine-etersoft-devel
 libv4l|libv4l-0
 libXcursor|libxcursor1
 libXinerama|libxinerama1
+# NX
+libXcomp|libxcomp3
+
+mailx|mailutils

share/eterbuild/pkgrepl/pkgrepl.suse.11.4

@@ -3,8 +3,9 @@ libgmp3|libgmp10
 libjpeg|libjpeg62
 libjpeg-devel|libjpeg62-devel
 libpython|libpython2_7-1_0
+# FIXME: wxWidgets-devel is more correct way, can we compile with it? (see wxWidgets-compat-lib-config package description)
 libwxGTK-devel|wxWidgets-wxcontainer-devel
 # too many subpackages
 libwxGTK|
 # missed??
-libopensc-devel|
+libopensc-devel|
\ No newline at end of file

tests/test_remove_bashism.sh

@@ -23,6 +23,8 @@ pushd txt
 echo {1,2}text
 %__subst "s|1|2|g" text/{1,eweew}
 %__subst "s|1re er| erer2|g" text/{1,eweew} nono
+mkdir ${LOCATION}/{loc1,dedt,ohi}
+mkdir $LOCATION/{loc1,dedt,ohi}
 popd
 
 %description