- simplified %%prep magick, added biblos.pro to qmake

Changed files:
    biblos.spec -> 1.9

diff --git a/biblos.spec b/biblos.spec
index 98dc11537ac39f3ab184b53131dddc550cca867f..e1a25e17eca6712061e7bfec20d51b6611d79949 100644 (file)
--- a/biblos.spec
+++ b/biblos.spec
@@ -1,7 +1,6 @@
 #
 # TODO:
 # - remove openoffice-lib dependence,
-# - maybe some fix at %prep, 
 # - more BRs ?,
 Summary:       Indexing tool to manage cds collection
 Summary(pl):   Program do katalogowania p³yt cd
@@ -42,23 +41,18 @@ zaimplementowane:
 - program nie indeksuje dowi±zañ
 
 %prep
-rm -rf ../BUILD/%{name}-%{version}
-tar -zxf %{SOURCE0} -C ../BUILD
-chmod 700 ../BUILD/%{name}-%{version}
-cd ../BUILD/%{name}-%{version}
-chmod 700 images mc help
+%setup -qcT
+tar xzf %{SOURCE0} -C ..
+chmod +x . images mc help
 
 %build
-cd %{name}-%{version}
-qmake
+qmake biblos.pro
 %{__make} QTDIR="/usr" CFLAGS="%{rpmcflags}" CXXFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_bindir},%{_pixmapsdir},%{_applnkdir}/Utilities}
 
-cd %{name}-%{version}
-
 install %{name} $RPM_BUILD_ROOT%{_bindir}
 install images/logo.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}-logo.png
 install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
@@ -68,7 +62,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc %{name}-%{version}/doc
+%doc doc/{AUTHORS,HISTORY,TODO,WARNING,WHATIS}
 %attr(755,root,root) %{_bindir}/*
 %{_pixmapsdir}/*
 %{_applnkdir}/Utilities/*