Author: uzsolt Date: Tue Jan 4 20:39:26 2011 GMT Module: packages Tag: HEAD ---- Log message: - 1.8.2 - change url, source - use scons to build, install
---- Files affected: packages/mixxx: mixxx.spec (1.7 -> 1.8) ---- Diffs: ================================================================ Index: packages/mixxx/mixxx.spec diff -u packages/mixxx/mixxx.spec:1.7 packages/mixxx/mixxx.spec:1.8 --- packages/mixxx/mixxx.spec:1.7 Tue Dec 18 21:14:24 2007 +++ packages/mixxx/mixxx.spec Tue Jan 4 21:39:21 2011 @@ -1,18 +1,16 @@ # $Revision$, $Date$ -# -# TODO: -# - desktop file as Source1 -# Summary: Mixxx - DJ tool Summary(pl.UTF-8): Mixxx - narzędzie dla DJ-ów Name: mixxx -Version: 1.5.0 -Release: 0.1 +Version: 1.8.2 +Release: 0.3 License: GPL/GPL v2+ Group: X11/Applications -Source0: http://dl.sourceforge.net/mixxx/%{name}-%{version}-src.tar.bz2 -# Source0-md5: 64aed846d3973dfb00a3d918ec7be769 -URL: http://mixxx.sourceforge.net/ +Source0: http://downloads.mixxx.org/mixxx-%{version}/%{name}-%{version}-src.tar.gz +# Source0-md5: f0297f4493d4d8e6ad59f72970bad7bc +URL: http://mixxx.org/ +BuildRequires: OpenGL-GLU-devel +BuildRequires: Qt3Support-devel BuildRequires: audiofile-devel BuildRequires: fftw-devel BuildRequires: jack-audio-connection-kit-devel @@ -20,11 +18,9 @@ BuildRequires: libmad-devel BuildRequires: libsndfile-devel BuildRequires: libvorbis-devel +BuildRequires: pkgconfig BuildRequires: portaudio-devel -BuildRequires: OpenGL-GLU-devel -BuildRequires: qmake -BuildRequires: qt-devel -BuildRequires: sed >= 4.0 +BuildRequires: scons BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -37,33 +33,28 @@ %prep %setup -q -%{__sed} -i -e s#lib/libqt-mt#/usr/%{_lib}/libqt-mt#g src/build.definition %build -export QTDIR=%{_prefix} -cd src/ -qmake -%{__make} +export CXXFLAGS="%{rpmcxxflags}" +export CCFLAGS="%{rpmcflags}" +export CXX="%{__cxx}" +export QMAKE_CXX="%{__cxx}" +scons \ + prefix=%{_prefix} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/skins/{outline,traditional,outlineClose,outlineSmall}} -install -d $RPM_BUILD_ROOT%{_datadir}/%{name}/{midi,keyboard} -# Copy skins -install src/skins/outline/* $RPM_BUILD_ROOT%{_datadir}/mixxx/skins/outline -install src/skins/outlineClose/* $RPM_BUILD_ROOT%{_datadir}/mixxx/skins/outlineClose -install src/skins/outlineSmall/* $RPM_BUILD_ROOT%{_datadir}/mixxx/skins/outlineSmall -install src/skins/traditional/* $RPM_BUILD_ROOT%{_datadir}/mixxx/skins/traditional - -# Copy midi config files -install src/midi/* $RPM_BUILD_ROOT%{_datadir}/mixxx/midi - -# Copy keyboard config files -install src/keyboard/* $RPM_BUILD_ROOT%{_datadir}/mixxx/keyboard - -# Copy mixxx binary -install src/mixxx $RPM_BUILD_ROOT%{_bindir} -#install src/mixxx-with-jack $RPM_BUILD_ROOT%{_bindir} +export CXXFLAGS="%{rpmcxxflags}" +export CCFLAGS="%{rpmcflags}" +export CXX="%{__cxx}" +export QMAKE_CXX="%{__cxx}" +scons prefix=%{_prefix} install_root=$RPM_BUILD_ROOT install + +# I don't know why doesn't use 'prefix' option... +install -d $RPM_BUILD_ROOT%{_prefix} +mv $RPM_BUILD_ROOT/{bin,share} $RPM_BUILD_ROOT%{_prefix} + +rm -rf $RPM_BUILD_ROOT%{_docdir}/mixxx %clean rm -rf $RPM_BUILD_ROOT @@ -73,9 +64,12 @@ %doc README Mixxx-Manual.pdf %attr(755,root,root) %{_bindir}/mixxx %dir %{_datadir}/mixxx +%{_datadir}/mixxx/schema.xml %{_datadir}/mixxx/skins %{_datadir}/mixxx/keyboard %{_datadir}/mixxx/midi +%{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/%{name}-icon.png %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -83,6 +77,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.8 2011/01/04 20:39:21 uzsolt +- 1.8.2 +- change url, source +- use scons to build, install + Revision 1.7 2007/12/18 20:14:24 sls - BR: OpenGL-GLU-devel ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mixxx/mixxx.spec?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
