X-Git-Url: http://git.pld-linux.org/?p=packages%2Fclementine.git;a=blobdiff_plain;f=clementine.spec;h=5c700b81fb2758b0b6170108f63a81a353dfcd13;hp=9cda8b94c3e43372e70c073572c521502f9b6ae7;hb=2852d3d;hpb=cb052d7915175d727e8d5d074561cc98b32e33a6

diff --git a/clementine.spec b/clementine.spec
index 9cda8b9..5c700b8 100644
--- a/clementine.spec
+++ b/clementine.spec
@@ -1,89 +1,92 @@
 # TODO:
 # - Gstreamer error: "A text/uri-list decoder plugin is required to play this stream, but not installed."
 # - apply patches to libprojectM.spec and use
-# - Google Drive support (missing Google sparsehash)
-# - package for kde4 stuff (or nuke them):
+# - sub-package for kde4 stuff (or nuke them):
 #        /usr/share/kde4/services/clementine-feed.protocol
 #        /usr/share/kde4/services/clementine-itms.protocol
 #        /usr/share/kde4/services/clementine-itpc.protocol
 #        /usr/share/kde4/services/clementine-zune.protocol
 #
 # Conditional build:
-%bcond_without	static_sqlite	# with static sqlite3
 %bcond_with	static_projectm	# with static projectM
 %bcond_with	libspotify	# build with system libspotify instead of downloading blob
+%bcond_with	tests		# build without tests
 
 %define		qtver	%(pkg-config --silence-errors --modversion QtCore 2>/dev/null || echo ERROR)
+%define		sqlitever	3.14.0-2
 Summary:	A music player and library organiser
 Summary(hu.UTF-8):	Egy zenelejátszó és gyűjtemény-kezelő
 Name:		clementine
-Version:	1.1.1
-Release:	6
+Version:	1.3.1
+Release:	4
 License:	GPL v3 and GPL v2+
-Group:		Applications/Multimedia
-URL:		http://www.clementine-player.org/
-Source0:	http://clementine-player.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	28e4afb822388bd337a761db8f86febf
-Patch0:		desktop-install.patch
+Group:		X11/Applications/Multimedia
+Source0:	https://github.com/clementine-player/Clementine/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5:	18cc5f66aa5fbb2781198a65439bd38a
 Patch1:		unbundle-po.patch
-Patch2:		%{name}-1.1.1-libimobiledevice-fix.patch
-Patch3:		%{name}-dt_categories.patch
+Patch2:		%{name}-udisks-headers.patch
+Patch3:		%{name}-mygpo.patch
+URL:		http://www.clementine-player.org/
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
-BuildRequires:	QtIOCompressor-devel
+BuildRequires:	QtIOCompressor-devel >= 2.3
 BuildRequires:	QtNetwork-devel >= %{qtver}
 BuildRequires:	QtOpenGL-devel >= %{qtver}
 BuildRequires:	QtSingleApplication-devel >= 2.6-4
 BuildRequires:	QtSql-devel >= %{qtver}
 %{?with_tests:BuildRequires:	QtTest-devel >= %{qtver}}
 BuildRequires:	QtXml-devel >= %{qtver}
-BuildRequires:	QtXmlPatterns-devel >= %{qtver}
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.6
-#%{?with_static_projectm:BuildRequires:	ftgl-devel >= 2.1.3}
-BuildRequires:	gettext-devel
+BuildRequires:	cryptopp-devel >= 5.6.1-4
+BuildRequires:	desktop-file-utils
+BuildRequires:	gettext-tools
 %{?with_static_projectm:BuildRequires:	glew-devel}
 BuildRequires:	glib2-devel
-BuildRequires:	gstreamer0.10-devel
-BuildRequires:	gstreamer0.10-plugins-base-devel
+BuildRequires:	gstreamer-devel
+BuildRequires:	gstreamer-plugins-base-devel
 BuildRequires:	gtest-devel
 BuildRequires:	libcdio-devel
 BuildRequires:	libchromaprint-devel
+BuildRequires:	libechonest-devel
 BuildRequires:	libgpod-devel >= 0.7.92
 BuildRequires:	libimobiledevice-devel >= 1.1.5
-BuildRequires:	libindicate-qt-devel
 BuildRequires:	liblastfm-devel >= 0.3.3
-BuildRequires:	libmtp-devel
+BuildRequires:	libmtp-devel >= 1.0
+BuildRequires:	libmygpo-qt-devel >= 1.0.7
 BuildRequires:	libplist-devel
 %{!?with_static_projectm:BuildRequires:	libprojectM-devel >= 1:2.0.1-4}
 BuildRequires:	libqxt-devel
 %{?with_libspotify:BuildRequires:	libspotify-devel >= 12.1.45}
+BuildRequires:	libusbmuxd-devel
 BuildRequires:	libxml2-devel
 BuildRequires:	pkgconfig
 BuildRequires:	pkgconfig
 BuildRequires:	protobuf-devel
-BuildRequires:	qca-devel
 BuildRequires:	qjson-devel
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-linguist
 BuildRequires:	qt4-qmake
-BuildRequires:	rpmbuild(find_lang) >= 1.33
+BuildRequires:	rpmbuild(find_lang) >= 1.38
 BuildRequires:	rpmbuild(macros) >= 1.596
 BuildRequires:	sed >= 4.0
