Author: jajcus Date: Sun Nov 22 09:56:20 2009 GMT Module: packages Tag: HEAD ---- Log message: - Version: 1.7.3 - Use kde4-kde3support for building - documentation building disabled (I don't know how to fix it)
---- Files affected: packages/rosegarden4: rosegarden4.spec (1.27 -> 1.28) , rosegarden4-link_order.patch (NONE -> 1.1) (NEW), rosegarden4-no_docs.patch (NONE -> 1.1) (NEW), rosegarden4-install.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/rosegarden4/rosegarden4.spec diff -u packages/rosegarden4/rosegarden4.spec:1.27 packages/rosegarden4/rosegarden4.spec:1.28 --- packages/rosegarden4/rosegarden4.spec:1.27 Wed Apr 16 23:35:50 2008 +++ packages/rosegarden4/rosegarden4.spec Sun Nov 22 10:56:14 2009 @@ -1,23 +1,25 @@ # $Revision$, $Date$ # TODO: -# installed but unpackaged +# - installed but unpackaged # /usr/share/apps/profiles/rosegarden.profile.xml # /usr/share/locale/en/LC_MESSAGES/rosegarden.mo -# rename spec to rosegarden +# - rename spec to rosegarden +# - fix documentation building # %define _name rosegarden # Summary: Rosegarden - an attractive audio and MIDI sequencer Summary(pl.UTF-8): Rosegarden - interaktywny sekwencer MIDI i audio Name: rosegarden4 -Version: 1.6.1 +Version: 1.7.3 Release: 1 License: GPL Group: X11/Applications/Sound Source0: http://dl.sourceforge.net/rosegarden/%{_name}-%{version}.tar.bz2 -# Source0-md5: 60efd0d0afcb3632d8188ef25082bcf9 +# Source0-md5: 122eab42e375d2f3b009c8540ae8069c Patch0: %{name}-desktop.patch -Patch1: %{name}-install.patch +Patch1: %{name}-link_order.patch +Patch2: %{name}-no_docs.patch URL: http://www.rosegardenmusic.com/ BuildRequires: alsa-lib-devel BuildRequires: cmake @@ -25,7 +27,8 @@ BuildRequires: fftw3-single-devel BuildRequires: gettext-devel BuildRequires: jack-audio-connection-kit-devel >= 0.80.0 -BuildRequires: kdelibs-devel >= 3.1 +BuildRequires: kde4-kde3support-devel +BuildRequires: kde4-kdelibs-devel BuildRequires: ladspa-devel BuildRequires: liblrdf-devel BuildRequires: lirc-devel @@ -36,6 +39,8 @@ Suggests: lilypond BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define _smp_mflags %{nil} + %description Rosegarden is an attractive, user-friendly audio and MIDI sequencer, score editor, and general-purpose music composition and editing @@ -48,9 +53,12 @@ %prep %setup -q -n %{_name}-%{version} %patch0 -p1 -#patch1 -p1 +%patch1 -p1 +%patch2 -p1 %build +export CMAKE_LIBRARY_PATH=/usr/lib/kde3dev +export CMAKE_INCLUDE_PATH=/usr/include/kde3 %cmake . \ -DWANT_LIRC=YES %{__make} @@ -92,6 +100,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.28 2009/11/22 09:56:14 jajcus +- Version: 1.7.3 +- Use kde4-kde3support for building +- documentation building disabled (I don't know how to fix it) + Revision 1.27 2008/04/16 21:35:50 sls - rel. 1 - some Suggests ================================================================ Index: packages/rosegarden4/rosegarden4-link_order.patch diff -u /dev/null packages/rosegarden4/rosegarden4-link_order.patch:1.1 --- /dev/null Sun Nov 22 10:56:20 2009 +++ packages/rosegarden4/rosegarden4-link_order.patch Sun Nov 22 10:56:14 2009 @@ -0,0 +1,62 @@ +--- rosegarden-1.7.3/src/CMakeLists.txt.orig 2009-11-22 09:37:52.000000000 +0100 ++++ rosegarden-1.7.3/src/CMakeLists.txt 2009-11-22 09:38:31.000000000 +0100 +@@ -76,6 +76,7 @@ + ENDIF(USE_PCH) + + TARGET_LINK_LIBRARIES(rosegardensequencer ++ RosegardenCommon + ${QT_AND_KDECORE_LIBS} + ${ALSA_LIBS} + ${JACK_LIBS} +@@ -83,7 +84,6 @@ + ${LRDF_LIBS} + ${FFTW3F_LIBS} + kdeui +- RosegardenCommon + ) + + # gui executable +@@ -137,6 +137,10 @@ + ENDIF(USE_PCH) + + TARGET_LINK_LIBRARIES(rosegarden ++ RosegardenExtended ++ RosegardenSegmentCanvas ++ RosegardenCommands ++ RosegardenCommon + ${QT_AND_KDECORE_LIBS} + ${LIBLO_LIBS} + ${LRDF_LIBS} +@@ -147,10 +151,6 @@ + kio + kdeui + kdeprint +- RosegardenExtended +- RosegardenSegmentCanvas +- RosegardenCommands +- RosegardenCommon + ) + + # Install targets +@@ -185,6 +185,10 @@ + ) + + TARGET_LINK_LIBRARIES(RosegardenTestDriver ++ RosegardenExtended ++ RosegardenSegmentCanvas ++ RosegardenCommands ++ RosegardenCommon + ${QT_AND_KDECORE_LIBS} + ${LIBLO_LIBS} + ${LRDF_LIBS} +@@ -195,10 +199,6 @@ + kio + kdeui + kdeprint +- RosegardenExtended +- RosegardenSegmentCanvas +- RosegardenCommands +- RosegardenCommon + ) + FOREACH(currenttest ${tests_SRCS}) + GET_FILENAME_COMPONENT(TestName ${currenttest} NAME_WE) ================================================================ Index: packages/rosegarden4/rosegarden4-no_docs.patch diff -u /dev/null packages/rosegarden4/rosegarden4-no_docs.patch:1.1 --- /dev/null Sun Nov 22 10:56:20 2009 +++ packages/rosegarden4/rosegarden4-no_docs.patch Sun Nov 22 10:56:14 2009 @@ -0,0 +1,12 @@ +--- rosegarden-1.7.3/CMakeLists.txt.orig 2009-02-08 05:20:17.000000000 +0100 ++++ rosegarden-1.7.3/CMakeLists.txt 2009-11-22 10:24:38.000000000 +0100 +@@ -340,9 +340,6 @@ + # Build and install the translations directory + ADD_SUBDIRECTORY(po RGbuild/po) + +-# Build and install the documentation directory +-ADD_SUBDIRECTORY(docs RGbuild/docs) +- + # Install data files + ADD_SUBDIRECTORY(data RGbuild/data) + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rosegarden4/rosegarden4.spec?r1=1.27&r2=1.28&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit