Author: qboosh Date: Thu Jul 20 21:30:18 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - cosmetics, unified examplesdir
---- Files affected: SPECS: qt4-qsa.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SPECS/qt4-qsa.spec diff -u SPECS/qt4-qsa.spec:1.1 SPECS/qt4-qsa.spec:1.2 --- SPECS/qt4-qsa.spec:1.1 Wed Jul 19 11:53:14 2006 +++ SPECS/qt4-qsa.spec Thu Jul 20 23:30:12 2006 @@ -14,8 +14,8 @@ Source0: ftp://ftp.trolltech.com/qsa/source/qsa-x11-opensource-%{version}.tar.gz # Source0-md5: 46a05bb09346b04cf470dd1a3778c9a0 URL: http://www.trolltech.com/products/qsa/index.html -BuildRequires: qmake BuildRequires: QtCore-devel +BuildRequires: qmake Requires: QtCore BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -79,17 +79,19 @@ export QTINC=%{_includedir}/qt4 export QTLIB=%{_libdir} ./configure -release -prefix %{_prefix} -make -e INSTALL_ROOT=$RPM_BUILD_ROOT +%{__make} -e \ + INSTALL_ROOT=$RPM_BUILD_ROOT %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir}/qt4 install -d $RPM_BUILD_ROOT%{_includedir}/qt4 -install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name} +install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} install -d $RPM_BUILD_ROOT%{_defaultdocdir}/qsa -make -e INSTALL_ROOT=$RPM_BUILD_ROOT install +%{__make} install -e \ + INSTALL_ROOT=$RPM_BUILD_ROOT mv $RPM_BUILD_ROOT%{_prefix}/doc/html $RPM_BUILD_ROOT%{_defaultdocdir}/qsa rm -rf $RPM_BUILD_ROOT%{_prefix}/doc @@ -97,9 +99,9 @@ # # Examples # -cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name} +cp -a examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} -cd $RPM_BUILD_ROOT%{_examplesdir}/%{name} +cd $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version} #remove uneeded files rm -f qsa.prf find . -name "Makefile.*" | xargs rm -f @@ -179,6 +181,8 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2006/07/20 21:30:12 qboosh +- cosmetics, unified examplesdir + Revision 1.1 2006/07/19 09:53:14 pascalek - initial revision - ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/qt4-qsa.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