-%{!?with_static_sqlite:BuildRequires:	sqlite3-devel}
-BuildRequires:	taglib-devel >= 1.6
-BuildRequires:	usbmuxd-devel
+BuildRequires:	sparsehash-devel
+BuildRequires:	sqlite3-devel >= %{sqlitever}
+BuildRequires:	taglib-devel >= 1.8
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 Requires(post,postun):	desktop-file-utils
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
+BuildRequires:	sqlite3 >= %{sqlitever}
 Requires:	QtSingleApplication >= 2.6-4
-%{!?with_static_sqlite:Requires:	QtSql-sqlite3 >= %{qtver}}
-Requires:	gstreamer0.10-audio-effects-base
-Requires:	gstreamer0.10-mad
-Suggests:	gstreamer0.10-flac
-# while we do not link (yet), we use datafiles
-Requires:	libprojectM
+Requires:	QtSql-sqlite3 >= %{qtver}
+Requires:	gstreamer-audio-effects-base
+Requires:	gstreamer-mad
+Suggests:	gstreamer-flac
+# if we do not link, we use datafiles
+%{!?with_static_projectm:Requires:	libprojectM}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # see libprojectM.spec for explanation
@@ -101,57 +104,74 @@ a Qt4 előnyeit.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-
-# We already don't use these but just to make sure
-rm -rf 3rdparty/gmock
-%{!?with_static_sqlite:rm -rf 3rdparty/qsqlite}
-rm -rf 3rdparty/qtsingleapplication
-rm -rf 3rdparty/qxt
-rm -rf 3rdparty/qtiocompressor
-%{!?with_static_projectm:rm -rf 3rdparty/libprojectM}
+#%patch3 -p1
+
+# cleanup vendor. keep only needed libraries.
+mv 3rdparty 3rdparty.dist
+vendor() {
+	local path dir
+	for path; do
+		dir=$(dirname $path)
+		test -d 3rdparty/$dir || mkdir -p 3rdparty/$dir
+		mv 3rdparty.dist/$path 3rdparty/$path
+	done
+}
+vendor sha2 qocoa
+vendor qsqlite
+%{?with_static_projectm:vendor libprojectm}
+# missing in pld
+vendor vreen
+# requires 1.0.9, but only 1.0.8 is released
+vendor libmygpo-qt
 
 # Don't build tests. They require gmock
 sed -i -e '/add_subdirectory(tests)/d' CMakeLists.txt
 # remove -Wall
 sed -i -e 's/-Wall//' src/CMakeLists.txt
-# ...and -Werror
-sed -i -e 's/-Werror//' src/CMakeLists.txt
 
 %build
 install -d build
 install -d build/src/translations
 cd build
-# as our buildtype is not Release, need to pass these manually. see CMakeLists.txt ~125
+# as our buildtype is not Release, need to pass these manually. see CMakeLists.txt ~135
 CXXFLAGS="%{rpmcxxflags} -DNDEBUG -DQT_NO_DEBUG_OUTPUT"
 %cmake \
+	-DBUILD_WERROR:BOOL=OFF \
+	-DCMAKE_POSITION_INDEPENDENT_CODE=ON \
+	-DCMAKE_INCLUDE_PATH=%{_includedir}/qt4 \
 	-DBUNDLE_PROJECTM_PRESETS=OFF \
 	-DUSE_SYSTEM_QTSINGLEAPPLICATION=ON \
-	-DQTSINGLEAPPLICATION_INCLUDE_DIRS=%{_includedir}/qt4/QtSolutions/ \
 	-DUSE_SYSTEM_QXT=ON \
 	-DUSE_SYSTEM_PROJECTM=ON \
-	-DSTATIC_SQLITE=%{?with_static_sqlite:ON}%{!?with_static_sqlite:OFF} \
+	-DQTSINGLEAPPLICATION_INCLUDE_DIRS=%{_includedir}/qt4/QtSolutions \
 	..
 %{__make}
 
+desktop-file-validate ../dist/%{name}.desktop
+
+%if %{with tests}
+%endif
+
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/kde4/services
 
 # not in our glibc?
 rm -r $RPM_BUILD_ROOT%{_localedir}/tr_TR
+rm -r $RPM_BUILD_ROOT%{_localedir}/he_IL
+rm -r $RPM_BUILD_ROOT%{_localedir}/mk_MK
+rm -r $RPM_BUILD_ROOT%{_localedir}/si_LK
 
 %find_lang %{name} --with-qm
 
 install -d $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps
-cp -a dist/icons/ubuntu-mono-light/clementine-panel-grey.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/clementine-panel-grey.png
-cp -a dist/icons/ubuntu-mono-light/clementine-panel.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/clementine-panel.png
+cp -p dist/icons/ubuntu-mono-light/clementine-panel-grey.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/clementine-panel-grey.png
+cp -p dist/icons/ubuntu-mono-light/clementine-panel.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/24x24/apps/clementine-panel.png
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -170,6 +190,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/clementine
 %attr(755,root,root) %{_bindir}/clementine-tagreader
 %{_desktopdir}/clementine.desktop
-%{_pixmapsdir}/clementine.png
 %{_iconsdir}/hicolor/*/apps/clementine-panel-grey.png
 %{_iconsdir}/hicolor/*/apps/clementine-panel.png
+%{_iconsdir}/hicolor/*/apps/clementine.png
+%{_iconsdir}/hicolor/*/apps/clementine.svg
+%{_datadir}/appdata/clementine.appdata.xml