Index: _pack
==================================================================
--- _pack
+++ _pack
@@ -1,9 +1,9 @@
 
 
 #-- meta data
-VERSION=$(version --get st2.py --write:rpmspec _package.epm --write:_raw_:2 st2.py)
+VERSION=$(version --get:plugin st2.py --write:rpmspec _package.epm --write:python st2.py)
 
 
 echo "------------------ source .txz ------------------"
 cd ..
 pax -wvJf streamtuner2-$VERSION.src.txz \
@@ -31,15 +31,17 @@
 mv linux-3.0-all/streamtuner2-$VERSION.tar.gz linux-3.0-all/streamtuner2-$VERSION.bin.tgz
 
 
 echo "-------------------- .rpm -----------------------"
 epm -vvv -n -a all -f rpm streamtuner2 _package.epm
-/usr/bin/rpmbuild -bb --buildroot ./linux-3.0-all/buildroot --target all linux-3.0-all/streamtuner2.spec
+mkdir linux-3.0-all/BUILD
+/usr/bin/rpmbuild -bb --buildroot $(pwd)/linux-3.0-all/buildroot --target all linux-3.0-all/streamtuner2.spec
 mv linux-3.0-all/RPMS/all/*.rpm linux-3.0-all/streamtuner2-$VERSION.rpm
+rm -r linux-3.0-all/BUILD
 rm -r linux-3.0-all/RPMS
 rm -r linux-3.0-all/rpms
-rm -r linux-3.0-all/buildroot
+#rm -r linux-3.0-all/buildroot
 rmdir linux-3.0-all/streamtuner2-$VERSION
 rm linux-3.0-all/streamtuner2.spec
 
 
 echo "-------------------- win32 -----------------------"

Index: _package.epm
==================================================================
--- _package.epm
+++ _package.epm
@@ -1,7 +1,7 @@
 %product streamtuner2 - internet radio browser
-%version 2.0.9.5
+%version 2.1.0
 %vendor Mario Salzer
 %license
 %copyright Placed into the Public Domain, 2009-2014
 %readme README
 
@@ -33,10 +33,11 @@
 f 644 root root /usr/share/pixmaps/streamtuner2.png		./logo.png
 f 644 root root /usr/share/streamtuner2/gtk2.xml		./gtk2.xml
 f 644 root root /usr/share/streamtuner2/gtk3.xml		./gtk3.xml
 #f 644 root root /usr/share/streamtuner2/pson.py			./pson.py
 #f 644 root root /usr/share/streamtuner2/processing.py		./processing.py
+f 644 root root /usr/share/streamtuner2/compat2and3.py		./compat2and3.py
 f 644 root root /usr/share/streamtuner2/action.py		./action.py
 f 644 root root /usr/share/streamtuner2/config.py		./config.py
 f 644 root root /usr/share/streamtuner2/ahttp.py		./ahttp.py
 f 644 root root /usr/share/streamtuner2/cli.py			./cli.py
 f 644 root root /usr/share/streamtuner2/mygtk.py		./mygtk.py
@@ -54,30 +55,30 @@
 f 644 root root /usr/share/streamtuner2/channels/live365.png 	./channels/live365.png
 f 644 root root /usr/share/streamtuner2/channels/google.py	./channels/google.py
 f 644 root root /usr/share/streamtuner2/channels/google.png	./channels/google.png
 f 644 root root /usr/share/streamtuner2/channels/punkcast.py	./channels/punkcast.py
 f 644 root root /usr/share/streamtuner2/channels/punkcast.png	./channels/punkcast.png
-f 644 root root /usr/share/streamtuner2/channels/basicch.py 	./channels/basicch.py
-f 644 root root /usr/share/streamtuner2/channels/basicch.png 	./channels/basicch.png
+#f 644 root root /usr/share/streamtuner2/channels/basicch.py 	./channels/basicch.py
+#f 644 root root /usr/share/streamtuner2/channels/basicch.png 	./channels/basicch.png
 f 644 root root /usr/share/streamtuner2/channels/jamendo.py 	./channels/jamendo.py
 f 644 root root /usr/share/streamtuner2/channels/jamendo.png 	./channels/jamendo.png
 f 644 root root /usr/share/streamtuner2/channels/myoggradio.py 	./channels/myoggradio.py
 f 644 root root /usr/share/streamtuner2/channels/myoggradio.png	./channels/myoggradio.png
 f 644 root root /usr/share/streamtuner2/channels/internet_radio_org_uk.py ./channels/internet_radio_org_uk.py
 f 644 root root /usr/share/streamtuner2/channels/internet_radio_org_uk.png ./channels/internet_radio_org_uk.png
 f 644 root root /usr/share/streamtuner2/channels/timer.py 	./channels/timer.py
 f 644 root root /usr/share/streamtuner2/channels/links.py 	./channels/links.py
 f 644 root root /usr/share/streamtuner2/channels/global_key.py 	./channels/global_key.py
-f 644 root root /usr/share/streamtuner2/channels/tv.py 		./channels/tv.py
-f 644 root root /usr/share/streamtuner2/channels/tv.png 	./channels/tv.png
+#f 644 root root /usr/share/streamtuner2/channels/tv.py 		./channels/tv.py
+#f 644 root root /usr/share/streamtuner2/channels/tv.png 	./channels/tv.png
 f 644 root root /usr/share/streamtuner2/channels/musicgoal.py 	./channels/musicgoal.py
 f 644 root root /usr/share/streamtuner2/channels/musicgoal.png	./channels/musicgoal.png
 #-- scripts
 #d 755 root root /usr/share/streamtuner2/scripts		-
 #f 644 root root /usr/share/streamtuner2/scripts/radiotop40_de.py  ./scripts/radiotop40_de.py
 #-- themes
-f 644 root root /usr/share/streamtuner2/themes/MountainDew/gtk-2.0/gtkrc ./themes/MountainDew/gtk-2.0/gtkrc
+#f 644 root root /usr/share/streamtuner2/themes/MountainDew/gtk-2.0/gtkrc ./themes/MountainDew/gtk-2.0/gtkrc
 #-- help files
 f 644 root root /usr/share/man/man1/streamtuner2.1		 	 ./help/streamtuner2.1
 d 755 root root /usr/share/doc/streamtuner2/help 			-
 f 644 root root /usr/share/doc/streamtuner2/help/action_homepage.page 	 ./help/action_homepage.page
 f 644 root root /usr/share/doc/streamtuner2/help/action_playing.page 	 ./help/action_playing.page