diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..84db9a5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/Yarock_0.9.64_11_source.tar.gz +/Yarock_0.9.67_source.tar.gz diff --git a/Yarock_0.9.64_11_source-system_libs.patch b/Yarock_0.9.64_11_source-system_libs.patch new file mode 100644 index 0000000..60f8a54 --- /dev/null +++ b/Yarock_0.9.64_11_source-system_libs.patch @@ -0,0 +1,58 @@ +diff -up Yarock_0.9.64_11_source/CMakeLists.txt.system_libs Yarock_0.9.64_11_source/CMakeLists.txt +--- Yarock_0.9.64_11_source/CMakeLists.txt.system_libs 2013-11-02 04:24:55.000000000 -0500 ++++ Yarock_0.9.64_11_source/CMakeLists.txt 2013-11-22 14:45:14.457325461 -0600 +@@ -75,10 +75,29 @@ INCLUDE_DIRECTORIES( ${QJSON_INCLUDE_DIR + # ------------------------------------------------------------------------------ + # SUBDIRECTORIES + # ------------------------------------------------------------------------------ +-add_subdirectory(src3party/qtsingleapplication) +-add_subdirectory(src3party/qxt) +-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qtsingleapplication) +-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qxt) ++option(USE_SYSTEM_QTSINGLEAPPLICATION "Use system QtSingleApplication library." OFF) ++if(USE_SYSTEM_QTSINGLEAPPLICATION) ++ find_path(QTSINGLEAPPLICATION_INCLUDE_DIRS qtsingleapplication.h PATH_SUFFIXES QtSolutions) ++ find_library(QTSINGLEAPPLICATION_LIBRARIES QtSolutions_SingleApplication-2.6) ++ find_library(QTSINGLECOREAPPLICATION_LIBRARIES QtSolutions_SingleCoreApplication-2.6) ++else(USE_SYSTEM_QTSINGLEAPPLICATION) ++ add_subdirectory(src3party/qtsingleapplication) ++ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qtsingleapplication) ++ set(QTSINGLEAPPLICATION_LIBRARIES qtsingleapplication) ++endif(USE_SYSTEM_QTSINGLEAPPLICATION) ++ ++option(USE_SYSTEM_QXT "Use system Qxt library" OFF) ++if (USE_SYSTEM_QXT) ++ find_path(QXTCORE_INCLUDE_DIRS qxtglobal.h PATH_SUFFIXES QxtCore) ++ find_path(QXTGUI_INCLUDE_DIRS qxtglobalshortcut.h PATH_SUFFIXES QxtGui) ++ set(QXT_INCLUDE_DIRS ${QXTCORE_INCLUDE_DIRS} ${QXTGUI_INCLUDE_DIRS}) ++ # We only need its header. We don't need to link to QxtCore. ++ find_library(QXT_LIBRARIES QxtGui) ++else (USE_SYSTEM_QXT) ++ add_subdirectory(src3party/qxt) ++ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src3party/qxt) ++ set(QXT_LIBRARIES qxt) ++endif (USE_SYSTEM_QXT) + + # Use system libechonest if it's available + if(NOT ECHONEST_FOUND) +@@ -127,4 +146,4 @@ install(FILES icon/128x128/yarock.png DE + # UN-INSTALL SUPPORT + # ------------------------------------------------------------------------------ + +- +\ No newline at end of file ++ +diff -up Yarock_0.9.64_11_source/src/CMakeLists.txt.system_libs Yarock_0.9.64_11_source/src/CMakeLists.txt +--- Yarock_0.9.64_11_source/src/CMakeLists.txt.system_libs 2013-11-22 14:39:03.374103112 -0600 ++++ Yarock_0.9.64_11_source/src/CMakeLists.txt 2013-11-22 14:45:24.992133011 -0600 +@@ -391,8 +391,8 @@ TARGET_LINK_LIBRARIES(yarock + ${TAGLIB_LIBRARIES} + ${QJSON_LIBRARIES} + ${ECHONEST_LIBRARIES} +- qtsingleapplication +- qxt ++ ${QTSINGLECOREAPPLICATION_LIBRARIES} ${QTSINGLEAPPLICATION_LIBRARIES} ++ ${QXT_LIBRARIES} + ) + + if (ENABLE_VLC) diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/sources b/sources new file mode 100644 index 0000000..60c38d0 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +957601ccafa55285d3494eae8943976b Yarock_0.9.67_source.tar.gz diff --git a/yarock-0.9.64-installationpath.patch b/yarock-0.9.64-installationpath.patch new file mode 100644 index 0000000..756861a --- /dev/null +++ b/yarock-0.9.64-installationpath.patch @@ -0,0 +1,14 @@ +--- src/CMakeLists.txt.orig 2013-11-01 16:55:44.000000000 +0330 ++++ src/CMakeLists.txt 2013-12-04 13:53:24.318101929 +0330 +@@ -407,8 +407,8 @@ + # INSTALL + # ------------------------------------------------------------------------------ + # -- install binary file +-install( TARGETS yarock DESTINATION /usr/local/bin/ ) ++install( TARGETS yarock DESTINATION /usr/bin/ ) + + # -- install translations files +-install(FILES ${YAROCK_QM_FILES} DESTINATION /usr/local/share/locale/yarock/) ++install(FILES ${YAROCK_QM_FILES} DESTINATION /usr/share/yarock/translations) + +\ No newline at end of file diff --git a/yarock-0.9.67-translation_path.patch b/yarock-0.9.67-translation_path.patch new file mode 100644 index 0000000..86270a7 --- /dev/null +++ b/yarock-0.9.67-translation_path.patch @@ -0,0 +1,11 @@ +--- src/CMakeLists.txt.orig 2014-05-10 13:53:01.219371795 +0430 ++++ src/CMakeLists.txt 2014-05-10 13:58:07.608923608 +0430 +@@ -433,5 +433,5 @@ + install( TARGETS yarock DESTINATION /usr/bin/ ) + + # -- install translations files +-install(FILES ${YAROCK_QM_FILES} DESTINATION /usr/share/locale/yarock/) +- +\ No newline at end of file ++install(FILES ${YAROCK_QM_FILES} DESTINATION /usr/share/yarock/translations/) ++ diff --git a/yarock.spec b/yarock.spec new file mode 100644 index 0000000..cc2f542 --- /dev/null +++ b/yarock.spec @@ -0,0 +1,115 @@ +Name: yarock +Version: 0.9.67 +Release: 1%{?dist} +Summary: A lightweight, beautiful music player +License: GPLv3+ +URL: https://launchpad.net/yarock +Source0: https://launchpad.net/yarock/trunk/%{version}/+download/Yarock_%{version}_source.tar.gz +# Fix translation files path - sent to upstream but was ignored +Patch0: yarock-0.9.67-translation_path.patch +BuildRequires: cmake >= 2.8.0 +BuildRequires: qt-devel >= 4.7.0 +BuildRequires: taglib-devel >= 1.6.2 +BuildRequires: qjson-devel >= 0.7.1 +BuildRequires: libechonest-devel >= 2.1.0 +BuildRequires: libqxt-devel +BuildRequires: qtsingleapplication-devel +BuildRequires: qtsinglecoreapplication-devel +BuildRequires: phonon-devel +BuildRequires: sqlite-devel +BuildRequires: desktop-file-utils +Requires: hicolor-icon-theme + +%description +Yarock is a music player designed to provide a clean, +simple and beautiful music collection based on album cover-art. + +%prep +%setup -q -n Yarock_%{version}_source +%patch0 -p0 -b .translation_path + +# Drop bundled stuff +pushd src3party +rm -rfv libechonest +rm -rfv qtsingleapplication +rm -rfv qxt +popd + +%build +mkdir -p %{_target_platform} +pushd %{_target_platform} +%cmake \ + -DUSE_SYSTEM_QTSINGLEAPPLICATION:BOOL=ON \ + -DUSE_SYSTEM_QXT:BOOL=ON \ + .. +popd +make %{?_smp_mflags} -C %{_target_platform} VERBOSE=1 + +%install +make install/fast DESTDIR=%{buildroot} -C %{_target_platform} +%find_lang %{name} --all-name --with-qt + +%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 || : + +%check +desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + +%files -f %{name}.lang +%doc README COPYING CHANGES +%{_bindir}/%{name} +%{_datadir}/icons/hicolor/*/*/* +%{_datadir}/applications/%{name}.desktop +%dir %{_datadir}/%{name}/ +%dir %{_datadir}/%{name}/translations + +%changelog +* Sat May 10 2014 James Abtahi 0.9.67-1 +- update for the latest version +- the patch .system_libs by Rex Dieter was applied to upstream +- the patch .installationpath was replaced by .translation_path + +* Wed Dec 04 2013 James Abtahi 0.9.64-3 +- install translation files in {_datadir}/{name}/translations + +* Sun Dec 01 2013 James Abtahi 0.9.64-2 +- fixed a typo in description +- added {_datadir}/locale/{name}/ +- added comments to patches + +* Sat Nov 30 2013 James Abtahi 0.9.64-2 +- revert to {_datadir}/icons/hicolor/*/*/* + +* Sat Nov 23 2013 James Abtahi 0.9.64-2 +- fixed a typo and added qtsinglecoreapplication-devel dependency +- added desktop-file-validate + +* Fri Nov 22 2013 Rex Dieter 0.9.64-2 +- use system qtsingleapplication, qxt libraries +- use %%cmake macro + +* Fri Nov 22 2013 James Abtahi 0.9.64-1 +- Added hicolor-icon-theme requirement and icon scriplets +- Added {_prefix} macro to cmake +- Removed redundant requirements +- Added VERBOSE to make +- Adding {optflags} + +* Wed Nov 20 2013 James Abtahi 0.9.64-1 +- Removed extra empty lines +- Some editing in Summary and Description +- Removed rm -rf in install section +- Removed clean section +- More specific file listing for {_datadir}/icons/hicolor/*/*/* + +* Sat Nov 16 2013 James Abtahi 0.9.64-1 +- Initial Build