From eb929431e893f53ee15223ff7d52edc609cb369e Mon Sep 17 00:00:00 2001 From: Orcan Ogetbil Date: Feb 13 2009 21:26:33 +0000 Subject: - Update to 0.9.4-beta3 (uses scons and qt4) --- diff --git a/.cvsignore b/.cvsignore index da418e1..101d92e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -hydrogen-0.9.3.tar.gz +hydrogen-0.9.4-beta3-790svn.tar.bz2 diff --git a/hydrogen-0.9.3-flac113.patch b/hydrogen-0.9.3-flac113.patch deleted file mode 100644 index 9563233..0000000 --- a/hydrogen-0.9.3-flac113.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix API compatibility with newer FLAC. -Taken from ArchLinux package. - ---- src/lib/FLACFile.cpp.old 2007-02-11 20:12:34.000000000 +0100 -+++ src/lib/FLACFile.cpp 2007-02-11 20:18:25.000000000 +0100 -@@ -33,6 +33,13 @@ - //#include "FLAC/file_decoder.h" - #include - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8 -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ -+ - /// Reads a FLAC file...not optimized yet - class FLACFile_real : public FLAC::Decoder::File, public Object - { -@@ -164,16 +171,28 @@ - } - - set_metadata_ignore_all(); -+ -+#ifdef LEGACY_FLAC - set_filename( sFilename.c_str() ); - - State s=init(); - if( s != FLAC__FILE_DECODER_OK ) { -+#else -+ FLAC__StreamDecoderInitStatus s=init(sFilename.c_str() ); -+ if(s!=FLAC__STREAM_DECODER_INIT_STATUS_OK) { -+#endif - errorLog( "[load] Error in init()" ); - } - -+#ifdef LEGACY_FLAC - if ( process_until_end_of_file() == false ) { - errorLog( "[load] Error in process_until_end_of_file()" ); - } -+#else -+ if ( process_until_end_of_stream() == false ) { -+ errorLog( "[load] Error in process_until_end_of_stream()" ); -+ } -+#endif - } - - diff --git a/hydrogen-0.9.3-g++4.patch b/hydrogen-0.9.3-g++4.patch deleted file mode 100644 index eb298f2..0000000 --- a/hydrogen-0.9.3-g++4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/lib/xml/tinyxml.h~ 2005-10-17 18:32:04.000000000 -0400 -+++ src/lib/xml/tinyxml.h 2006-04-26 16:57:39.000000000 -0400 -@@ -823,7 +823,7 @@ - #endif - - /// Construct. -- TiXmlDeclaration::TiXmlDeclaration( const char * _version, -+ TiXmlDeclaration( const char * _version, - const char * _encoding, - const char * _standalone ); - diff --git a/hydrogen-0.9.3-gcc43.patch b/hydrogen-0.9.3-gcc43.patch deleted file mode 100644 index 189859e..0000000 --- a/hydrogen-0.9.3-gcc43.patch +++ /dev/null @@ -1,50 +0,0 @@ -The STL headers in gcc-4.3 have been cleaned up, so that the headers don't drag in -unnecessary dependencies which aren't requested by the standard. -This fixes build for gcc-4.3 - -Lubomir Kundrak - -diff -rup hydrogen-0.9.3.orig/src/gui/DrumkitManager.h hydrogen-0.9.3/src/gui/DrumkitManager.h ---- hydrogen-0.9.3.orig/src/gui/DrumkitManager.h 2005-10-18 00:32:04.000000000 +0200 -+++ hydrogen-0.9.3/src/gui/DrumkitManager.h 2008-01-03 21:45:23.000000000 +0100 -@@ -43,6 +43,7 @@ - #include - - #include -+#include - - #include "UI/DrumkitManager_UI.h" - #include "lib/Object.h" -diff -rup hydrogen-0.9.3.orig/src/gui/main.cpp hydrogen-0.9.3/src/gui/main.cpp ---- hydrogen-0.9.3.orig/src/gui/main.cpp 2005-11-08 15:52:51.000000000 +0100 -+++ hydrogen-0.9.3/src/gui/main.cpp 2008-01-03 21:51:21.000000000 +0100 -@@ -43,6 +43,7 @@ - #include "lib/Exception.h" - - #include -+#include - using namespace std; - - void showInfo(); -diff -rup hydrogen-0.9.3.orig/src/lib/FLACFile.cpp hydrogen-0.9.3/src/lib/FLACFile.cpp ---- hydrogen-0.9.3.orig/src/lib/FLACFile.cpp 2008-01-03 21:06:25.000000000 +0100 -+++ hydrogen-0.9.3/src/lib/FLACFile.cpp 2008-01-03 21:39:52.000000000 +0100 -@@ -27,6 +27,7 @@ - - #include - #include -+#include - - #ifdef FLAC_SUPPORT - -diff -rup hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp ---- hydrogen-0.9.3.orig/src/tools/HydrogenPlayer.cpp 2005-10-18 00:32:04.000000000 +0200 -+++ hydrogen-0.9.3/src/tools/HydrogenPlayer.cpp 2008-01-04 23:30:06.000000000 +0100 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include "lib/Hydrogen.h" - #include "lib/LocalFileMng.h" diff --git a/hydrogen-0.9.3-libdir.patch b/hydrogen-0.9.3-libdir.patch deleted file mode 100644 index af2ef93..0000000 --- a/hydrogen-0.9.3-libdir.patch +++ /dev/null @@ -1,76 +0,0 @@ -Make hydrogen look for LADSPA plufins in the right places. -Please note that this patch is not completly correct -- @libdir@ -is originally meant to be included in makefiles and could possibly -contain make variables to expand. Nevertheless, when called by -the RPM build system, it is RPM who expands the path from _libdir -macros, so when this is built with RPM, we always get an expanded -path. - ---- hydrogen-0.9.3/src/lib/Preferences.cpp.libdir 2007-10-07 19:23:23.000000000 +0200 -+++ hydrogen-0.9.3/src/lib/Preferences.cpp 2007-10-07 19:24:29.000000000 +0200 -@@ -79,9 +79,8 @@ Preferences::Preferences() - m_ladspaPathVect.push_back(sLadspaPath); - } - else { -- m_ladspaPathVect.push_back( "/usr/lib/ladspa" ); -- m_ladspaPathVect.push_back( string( CONFIG_PREFIX ).append( "/lib/hydrogen/plugins" ) ); -- m_ladspaPathVect.push_back( "/usr/local/lib/ladspa" ); -+ m_ladspaPathVect.push_back( LIBDIR "/ladspa" ); -+ m_ladspaPathVect.push_back( LIBDIR "/hydrogen/plugins" ); - } - - m_pDefaultUIStyle = new UIStyle(); ---- hydrogen-0.9.3/hydrogen2Midi.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200 -+++ hydrogen-0.9.3/hydrogen2Midi.pro.in 2007-10-07 20:52:54.000000000 +0200 -@@ -9,6 +9,8 @@ - QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ - QMAKE_LFLAGS+=@ac_qmake_lflags@ - -+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\" -+ - SOURCES += \ - src/lib/xml/tinystr.cpp \ - src/lib/xml/tinyxml.cpp \ ---- hydrogen-0.9.3/hydrogenBenchmark.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200 -+++ hydrogen-0.9.3/hydrogenBenchmark.pro.in 2007-10-07 20:52:54.000000000 +0200 -@@ -10,6 +10,8 @@ - QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ - QMAKE_LFLAGS+=@ac_qmake_lflags@ - -+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\" -+ - SOURCES += \ - src/lib/xml/tinystr.cpp \ - src/lib/xml/tinyxml.cpp \ ---- hydrogen-0.9.3/hydrogenCUI.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200 -+++ hydrogen-0.9.3/hydrogenCUI.pro.in 2007-10-07 20:52:54.000000000 +0200 -@@ -9,6 +9,8 @@ - QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ - QMAKE_LFLAGS+=@ac_qmake_lflags@ - -+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\" -+ - SOURCES += \ - src/lib/xml/tinystr.cpp \ - src/lib/xml/tinyxml.cpp \ ---- hydrogen-0.9.3/hydrogenPlayer.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200 -+++ hydrogen-0.9.3/hydrogenPlayer.pro.in 2007-10-07 20:52:54.000000000 +0200 -@@ -9,6 +9,8 @@ - QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ -g - QMAKE_LFLAGS+=@ac_qmake_lflags@ - -+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\" -+ - SOURCES += \ - src/lib/xml/tinystr.cpp \ - src/lib/xml/tinyxml.cpp \ ---- hydrogen-0.9.3/hydrogen.pro.in.libdir 2007-10-07 19:30:43.000000000 +0200 -+++ hydrogen-0.9.3/hydrogen.pro.in 2007-10-07 20:52:54.000000000 +0200 -@@ -9,6 +9,7 @@ - QMAKE_CXXFLAGS+=@ac_qmake_cxxflags@ -g - QMAKE_LFLAGS+=@ac_qmake_lflags@ - -+QMAKE_CXXFLAGS+=-DLIBDIR=\"@libdir@\" - - SOURCES += \ - src/lib/xml/tinystr.cpp \ diff --git a/hydrogen-0.9.3-null-sample.patch b/hydrogen-0.9.3-null-sample.patch deleted file mode 100644 index 1dc2544..0000000 --- a/hydrogen-0.9.3-null-sample.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- src/lib/Hydrogen.cpp~ 2006-01-06 06:15:50.000000000 -0800 -+++ src/lib/Hydrogen.cpp 2006-07-22 16:41:44.000000000 -0700 -@@ -2491,9 +2491,8 @@ - Sample *pSample = Sample::load( sSampleFilename ); - // pSample->setFilename( pNewSample->getFilename() ); // riuso il path del nuovo sample (perche' e' gia relativo al path del drumkit) - if (pSample == NULL) { -- errorLog( "[loadDrumkit] Error Loading drumkit: NULL sample, now using /emptySample.wav" ); -- pSample->m_sFilename = string(DataPath::getDataPath() ).append( "/emptySample.wav" ); -- pSample = Sample::load( pSample->m_sFilename ); -+ errorLog( "[loadDrumkit] Error Loading drumkit: " + sSampleFilename + " sample, now using /emptySample.wav" ); -+ pSample = Sample::load( string(DataPath::getDataPath() ).append( "/emptySample.wav" )); - } - InstrumentLayer *pLayer = new InstrumentLayer( pSample ); - pLayer->m_fStartVelocity = pNewLayer->m_fStartVelocity; diff --git a/hydrogen-0.9.3-wasp.patch b/hydrogen-0.9.3-wasp.patch deleted file mode 100644 index 774984c..0000000 --- a/hydrogen-0.9.3-wasp.patch +++ /dev/null @@ -1,49 +0,0 @@ -Making gcc call linker honors the Build ID. Additionaly we want compiler -flags only from RPM and we do want to install the result in libdir -no matter what architecture are we on. - ---- hydrogen-0.9.3/plugins/wasp/Makefile.in.wasp 2005-11-10 20:39:20.000000000 +0100 -+++ hydrogen-0.9.3/plugins/wasp/Makefile.in 2007-10-07 18:47:01.000000000 +0200 -@@ -1,21 +1,20 @@ --INCLUDES = -I/usr/local/include/ -Iinclude --CC = gcc --CFLAGS = $(INCLUDES) -fPIC -DPIC -Wall -O2 -g -c -+INCLUDES = -Iinclude -+CFLAGS += $(INCLUDES) -nostartfiles -shared -fPIC -DPIC -+ - prefix = @ac_prefix@ -+exec_prefix = @prefix@ -+libdir = @libdir@ - - all: wasp_booster.so wasp_noisifier.so wasp_xshaper.so - - wasp_booster.so: plugins/booster.c -- $(CC) $(CFLAGS) -o plugins/booster.o plugins/booster.c -- ld -shared -o wasp_booster.so plugins/booster.o -+ $(CC) $(CFLAGS) -o wasp_booster.so plugins/booster.c - - wasp_noisifier.so: plugins/noisifier.c -- $(CC) $(CFLAGS) -o plugins/noisifier.o plugins/noisifier.c -- ld -shared -o wasp_noisifier.so plugins/noisifier.o -+ $(CC) $(CFLAGS) -o wasp_noisifier.so plugins/noisifier.c - - wasp_xshaper.so: plugins/x-shaper.c -- $(CC) $(CFLAGS) -o plugins/xshaper.o plugins/x-shaper.c -- ld -shared -o wasp_xshaper.so plugins/xshaper.o -+ $(CC) $(CFLAGS) -o wasp_xshaper.so plugins/x-shaper.c - - clean: - @rm -f `find . -name "*.o"` -@@ -23,9 +22,9 @@ - - install: - @echo "Installing WASP plugins" -- mkdir -p $(DESTDIR)$(prefix)/lib/hydrogen/plugins/ -- @install -vD *.so $(DESTDIR)$(prefix)/lib/hydrogen/plugins -+ mkdir -p $(DESTDIR)${libdir}/hydrogen/plugins/ -+ @install -vD *.so $(DESTDIR)${libdir}/hydrogen/plugins - - uninstall: -- @rm -rf $(DESTDIR)$(prefix)/lib/hydrogen -+ @rm -rf $(DESTDIR)${libdir}/hydrogen - diff --git a/hydrogen-internal-tinyxml.patch b/hydrogen-internal-tinyxml.patch new file mode 100644 index 0000000..e4454c9 --- /dev/null +++ b/hydrogen-internal-tinyxml.patch @@ -0,0 +1,110 @@ +diff -rupN hydrogen.old/hydrogen.kdevelop hydrogen/hydrogen.kdevelop +--- hydrogen.old/hydrogen.kdevelop 2009-02-13 14:22:04.000000000 -0500 ++++ hydrogen/hydrogen.kdevelop 2009-02-13 14:43:03.000000000 -0500 +@@ -180,13 +180,6 @@ + gui/src/widgets/moc_MidiActivityWidget.cc + gui/src/widgets/moc_midiTable.cc + gui/src/widgets/moc_Rotary.cc +- libs/hydrogen/src/xml +- libs/hydrogen/src/xml/tinystr.cpp +- libs/hydrogen/src/xml/tinystr.h +- libs/hydrogen/src/xml/tinyxml.cpp +- libs/hydrogen/src/xml/tinyxmlerror.cpp +- libs/hydrogen/src/xml/tinyxml.h +- libs/hydrogen/src/xml/tinyxmlparser.cpp + plugins + plugins/wasp + plugins/wasp/include +diff -rupN hydrogen.old/libs/hydrogen/hydrogen.pro hydrogen/libs/hydrogen/hydrogen.pro +--- hydrogen.old/libs/hydrogen/hydrogen.pro 2009-02-13 14:22:01.000000000 -0500 ++++ hydrogen/libs/hydrogen/hydrogen.pro 2009-02-13 14:43:03.000000000 -0500 +@@ -82,9 +82,6 @@ HEADERS += \ + include/hydrogen/smf/SMFEvent.h \ + \ + \ +- src/xml/tinystr.h \ +- src/xml/tinyxml.h \ +- \ + src/IO/AlsaMidiDriver.h \ + src/IO/DiskWriterDriver.h \ + src/IO/FakeDriver.h \ +@@ -99,11 +96,6 @@ HEADERS += \ + + + SOURCES += \ +- src/xml/tinystr.cpp \ +- src/xml/tinyxml.cpp \ +- src/xml/tinyxmlerror.cpp \ +- src/xml/tinyxmlparser.cpp \ +- \ + src/IO/alsa_midi_driver.cpp \ + src/IO/disk_writer_driver.cpp \ + src/IO/fake_driver.cpp \ +diff -rupN hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp hydrogen/libs/hydrogen/src/local_file_mgr.cpp +--- hydrogen.old/libs/hydrogen/src/local_file_mgr.cpp 2009-02-13 14:22:01.000000000 -0500 ++++ hydrogen/libs/hydrogen/src/local_file_mgr.cpp 2009-02-13 14:44:51.000000000 -0500 +@@ -47,7 +47,7 @@ + #include + #include + +-#include "xml/tinyxml.h" ++#include + + #include + //#include +diff -rupN hydrogen.old/libs/hydrogen/src/preferences.cpp hydrogen/libs/hydrogen/src/preferences.cpp +--- hydrogen.old/libs/hydrogen/src/preferences.cpp 2009-02-13 14:22:01.000000000 -0500 ++++ hydrogen/libs/hydrogen/src/preferences.cpp 2009-02-13 14:43:03.000000000 -0500 +@@ -42,7 +42,7 @@ + #include "config.h" + #include "version.h" + +-#include "xml/tinyxml.h" ++#include + #include + #include + +diff -rupN hydrogen.old/libs/hydrogen/src/song.cpp hydrogen/libs/hydrogen/src/song.cpp +--- hydrogen.old/libs/hydrogen/src/song.cpp 2009-02-13 14:22:01.000000000 -0500 ++++ hydrogen/libs/hydrogen/src/song.cpp 2009-02-13 14:43:03.000000000 -0500 +@@ -25,7 +25,7 @@ + + #include + +-#include "xml/tinyxml.h" ++#include + + #include + #include +diff -rupN hydrogen.old/Sconstruct hydrogen/Sconstruct +--- hydrogen.old/Sconstruct 2009-02-13 14:22:05.000000000 -0500 ++++ hydrogen/Sconstruct 2009-02-13 14:43:03.000000000 -0500 +@@ -72,7 +72,7 @@ def get_platform_flags( opts ): + if sys.platform == "darwin" and str(env['coreaudio']) == "1": cppflags.append('-DCOREAUDIO_SUPPORT') + + cppflags.append('-DLADSPA_SUPPORT') +- ++ ldflags.append('-ltinyxml') + + + if str(env['libarchive']) == "1": cppflags.append('-DLIBARCHIVE_SUPPORT') +@@ -237,6 +237,7 @@ def get_hydrogen_gui( lib_hydrogen , opt + + env.Append( LIBS = lib_hydrogen ) + env.Append( LIBS = ["sndfile"] ) ++ env.Append( LIBS = ["tinyxml"] ) + + if str(env['lrdf']) == "1": env.Append( LIBS = ["lrdf"] ) + if str(env['flac']) == "1": env.Append( LIBS = ["FLAC","FLAC++"] ) +@@ -366,6 +367,11 @@ if platform == "darwin" or platform == " + + #Check if all required libraries are installed + conf = Configure(env) ++ ++if not conf.CheckCXXHeader('tinyxml.h'): ++ print 'tinyxml must be installed!' ++ Exit(1) ++ + if not conf.CheckCHeader('sndfile.h'): + print 'libsndfile must be installed!' + Exit(1) diff --git a/hydrogen-snapshot.sh b/hydrogen-snapshot.sh new file mode 100644 index 0000000..b69d376 --- /dev/null +++ b/hydrogen-snapshot.sh @@ -0,0 +1,33 @@ +#!/bin/bash + +set -e + +tmp=$(mktemp -d) + +trap cleanup EXIT +cleanup() { + set +e + [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" +} + +unset CDPATH +pwd=$(pwd) +svn=$(date +%Y%m%d)svn +name=hydrogen +version=0.9.4-beta3 + +cd "$tmp" +svn co http://svn.assembla.com/svn/hydrogen/tags/$version $name +revision=$(svnversion $name) + +# We remove the .svn directories from the tarball to save space and we +# actually don't need them, except this one place where scons calls +# /usr/bin/svnversion to look up the version of these directories. +# We hack the build script so that it doesn't call /usr/bin/svnversion . +# This saves us a BR and ~2MB otherwise unneeded diskspace: +find ./$name -type d -name .svn -print0 | xargs -0r rm -rf +sed -i "s|\(revision():\)|\1\n\treturn \"$revision\"|" $name/Sconstruct + +tar jcf "$pwd"/$name-$version-"$revision"svn.tar.bz2 $name +echo "Wrote: " $name-$version-"$revision"svn.tar.bz2 +cd - >/dev/null diff --git a/hydrogen.spec b/hydrogen.spec index 5d823f4..b734249 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,58 +1,58 @@ +%define svn 790 + Summary: Advanced drum machine for GNU/Linux Name: hydrogen -Version: 0.9.3 -Release: 13%{?dist} +Version: 0.9.4 +Release: 0.1.%{svn}svn%{?dist} URL: http://www.hydrogen-music.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: hydrogen-0.9.3-g++4.patch -Patch1: hydrogen-0.9.3-flac113.patch -Patch3: hydrogen-0.9.3-wasp.patch -Patch4: hydrogen-0.9.3-libdir.patch -Patch5: hydrogen-0.9.3-null-sample.patch -Patch6: hydrogen-0.9.3-gcc43.patch +Source0: %{name}-%{version}-beta3-%{svn}svn.tar.bz2 +# For convenience, to take the svn snapshot: +Source9: hydrogen-snapshot.sh +# Use internal tinyxml instead of the one supplied by hydrogen: +# Sent upstream: +# https://sourceforge.net/mailarchive/message.php?msg_name=e76492710901221851m3a285da8n9422642afe443124%40mail.gmail.com +Patch0: hydrogen-internal-tinyxml.patch License: GPLv2+ Group: Applications/Multimedia BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: flac-devel jack-audio-connection-kit-devel liblrdf-devel -BuildRequires: qt3-devel libsndfile-devel alsa-lib-devel -BuildRequires: libxml2-devel desktop-file-utils +BuildRequires: qt4-devel libsndfile-devel alsa-lib-devel portaudio-devel +BuildRequires: desktop-file-utils lash-devel libtar-devel scons tinyxml-devel +BuildRequires: portmidi-devel %description -Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is -to bring professional yet simple and intuitive pattern-based drum -programming. +Hydrogen is an advanced drum machine for GNU/Linux. It's main goal is to bring +professional yet simple and intuitive pattern-based drum programming. %prep -%setup -q -%patch0 -p0 -b .g++4 -%patch1 -p0 -b .flac133 -%patch3 -p1 -b .wasp -%patch4 -p1 -b .libdir -%patch5 -p0 -b .null-sample -%patch6 -p1 -b .gcc43 +%setup -q -n %{name} +patch -p0 < patches/portaudio.patch +patch -p0 < patches/portmidi.patch +%patch0 -p1 -b .tinyxml %build -%configure --disable-oss-support -# Not using _smp_mflags macro: Dependencies are not tracked correctly in -# Makefiles, concurrency problems would occur -make +scons prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS" %install rm -rf $RPM_BUILD_ROOT -make DESTDIR=$RPM_BUILD_ROOT install +scons install DESTDIR=$RPM_BUILD_ROOT + # Reinstall hydrogen.desktop properly. rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop desktop-file-install --vendor fedora \ - --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --remove-category Application \ - --remove-category Sound \ + --dir $RPM_BUILD_ROOT%{_datadir}/applications \ --add-category X-Drumming \ --add-category X-MIDI \ --add-category X-Jack \ --remove-mime-type text/xml \ hydrogen.desktop +# Move the icon to the proper place +mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps +mv $RPM_BUILD_ROOT%{_datadir}/pixmaps/*.svg \ + $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps + %clean rm -rf $RPM_BUILD_ROOT @@ -69,14 +69,20 @@ if [ -x %{_bindir}/gtk-update-icon-cache ]; then fi %files -%defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README -%{_bindir}/hydrogen* -%{_libdir}/hydrogen +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING README.txt +# FIXME: The software still shows the old documentation internally. +# Remove these when this is fixed upstream: +%doc data/new_manual/* data/new_tutorial/* +%{_bindir}/hydrogen %{_datadir}/hydrogen %{_datadir}/applications/fedora-hydrogen.desktop +%{_datadir}/icons/hicolor/scalable/apps/*.svg %changelog +* Fri Feb 13 2009 Orcan Ogetbil - 0.9.4-0.1.790svn +- Update to 0.9.4-beta3 (uses scons and qt4) + * Fri Apr 04 2008 Lubomir Kundrak - 0.9.3-13 - QT3 changes by rdieter - Fix build diff --git a/sources b/sources index df28e46..4d531ec 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d5840b5d330d433d00ea1727efb0fc7f hydrogen-0.9.3.tar.gz +125369a770cd183a3250084146e739b5 hydrogen-0.9.4-beta3-790svn.tar.bz2