Index: app/dist/spec/Makefile
===================================================================
--- app/dist/spec/Makefile	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/dist/spec/Makefile	(revision b2647ded51d1c3f8e4a856396ea16c7afd54b9e6)
@@ -3,13 +3,21 @@
 DIR=$(shell pwd)
 
-ifndef _UTT_DIST_DIR
-	_UTT_DIST_DIR=${DIR}
+ifndef UTT_DIST_DIR
+	UTT_DIST_DIR=${DIR}
 endif
 
-
+_RPM_FROOT=${DIR}/rmp_root
+_UTT_ROOT=${_RPM_FROOT}/usr/local
 # default task
 .PHONY: rpm
 rpm:
-	cd ${_UTT_DIST_DIR}; rpmbuild -bb ${DIR}/utt.spec
+	if test -d ${_RPM_FROOT}; then rm -fr ${_RMP_FROOT}; fi
+	mkdir -p ${_UTT_ROOT}
+	cp -rf ${UTT_DIST_DIR}/* ${_UTT_ROOT}/
+	cp ../common/utt_make_config.pl ${_UTT_ROOT}/bin/
+	chmod 755 ${_UTT_ROOT}/bin/utt_make_config.pl
+	cp ../files/* ${_UTT_ROOT}/
+	cd ${_RPM_FROOT}; rpmbuild -bb ${DIR}/utt.spec
 	
-
+	rm -rf ${_RPM_FROOT}
+	
Index: app/dist/spec/utt.spec
===================================================================
--- app/dist/spec/utt.spec	(revision 25ae32e4c2354e0ed6756bbe1de83f39cd814652)
+++ app/dist/spec/utt.spec	(revision b2647ded51d1c3f8e4a856396ea16c7afd54b9e6)
@@ -11,17 +11,7 @@
 %define _this_summary	  Some tools for text processing
 %define _this_name        utt
-%define _this_version	  %(cat ../common/version.def)
-%define _this_release	  %(cat ../common/release.def)
+%define _this_version	  %(cat ../../common/version.def)
+%define _this_release	  %(cat ../../common/release.def)
 %define _this_copyright   Adam Mickiewicz University, Poland
-
-#
-# We need some paths
-#
-# Directory with utt binaries
-%define _UTT_DIST_DIR	%(pwd)
-#Root directory in which utt will be installed
-%define _UTT_DIR		/usr/local/%_this_name
-#Directory for rpm
-%define _RPM_ROOT	%_UTT_DIST_DIR/../rpm_root
 
 #
@@ -40,5 +30,5 @@
 URL:         http://utt.amu.edu.pl
 Vendor:      Adam Mickiewicz University
-BuildRoot:   %_RPM_ROOT
+BuildRoot:	%(pwd)
 #BuildArch: 	 i586
 # requirements for utt application
@@ -53,8 +43,8 @@
 
 %description
-%(cat ../common/description.def)
+%(cat ../../common/description.def)
 
 %description -l pl
-%(cat ../common/description.pl.def)
+%(cat ../../common/description.pl.def)
 
 
@@ -68,11 +58,7 @@
 # rpm building
 %install
-%__mkdir_p $RPM_BUILD_ROOT%_UTT_DIR
-cp -fr %_UTT_DIST_DIR/* $RPM_BUILD_ROOT%_UTT_DIR/
-
 
 # cleaning after rpm build
 %clean
-rm -rf $RPM_BUILD_ROOT
 
 # -------------------------------------------------------------
@@ -80,24 +66,13 @@
 %pre
 
-
 #after installation
 %post
 # we need to create utt.conf file
-%_UTT_DIR/create_utt_config.pl
-rm -f %_UTT_DIR/create_utt_config.pl
-# we need to create links in /usr/local/bin
-find %_UTT_DIR/bin/ -type f -exec ln -f {} /usr/local/bin \;
-
 
 #before uninstallation
 %preun
-# we delete links from /usr/local/bin
-for fn in `find %_UTT_DIR/bin/ -type f -exec basename {} \;`; do rm -f /usr/local/bin/$fn; done
-
 
 #after uninstallation
 %postun
-# we remove all extra files
-rm -fr %_UTT_DIR
 
 # -------------------------------------------------------------