- up to 2.1.2

- updated desktop file to muse2
- build switched to cmake
- new BRs
- R: lash
- removed ladcca and pch bcond
- removed patch0 (outdated)
- used sed to change install dircetory name
- added doc package for HTML/PDF files

diff --git a/muse.desktop b/muse.desktop
index 96fc0e66b930743015125d0b26f28cf7e13f7270..854c1f91b8f7980b9ab25793e0317f9fd4ea73aa 100644 (file)
--- a/muse.desktop
+++ b/muse.desktop
@@ -2,7 +2,7 @@
 Name=MuSE
 Comment=MuSE Audio/MIDI Sequnecer
 Comment[pl]=Sekwencer Audio/MIDI MuSE
-Exec=muse
+Exec=muse2
 Icon=muse
 Terminal=false
 Type=Application

diff --git a/muse.spec b/muse.spec
index 01202d6a42afbeb612c198931ab6224393179262..4ef9dee0535eb3460b9349a741bdd15daf95f02c 100644 (file)
--- a/muse.spec
+++ b/muse.spec
@@ -1,42 +1,38 @@
 #
 # Conditional build:
-%bcond_with    ladcca  # enable ladcca support
-%bcond_with    pch     # enable gcc 3.4.x pch support
 %bcond_without fluid   # disable fluidsynth support
 
 %ifnarch %{ix86} %{x8664}
 %undefine      with_fluid      # fluidsynth support disabled for arch !ix86 !amd64
 %endif
 
-#
 Summary:       Linux Music Editor
 Summary(pl.UTF-8):     Edytor muzyczny dla Linuksa
 Name:          muse
-Version:       0.7.1
-Release:       0.3
+Version:       2.1.2
+Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
-Source0:       http://dl.sourceforge.net/lmuse/%{name}-%{version}.tar.bz2
-# Source0-md5: 0e47ab9ba98d230e4fd7ea7ef40ed37c
+Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}.tar.gz
+# Source0-md5: ad917335ac05a3d62e3cd073af901001
 Source1:       %{name}.desktop
-Patch0:                %{name}-libtool.patch
 URL:           http://muse.seh.de/
+BuildRequires: QtDesigner-devel
+BuildRequires: QtSvg-devel
+BuildRequires: QtUiTools-devel
 BuildRequires: alsa-lib-devel >= 0.9.0
-BuildRequires: autoconf
-BuildRequires: automake
-%{?with_fluid:BuildRequires:   fluidsynth-devel >= 1.0.0}
-BuildRequires: jack-audio-connection-kit-devel
-%{?with_ladcca:BuildRequires:  ladcca-devel}
-BuildRequires: docbook-dtd41-sgml
-BuildRequires: doxygen
+BuildRequires: cmake >= 2.8.0
+BuildRequires: dssi-devel >= 0.9.0
+%{?with_fluid:BuildRequires:   fluidsynth-devel >= 0.9.0}
+BuildRequires: jack-audio-connection-kit-devel >= 0.103
+BuildRequires: ladspa-devel
+BuildRequires: lash-devel >= 0.2
+BuildRequires: liblo >= 0.23
 BuildRequires: libsamplerate-devel >= 0.1.0
-BuildRequires: libsndfile-devel
-BuildRequires: libtool
-BuildRequires: openjade
-BuildRequires: pkgconfig
-BuildRequires: qt-designer-libs
-BuildRequires: qt-devel >= 6:3.2.2
+BuildRequires: libsndfile-devel >= 1.0.25
+BuildRequires: libuuid-devel >= 0.1.8
 BuildRequires: rpmbuild(macros) >= 1.213
+Requires:      lash
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,32 +42,26 @@ capabilities.
 %description -l pl.UTF-8
 MuSE jest sekwencerem MIDI/Audio z możliwościami nagrywania i edycji.
 
+%package doc
+Summary:       Manual for %{name}
+Summary(pl.UTF-8):     Podręcznik dla MusE
+Group:         X11/Applications/Sound
+
+%description doc
+Documentation for %{name}.
+
+%description doc -l pl.UTF-8
+Dokumentacja do anta.
+
 %prep
 %setup -q
