diff --git a/.cvsignore b/.cvsignore
index 101d92e..89fe912 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hydrogen-0.9.4-beta3-790svn.tar.bz2
+hydrogen-0.9.4-rc1-1.tar.gz
diff --git a/hydrogen-internal-tinyxml.patch b/hydrogen-internal-tinyxml.patch
deleted file mode 100644
index e4454c9..0000000
--- a/hydrogen-internal-tinyxml.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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.spec b/hydrogen.spec
index b734249..e5db704 100644
--- a/hydrogen.spec
+++ b/hydrogen.spec
@@ -1,85 +1,100 @@
-%define svn 790
+%global prerel rc1.1
+%global prerel2 rc1-1
Summary: Advanced drum machine for GNU/Linux
Name: hydrogen
Version: 0.9.4
-Release: 0.1.%{svn}svn%{?dist}
+Release: 0.2.%{prerel}%{?dist}
URL: http://www.hydrogen-music.org/
-Source0: %{name}-%{version}-beta3-%{svn}svn.tar.bz2
+Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}-%{prerel2}.tar.gz
# 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: qt4-devel libsndfile-devel alsa-lib-devel portaudio-devel
-BuildRequires: desktop-file-utils lash-devel libtar-devel scons tinyxml-devel
+BuildRequires: alsa-lib-devel
+BuildRequires: desktop-file-utils
+BuildRequires: flac-devel
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: lash-devel
+BuildRequires: liblrdf-devel
+BuildRequires: libsndfile-devel
+BuildRequires: libtar-devel
+BuildRequires: portaudio-devel
BuildRequires: portmidi-devel
+BuildRequires: qt-devel
+BuildRequires: scons
%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.
%prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}-%{prerel2}
patch -p0 < patches/portaudio.patch
patch -p0 < patches/portmidi.patch
-%patch0 -p1 -b .tinyxml
%build
-scons prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
+export QTDIR=%{_qt4_prefix}
+scons %{?_smp_mflags} prefix=%{_prefix} portaudio=1 portmidi=1 lash=1 oss=0 optflags="$RPM_OPT_FLAGS"
%install
rm -rf $RPM_BUILD_ROOT
+export QTDIR=%{_qt4_prefix}
scons install DESTDIR=$RPM_BUILD_ROOT
-# Reinstall hydrogen.desktop properly.
-rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
+
+# install hydrogen.desktop properly.
+#rm $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop
desktop-file-install --vendor fedora \
- --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ --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
+ --delete-original \
+ $RPM_BUILD_ROOT%{_datadir}/applications/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
+# No need to package these (they will not be installed automatically in rc2):
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \
+ $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
+
+
%clean
rm -rf $RPM_BUILD_ROOT
+
%post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ]; then
- %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+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 || :
+
+
%files
%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
+* Tue Apr 14 2009 Orcan Ogetbil - 0.9.4-0.2.rc1.1
+- Update to 0.9.4-rc1-1
+
* Fri Feb 13 2009 Orcan Ogetbil - 0.9.4-0.1.790svn
- Update to 0.9.4-beta3 (uses scons and qt4)
diff --git a/sources b/sources
index 4d531ec..c32314d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-125369a770cd183a3250084146e739b5 hydrogen-0.9.4-beta3-790svn.tar.bz2
+88f036f32153843997837a95c46ecbc5 hydrogen-0.9.4-rc1-1.tar.gz