- Up to 2.4

Changed files:
    QMTest.spec -> 1.3

1 files changed, 10 insertions, 8 deletions

diff --git a/QMTest.spec b/QMTest.spec
index 284d9eb..d27a9cc 100644
--- a/QMTest.spec
+++ b/QMTest.spec
@@ -1,14 +1,13 @@
-%define	tarname	qm
-%define	lcname	qmtest
+%define	tarname	qmtest
 Summary:	Testing tool
 Summary(pl.UTF-8):	Narzędzie do przeprowadzania testów
 Name:		QMTest
-Version:	2.3
+Version:	2.4
 Release:	1
 License:	GPL v2
 Group:		Development/Tools
 Source0:	http://www.codesourcery.com/public/qmtest/%{tarname}-%{version}/%{tarname}-%{version}.tar.gz
-# Source0-md5:	a302b541fde20ebea5ee88d3d6185143
+# Source0-md5:	b1c7cd4aa78a0fda1a6598ece98f6033
 Patch0:		%{name}-python25.patch
 URL:		http://www.codesourcery.com/qmtest/
 BuildRequires:	python
@@ -28,7 +27,7 @@ silnego i łatwego w użyciu procesu testowego.
 
 %prep
 %setup -q -n %{tarname}-%{version}
-%patch0 -p1
+#%patch0 -p1
 
 %build
 %{__python} setup.py build
@@ -38,16 +37,19 @@ rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
-rm $RPM_BUILD_ROOT%{_bindir}/%{lcname}.py
 mv $RPM_BUILD_ROOT%{_docdir}/%{tarname} _docs
 rm _docs/COPYING
 
 %py_postclean
 
 # Regenerate configuration cleaned above (it's broken anyway)
-cat > $RPM_BUILD_ROOT%{py_sitedir}/%{tarname}/config.py <<EOF
+rm $RPM_BUILD_ROOT%{py_sitedir}/qm/config.py*
+cat > $RPM_BUILD_ROOT%{py_sitedir}/qm/config.py <<EOF
 version='%{version}'
 data_dir='%{_datadir}/%{tarname}'
+doc_dir='%{_docdir}/%{name}-%{version}'
+extension_path=data_dir+'/site-extensions-2.5'
+prefix='%{_prefix}'
 EOF
 
 %clean
@@ -57,5 +59,5 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc _docs/*
 %attr(755,root,root) %{_bindir}/*
-%{py_sitedir}/%{tarname}
+%{py_sitedir}/qm
 %{_datadir}/%{tarname}