rpms/hydrogen/devel .cvsignore, 1.3, 1.4 hydrogen.spec, 1.9, 1.10 sources, 1.3, 1.4 hydrogen-internal-tinyxml.patch, 1.1, NONE

[Orcan Ogetbil]

Author: oget

Update of /cvs/pkgs/rpms/hydrogen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27641

Modified Files:
	.cvsignore hydrogen.spec sources 
Removed Files:
	hydrogen-internal-tinyxml.patch 
Log Message:
* Tue Apr 14 2009 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.3.rc1.1
- Update to 0.9.4-rc1-1



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Feb 2009 21:06:07 -0000	1.3
+++ .cvsignore	14 Apr 2009 19:34:24 -0000	1.4
@@ -1 +1 @@
-hydrogen-0.9.4-beta3-790svn.tar.bz2
+hydrogen-0.9.4-rc1-1.tar.gz


Index: hydrogen.spec
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/hydrogen.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- hydrogen.spec	25 Feb 2009 05:56:44 -0000	1.9
+++ hydrogen.spec	14 Apr 2009 19:34:25 -0000	1.10
@@ -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.2.%{svn}svn%{?dist}
+Release:      0.3.%{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 %{?_smp_flags} 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 <oget [DOT] fedora [AT] gmail [DOT] com> - 0.9.4-0.3.rc1.1
+- Update to 0.9.4-rc1-1
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.4-0.2.790svn
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/hydrogen/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Feb 2009 21:06:07 -0000	1.3
+++ sources	14 Apr 2009 19:34:25 -0000	1.4
@@ -1 +1 @@
-125369a770cd183a3250084146e739b5  hydrogen-0.9.4-beta3-790svn.tar.bz2
+88f036f32153843997837a95c46ecbc5  hydrogen-0.9.4-rc1-1.tar.gz


--- hydrogen-internal-tinyxml.patch DELETED ---