[cantata] import

Rex Dieter rdieter at fedoraproject.org
Mon Jan 28 19:34:41 UTC 2013


commit a057ef7b2caf59c0c754eb6e86eddb18a2b5bae2
Author: Rex Dieter <rdieter at math.unl.edu>
Date:   Mon Jan 28 13:34:28 2013 -0600

    import

 .gitignore                    |    1 +
 cantata-0.9.1-fix_build.patch |   11 ++++
 cantata-0.9.1-perl_env.patch  |    9 +++
 cantata.spec                  |  111 +++++++++++++++++++++++++++++++++++++++++
 sources                       |    1 +
 5 files changed, 133 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..635fa2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/cantata-0.9.2.tar.bz2
diff --git a/cantata-0.9.1-fix_build.patch b/cantata-0.9.1-fix_build.patch
new file mode 100644
index 0000000..1645e5b
--- /dev/null
+++ b/cantata-0.9.1-fix_build.patch
@@ -0,0 +1,11 @@
+diff -up cantata-0.9.1/support/CMakeLists.txt.fix_build cantata-0.9.1/support/CMakeLists.txt
+--- cantata-0.9.1/support/CMakeLists.txt.fix_build	2012-12-14 03:02:45.000000000 -0600
++++ cantata-0.9.1/support/CMakeLists.txt	2013-01-05 16:16:54.241518163 -0600
+@@ -21,6 +21,7 @@ if (NOT WIN32)
+ endif (NOT WIN32)
+ 
+ if (ENABLE_KDE_SUPPORT )
++    include_directories( ${KDE4_INCLUDES} )
+     macro_ensure_version("4.7.0" ${KDE_VERSION} KDE_VERSION_47)
+     if (NOT KDE_VERSION_47)
+         SET( SUPPORT_SRCS ${SUPPORT_SRCS} kmessagewidget.cpp )
diff --git a/cantata-0.9.1-perl_env.patch b/cantata-0.9.1-perl_env.patch
new file mode 100644
index 0000000..b5fd292
--- /dev/null
+++ b/cantata-0.9.1-perl_env.patch
@@ -0,0 +1,9 @@
+diff -up cantata-0.9.1/dynamic/cantata-dynamic.perl_env cantata-0.9.1/dynamic/cantata-dynamic
+--- cantata-0.9.1/dynamic/cantata-dynamic.perl_env	2012-12-14 03:02:40.000000000 -0600
++++ cantata-0.9.1/dynamic/cantata-dynamic	2013-01-05 15:24:26.979307703 -0600
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env perl
++#!/usr/bin/perl
+ 
+ #  Cantata-Dynamic
+ #
diff --git a/cantata.spec b/cantata.spec
new file mode 100644
index 0000000..05a0c20
--- /dev/null
+++ b/cantata.spec
@@ -0,0 +1,111 @@
+
+# define to enable kde integration
+%define kde 1
+
+Summary: Client for the Music Player Daemon (MPD)
+Name:    cantata
+Version: 0.9.2
+Release: 1%{?dist}
+
+License: GPLv2+
+#URL:    http://kde-apps.org/content/show.php/Cantata?content=147733
+URL:     http://code.google.com/p/cantata/
+Source0: http://cantata.googlecode.com/files/cantata-%{version}.tar.bz2
+
+## upstreamable patches
+# s|^#!/usr/bin/env perl|#!/usr/bin/perl|
+Patch101: cantata-0.9.1-perl_env.patch
+# fix wierd build failure
+Patch102: cantata-0.9.1-fix_build.patch
+
+BuildRequires: gettext
+BuildRequires: kdelibs4-devel
+BuildRequires: pkgconfig(taglib)
+BuildRequires: pkgconfig(taglib-extras)
+BuildRequires: pkgconfig(libmtp)
+BuildRequires: pkgconfig(phonon)
+BuildRequires: pkgconfig(QtWebKit)
+
+%description
+Cantata is a (yet another!) client for the music player daemon (MPD). 
+
+
+%prep
+%setup -q
+
+%patch101 -p1 -b .perl_env
+%patch102 -p1 -b .fix_build
+
+# nuke bundled qtsingleapplication, not used
+rm -rfv qtsingleapplication/
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake_kde4} \
+  -DENABLE_KDE:BOOL=%{?kde:ON}%{!?kde:OFF} \
+  -DENABLE_FFMPEG:BOOL=OFF \
+  -DENABLE_MPG123:BOOL=OFF \
+  -DENABLE_PHONON:BOOL=ON \
+  -DENABLE_WEBKIT:BOOL=ON \
+  ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform}
+
+
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+%find_lang cantata %{!?kde:--with-qt} %{?kde:--with-kde} --all-name || touch %%{name}.lang
+
+
+%check
+desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
+
+
+%post
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%posttrans
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+
+%postun
+if [ $1 -eq 0 ] ; then
+touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+fi
+
+%files -f cantata.lang
+%doc LICENSE
+%doc AUTHORS ChangeLog README TODO
+%{_kde4_bindir}/cantata
+# FIXME: create/ship systemd init script
+%{_kde4_bindir}/cantata-dynamic
+%{_kde4_datadir}/applications/%{?kde:kde4}/cantata.desktop
+%{?kde:%{_kde4_appsdir}/cantata/}
+%{_kde4_iconsdir}/hicolor/*/*/*
+
+
+%changelog
+* Mon Jan 28 2013 Rex Dieter <rdieter at fedoraproject.org> 0.9.2-1
+- 0.9.2
+
+* Sat Jan 05 2013 Rex Dieter <rdieter at fedoraproject.org> 0.9.1-1
+- cantata-0.9.1
+
+* Wed Nov 28 2012 Rex Dieter <rdieter at fedoraproject.org> 0.8.3.1-2
+- patch s|^#!/usr/bin/env perl|#!/usr/bin/perl|
+
+* Tue Sep 25 2012 Rex Dieter <rdieter at fedoraproject.org> 0.8.3.1-1
+- cantata-0.8.3.1
+- run desktop-file-validate
+- add icon scriptlets
+- drop Requires: mpd
+- %%doc LICENSE AUTHORS ChangeLog README TODO
+- omit and explicitly disable ffmpeg, mpg123 support
+
+* Thu Aug 02 2012 Rex Dieter <rdieter at fedoraproject.org> 0.8.2-1
+- first try
+
diff --git a/sources b/sources
index e69de29..8621363 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+882cec90eb01d190b899689675e990b0  cantata-0.9.2.tar.bz2


More information about the scm-commits mailing list