diff --git a/.gitignore b/.gitignore index e69de29..71bb77a 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/musique.tar.gz diff --git a/musique-fix-include.patch b/musique-fix-include.patch new file mode 100644 index 0000000..95f6bfa --- /dev/null +++ b/musique-fix-include.patch @@ -0,0 +1,27 @@ +Common subdirectories: ./src.orig/context and ./src/context +Common subdirectories: ./src.orig/faderwidget and ./src/faderwidget +Common subdirectories: ./src.orig/iconloader and ./src/iconloader +diff -u ./src.orig/lastfm.cpp ./src/lastfm.cpp +--- ./src.orig/lastfm.cpp 2012-02-09 16:43:20.000000000 -0200 ++++ ./src/lastfm.cpp 2012-04-21 21:40:13.533451199 -0300 +@@ -1,6 +1,6 @@ + #include "lastfm.h" + #include "datautils.h" +-#include "../networkaccess.h" ++#include "networkaccess.h" + #include "lastfmlogindialog.h" + #include "mainwindow.h" + #include "constants.h" +diff -u ./src.orig/mediaview.cpp ./src/mediaview.cpp +--- ./src.orig/mediaview.cpp 2012-02-09 16:43:20.000000000 -0200 ++++ ./src/mediaview.cpp 2012-04-21 21:40:04.204451823 -0300 +@@ -1,7 +1,7 @@ + #include "mediaview.h" + #include "model/track.h" + #include "model/artist.h" +-#include "../mainwindow.h" ++#include "mainwindow.h" + #include "droparea.h" + #include "minisplitter.h" + #include "constants.h" +Common subdirectories: ./src.orig/model and ./src/model diff --git a/musique-qtsingleapp.patch b/musique-qtsingleapp.patch new file mode 100644 index 0000000..6ac74cb --- /dev/null +++ b/musique-qtsingleapp.patch @@ -0,0 +1,12 @@ +--- musique/musique.pro.orig 2012-04-21 20:23:18.348766772 -0300 ++++ musique/musique.pro 2012-04-21 20:24:32.664761688 -0300 +@@ -23,7 +23,8 @@ + xml \ + phonon \ + sql +-include(src/qtsingleapplication/qtsingleapplication.pri) ++# include(src/qtsingleapplication/qtsingleapplication.pri) ++CONFIG += qtsingleapplication + + HEADERS += src/mainwindow.h \ + src/aboutview.h \ diff --git a/musique.spec b/musique.spec new file mode 100644 index 0000000..78baac0 --- /dev/null +++ b/musique.spec @@ -0,0 +1,139 @@ +Name: musique +Version: 1.1 +Release: 7%{?dist} +Provides: minitunes%{?_isa} = %{version}-%{release} +Obsoletes: minitunes < 1.0-7 +Summary: A music player designed by and for people that love music + +Group: Applications/Multimedia +# Musique is GPL. The reason why a copy of the LGPL is included +# is that some files (some Qt utility classes) are LGPL. +License: GPLv3+ and LGPLv2+ +URL: http://flavio.tordini.org/musique +Source0: http://flavio.tordini.org/files/%{name}/%{name}.tar.gz +Patch0: %{name}-qtsingleapp.patch +Patch1: %{name}-fix-include.patch + +BuildRequires: qt-devel +BuildRequires: taglib-devel +BuildRequires: phonon-devel +BuildRequires: qtsingleapplication-devel +BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme + +%description +Musique unclutters your music listening experience with a clean and innovative +interface. Musique automatically fixes misspellings in titles and artist names, +freeing you from the hassle of manually tagging your files. + +Features: + +* Look them in the face. Browse your collection by artists pictures and album + covers. +* Lyrics. Musique will find and show the song lyrics in the Info View, hiding + everything but what's related to the currently playing track. +* Browse folders and files. Browse your music the way you organized it. +* Playlists made simple. Musique has just a single playlist. It's always there + on the right. + +%prep +%setup -q -n %{name} + +# Remove bundled copy of qtsingleapplication +rm -rf src/qtsingleapplication + +# Use qtsingleapplication from Fedora +%patch0 -p1 -b .orig + +# Fix include in src/lastfm.cpp and src/mediaview.cpp +%patch1 -p0 -b .orig + +%build +%{_qt4_qmake} PREFIX=%{_prefix} +make %{?_smp_mflags} + +%install +make install INSTALL_ROOT=%{buildroot} + +# Delete wrong desktop file Category +desktop-file-install --delete-original \ + --dir %{buildroot}%{_datadir}/applications \ + --remove-category=Music \ + %{buildroot}%{_datadir}/applications/%{name}.desktop + +# There is a bug in find-lang.sh (see BZ #729336) +# heavily borrowed from /usr/lib/rpm/find-lang.sh +find %{buildroot} -type f -o -type l|sort|sed ' +s:'"%{buildroot}"':: +s:\(.*/locale/\)\([^/_]\+\)\(.*\.qm$\):%lang(\2) \1\2\3: +s:^\([^%].*\):: +/^$/d' > %{name}.lang + +%post +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + +%postun +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + +%files -f %{name}.lang +%doc CHANGES COPYING LICENSE.LGPL TODO +%{_bindir}/%{name} +%{_datadir}/applications/%{name}.desktop +%{_datadir}/icons/hicolor/*/apps/%{name}.* +%{_datadir}/icons/hicolor/512x512/ +# don't list the locales, just the folders that contain them +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/locale + +%changelog +* Wed Apr 25 2012 Germán A. Racca - 1.1-7 +- Removed CXXFLAGS from build line + +* Sat Apr 21 2012 Germán A. Racca - 1.1-6 +- Dropped gcc-c++ from BR +- Removed bundled qtsingleapplication +- Added patch to use system qtsingleapplication +- Added qtsingleapplication-devel as BR +- Added desktop-file-utils as BR +- Removed wrong category form desktop file +- Dropped minitunes-1.0-gcc47.patch +- Added icon scriptlets +- Dropped INSTALL from %%doc +- Added patch to fix include in 2 cpp files + +* Tue Apr 03 2012 Germán A. Racca - 1.1-5 +- Fixed typo +- Added note for the patch + +* Thu Mar 23 2012 Germán A. Racca - 1.1-4 +- Package renamed to Musique +- Changed %%summary and %%description +- Upstream fixed some bugs + +* Thu Mar 22 2012 Tom Callaway - 1.0-3 +- fix gcc 4.7 issue + +* Fri Jan 13 2012 Fedora Release Engineering - 1.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Wed Aug 17 2011 Germán A. Racca 1.0-1 +- Updated to new version +- Added gcc-c++ as BR +- Using a workaround to include locales (see BZ #729336) + +* Fri Jul 30 2010 Germán A. Racca 0.1.1-3 +- Added comment above license tag + +* Thu Jul 29 2010 Germán A. Racca 0.1.1-2 +- Added cleaning of buildroot to %%install +- Removed unnecessary spaces from %%description + +* Fri Jul 16 2010 German A. Racca 0.1.1-1 +- Initial release of RPM package + diff --git a/sources b/sources index e69de29..24f051b 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +cca6cdfb5099ccc82b943b034fa2e5ae musique.tar.gz