rpms/muse/F-11 muse.spec, 1.3, 1.4 sources, 1.4, 1.5 muse-gcc44.patch, 1.1, NONE muse-log2f-aliasing-fix.patch, 1.1, NONE muse-size_t.patch, 1.1, NONE muse.desktop, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/muse/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20835

Modified Files:
	muse.spec sources 
Removed Files:
	muse-gcc44.patch muse-log2f-aliasing-fix.patch 
	muse-size_t.patch muse.desktop 
Log Message:
* Wed May 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.5.rc2
- Update to 1.0rc2



Index: muse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-11/muse.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- muse.spec	24 Feb 2009 21:23:00 -0000	1.3
+++ muse.spec	13 May 2009 23:14:07 -0000	1.4
@@ -1,4 +1,4 @@
-%define prerelease rc1
+%global prerelease rc2
 
 Name:          muse
 Summary:       Midi/Audio Music Sequencer
@@ -6,7 +6,7 @@ Summary:       Midi/Audio Music Sequence
 # See: https://fedoraproject.org/wiki/AudioCreation
 Epoch:         1
 Version:       1.0
-Release:       %{?prerelease:0.}4%{?prerelease:.%prerelease}%{?dist}
+Release:       %{?prerelease:0.}5%{?prerelease:.%prerelease}%{?dist}
 # synti/vam is GPLv2+
 # original freeverb plugin was public domain
 # some of the widgets are GPLv2
@@ -17,23 +17,25 @@ License:       GPL+ and GPLv2 and GPLv2+
 Group:         Applications/Multimedia
 URL:           http://www.muse-sequencer.org/
 Source0:       http://downloads.sourceforge.net/lmuse/%{name}-%{version}%{?prerelease}.tar.gz
-# The following .desktop file and the patches are submitted upstream. The first patch is
-# accepted and committed into the upstream CVS. The other ones are pending.
-Source1:       muse.desktop
-# In ssplugin.h, remove duplicate (obsolete) implementation of
-# fast_log*() functions and use new version from common header
-# instead:
-Patch0:        muse-log2f-aliasing-fix.patch
-# Fix for archs where size_t != unsigned int
-Patch1:        muse-size_t.patch
-# Make muse compilable against gcc-4.4
-Patch2:        muse-gcc44.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: desktop-file-utils libtool fluidsynth-devel qt3-devel graphviz
-BuildRequires: pkgconfig libcap-devel doxygen openjade docbook-style-dsssl
-BuildRequires: alsa-lib-devel e2fsprogs-devel jack-audio-connection-kit-devel
-BuildRequires: lash-devel libsndfile-devel libsamplerate-devel readline-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: docbook-style-dsssl
+BuildRequires: doxygen
+BuildRequires: e2fsprogs-devel
+BuildRequires: fluidsynth-devel
+BuildRequires: graphviz
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lash-devel
+BuildRequires: libcap-devel
+BuildRequires: libsamplerate-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtool
+BuildRequires: openjade
+BuildRequires: pkgconfig
+BuildRequires: qt3-devel
+BuildRequires: readline-devel
 
 Requires:      hicolor-icon-theme
 
@@ -46,18 +48,6 @@ for Linux.
 %prep
 %setup -q -n %{name}-%{version}%{?prerelease}
 
-%patch0 -p1 -b .log2f
-%patch1 -p1 -b .size_t
-%patch2 -p1 -b .gcc44
-
-# make sure plugins are searched for in the right directory in all archs.
-# These are fixed in the upstream CVS and these lines are to be removed in 
-# the next upstream release.
-for f in "muse/plugin.cpp" "synti/simpledrums/ssplugin.cpp" ; do
-   perl -p -i -e "s|/usr/lib/ladspa|%{_libdir}/ladspa|g" ${f}
-   perl -p -i -e "s|/usr/local/lib/ladspa|%{_usr}/local/%{_lib}/ladspa|g" ${f}
-done
-
 # Fix encoding issues (upstream is informed):
 for f in README.de README.softsynth SECURITY synti/vam/README; do
    iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp
@@ -74,10 +64,6 @@ done
            --enable-lash \
            --enable-static=no 
 
-# Disable rpath
-sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
 make %{?_smp_mflags}
 
 %install
@@ -114,22 +100,22 @@ install -pm 0644 packaging/muse_icon.png
 
 # desktop file
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install                          \
-   --dir %{buildroot}%{_datadir}/applications \
-   %{SOURCE1}
 
 # do not Provide plugins .so
-%define _use_internal_dependency_generator 0
+%global _use_internal_dependency_generator 0
 cat << \EOF > %{name}.prov
 #!%{_buildshell}
 grep -v %{_docdir} - | %{__find_provides} $* \
      | sed '/\.so\(()(64bit)\)\?$/d'
 EOF
 
-%define __find_provides %{_builddir}/%{name}-%{version}%{?prerelease}/%{name}.prov
+%global __find_provides %{_builddir}/%{name}-%{version}%{?prerelease}/%{name}.prov
 chmod +x %{__find_provides}
 
 
+%check
+desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
+
 %clean
 rm -rf %{buildroot}
 
@@ -158,6 +144,9 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/icons/hicolor/*/*/*
 
 %changelog 
+* Wed May 13 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.5.rc2
+- Update to 1.0rc2
+
 * Mon Feb 23 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> 1:1.0-0.4.rc1
 - Updated icon cache scriptlets according to the new guidlines
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/muse/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	24 Feb 2009 21:23:00 -0000	1.4
+++ sources	13 May 2009 23:14:07 -0000	1.5
@@ -1 +1 @@
-759a573aed1b6ce626357b386303ff4e  muse-1.0rc1.tar.gz
+76c76ed36c16c766baf2d6fa68f481fe  muse-1.0rc2.tar.gz


--- muse-gcc44.patch DELETED ---


--- muse-log2f-aliasing-fix.patch DELETED ---


--- muse-size_t.patch DELETED ---


--- muse.desktop DELETED ---