-%patch0 -p1
+sed -i 's,SET(MusE_INSTALL_NAME  "muse-2.1"),SET(MusE_INSTALL_NAME  "muse"),g' CMakeLists.txt
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoheader}
-%{__automake}
-%{__autoconf}
-
-QTDIR="%{_prefix}"
-export QTDIR
-
-# NOTE: you _must_ compile MusE with the same compiler you used to compile Qt
-%configure \
-       %{!?with_ladcca:--disable-ladcca} \
-       %{!?with_fluid:--disable-fluidsynth} \
-       %{?with_pch:--enable-pch} \
-       --disable-suid-build \
-       --disable-suid-install \
-       --enable-patchbay \
-       --with-docbook-stylesheets=%{_datadir}/sgml/docbook/dsssl-stylesheets \
-       --with-qt-includes=%{_includedir}/qt \
-       --with-qt-libraries=%{_libdir} \
-       --with-qt-prefix=%{_prefix}
+install -d build
+cd build
+%cmake \
+       ../
 
 %{__make}
 
@@ -79,9 +69,8 @@ export QTDIR
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
 
-%{__make} install \
+%{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT \
-       SUIDINSTALL="no"
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install packaging/muse_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/muse.png
@@ -92,18 +81,74 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/synthi/*.a
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+%update_icon_cache hicolor
+
+%postun
+%update_icon_cache hicolor
+
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog README README.softsynth SECURITY
-%attr(755,root,root) %{_bindir}/muse
+%doc ChangeLog README  README.de README.effects-rack README.instruments README.ladspaguis README.shortcuts README.softsynth README.translate README.usage SECURITY NEWS COPYING AUTHORS
+%attr(755,root,root) %{_bindir}/muse2
 %attr(755,root,root) %{_bindir}/grepmidi
 %dir %{_libdir}/%{name}
+%dir %{_libdir}/%{name}/modules
 %dir %{_libdir}/%{name}/plugins
-%dir %{_libdir}/%{name}/qtplugins
 %dir %{_libdir}/%{name}/synthi
+%attr(755,root,root) %{_libdir}/%{name}/modules/*.so
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*
-%attr(755,root,root) %{_libdir}/%{name}/qtplugins/designer/*
 %attr(755,root,root) %{_libdir}/%{name}/synthi/*
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/demos
+%dir %{_datadir}/%{name}/drummaps
+%dir %{_datadir}/%{name}/instruments
+%dir %{_datadir}/%{name}/locale
+%dir %{_datadir}/%{name}/plugins
+%dir %{_datadir}/%{name}/presets
+%dir %{_datadir}/%{name}/pybridge
+%dir %{_datadir}/%{name}/scoreglyphs
+%dir %{_datadir}/%{name}/scripts
+%dir %{_datadir}/%{name}/templates
+%dir %{_datadir}/%{name}/themes
+%dir %{_datadir}/%{name}/utils
+%dir %{_datadir}/%{name}/wallpapers
+%{_datadir}/mime/packages/muse.xml
+%{_datadir}/muse/didyouknow.txt
+%{_datadir}/muse/splash.png
+%{_datadir}/%{name}/demos/*
+%{_datadir}/%{name}/drummaps/*
+%{_datadir}/%{name}/instruments/*
+%{_datadir}/%{name}/locale/*
+%{_datadir}/%{name}/plugins/*
+%{_datadir}/%{name}/presets/*
+%{_datadir}/%{name}/pybridge/*
+%{_datadir}/%{name}/scoreglyphs/*
+%{_datadir}/%{name}/scripts/*
+%{_datadir}/%{name}/templates/*
+%{_datadir}/%{name}/themes/*
+%{_datadir}/%{name}/utils/*
+%{_datadir}/%{name}/wallpapers/*
 %{_desktopdir}/muse.desktop
 %{_pixmapsdir}/muse.png
-%{_datadir}/muse
+%{_mandir}/man1/*
+%{_iconsdir}/hicolor/64x64/apps/muse_icon.png
+
+%files doc
+%defattr(644,root,root,755)
+%dir %{_docdir}/%{name}
+%dir %{_docdir}/%{name}/muse_html
+%dir %{_docdir}/%{name}/muse_html/single
+%dir %{_docdir}/%{name}/muse_html/split
+%dir %{_docdir}/%{name}/muse_html/single/documentation
+%dir %{_docdir}/%{name}/muse_html/single/developer_docs
+%dir %{_docdir}/%{name}/muse_html/split/documentation
+%dir %{_docdir}/%{name}/muse_html/split/developer_docs
+%dir %{_docdir}/%{name}/muse_pdf
+%{_docdir}/%{name}/muse_pdf/*.pdf
+%{_docdir}/%{name}/muse_html/single/documentation/*
+%{_docdir}/%{name}/muse_html/single/developer_docs/*
+%{_docdir}/%{name}/muse_html/split/documentation/*
+%{_docdir}/%{name}/muse_html/split/developer_docs/*
+
+