Author: kwizart Update of /cvs/free/rpms/mixxx/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv6793/devel Modified Files: .cvsignore mixxx.spec sources Added Files: mixxx-1.8.2-norpath.patch Log Message: Update to 1.8.2 mixxx-1.8.2-norpath.patch: SConscript.env | 3 --- 1 file changed, 3 deletions(-) --- NEW FILE mixxx-1.8.2-norpath.patch --- diff -up mixxx-1.8.2/src/SConscript.env.norpath mixxx-1.8.2/src/SConscript.env --- mixxx-1.8.2/src/SConscript.env.norpath 2010-12-06 00:07:57.000000000 +0100 +++ mixxx-1.8.2/src/SConscript.env 2011-01-21 15:30:52.455311000 +0100 @@ -837,9 +837,6 @@ if 'win' in platformString: else: env.Append(CCFLAGS = Split(""" -pipe -Wall -W -g """)) # omghax env.Append(LINKFLAGS = Split(""" -pipe -Wall -W -g""")) - if platformString != 'osx': - env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") - env.Append(LINKFLAGS = "-Wl,-rpath,$QTDIR/lib") env.Append(CPPDEFINES = "_REENTRANT") #Uic these guys (they're moc'd automatically after this) - Generates the code for the QT UI forms Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mixxx/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 13 Oct 2010 15:16:20 -0000 1.5 +++ .cvsignore 21 Jan 2011 14:35:18 -0000 1.6 @@ -1 +1 @@ -mixxx-1.8.0.2-src.tar.gz +mixxx-1.8.2-src.tar.gz Index: mixxx.spec =================================================================== RCS file: /cvs/free/rpms/mixxx/devel/mixxx.spec,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mixxx.spec 13 Oct 2010 15:44:14 -0000 1.7 +++ mixxx.spec 21 Jan 2011 14:35:19 -0000 1.8 @@ -1,5 +1,5 @@ Name: mixxx -Version: 1.8.0.2 +Version: 1.8.2 Release: 1%{?dist} Summary: Mixxx is open source software for DJ'ing @@ -7,6 +7,7 @@ License: GPLv2+ URL: http://www.mixxx.org Source0: http://downloads.mixxx.org/mixxx-%{version}/mixxx-%{version}-src.tar.gz +Patch0: mixxx-1.8.2-norpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) #Build tools @@ -56,7 +57,7 @@ %prep %setup -q - +%patch0 -p1 -b .norpath %build @@ -82,25 +83,10 @@ install_root=$RPM_BUILD_ROOT%{_prefix} \ prefix=%{_prefix} install -#Recreate desktop file to better handle encoding convertion -rm $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop -cat > $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop <<EOF -[Desktop Entry] -Version=1.0 -Encoding=UTF-8 -Name=Mixxx -Comment=A digital DJ interface -Exec=mixxx -Terminal=false -Icon=mixxx-icon -Type=Application -Categories=AudioVideo;X-Synthesis; -EOF - -desktop-file-install --vendor "" --delete-original \ +desktop-file-install --vendor "" \ --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --remove-category Application \ - $RPM_BUILD_ROOT%{_datadir}/applications/mixxx.desktop + --add-category=X-Synthesis \ + src/mixxx.desktop #Remove docdir rm -rf $RPM_BUILD_ROOT%{_docdir} @@ -120,6 +106,9 @@ %{_datadir}/pixmaps/mixxx-icon.png %changelog +* Fri Jan 21 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.8.2-1 +- Update to 1.8.2 + * Wed Oct 13 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.8.0.2-1 - Update to 1.8.0.2 Index: sources =================================================================== RCS file: /cvs/free/rpms/mixxx/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 13 Oct 2010 15:16:20 -0000 1.5 +++ sources 21 Jan 2011 14:35:19 -0000 1.6 @@ -1 +1 @@ -5e896fbd77c1d44f1916e7ad4740c1ac mixxx-1.8.0.2-src.tar.gz +f0297f4493d4d8e6ad59f72970bad7bc mixxx-1.8.2-src.tar.gz