packages: hydrogen/hydrogen.spec, hydrogen/hydrogen.desktop.patch (NEW), hy...

stivi stivi at pld-linux.org
Thu Jan 21 22:29:04 CET 2010


Author: stivi                        Date: Thu Jan 21 21:29:04 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to ver 0.9.4, works with qt4

---- Files affected:
packages/hydrogen:
   hydrogen.spec (1.31 -> 1.32) , hydrogen.desktop.patch (NONE -> 1.1)  (NEW), hydrogen-flac113.patch (1.1 -> NONE)  (REMOVED), hydrogen-gcc34.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/hydrogen/hydrogen.spec
diff -u packages/hydrogen/hydrogen.spec:1.31 packages/hydrogen/hydrogen.spec:1.32
--- packages/hydrogen/hydrogen.spec:1.31	Mon Apr  9 03:40:10 2007
+++ packages/hydrogen/hydrogen.spec	Thu Jan 21 22:28:58 2010
@@ -2,27 +2,31 @@
 Summary:	Pattern based drum machine
 Summary(pl.UTF-8):	Automat perkusyjny
 Name:		hydrogen
-Version:	0.9.3
+Version:	0.9.4
 Release:	1
-License:	GPL
+License:	GPL v2, zlib (TinyXML Library)
 Group:		X11/Applications/Sound
 Source0:	http://dl.sourceforge.net/hydrogen/%{name}-%{version}.tar.gz
-# Source0-md5:	d5840b5d330d433d00ea1727efb0fc7f
-Source1:	%{name}.desktop
-Patch0:		%{name}-gcc34.patch
-Patch1:		%{name}-flac113.patch
+# Source0-md5:	69b0e35a5bba8151347c5e6ec9e8e4f3
+Patch0:		%{name}.desktop.patch
 URL:		http://www.hydrogen-music.org/
+BuildRequires:	QtGui-devel >= 4.4.0
+BuildRequires:	QtNetwork-devel >= 4.4.0
+BuildRequires:	QtXml-devel >= 4.4.0
 BuildRequires:	alsa-lib-devel >= 1.0.0
-BuildRequires:	automake
-BuildRequires:	flac-devel
-BuildRequires:	jack-audio-connection-kit-devel >= 0.80.0
+BuildRequires:	flac-c++-devel
+BuildRequires:	jack-audio-connection-kit-devel >= 0.103.0
+BuildRequires:	lash-devel
 BuildRequires:	liblrdf-devel
-BuildRequires:	libsndfile-devel
-BuildRequires:	libstdc++-devel
+BuildRequires:	libsndfile-devel >= 1.0.17
+BuildRequires:	libtar-devel
 BuildRequires:	pkgconfig
-BuildRequires:	qmake
-BuildRequires:	qt-devel >= 6:3.2.1
-BuildRequires:	sed >= 4.0
+BuildRequires:	portaudio-devel
+BuildRequires:	portmidi-devel
+BuildRequires:	qt4-build
+BuildRequires:	qt4-linguist
+BuildRequires:	scons >= 0.98
+BuildRequires:	zlib-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -32,8 +36,8 @@
 
 %description -l pl.UTF-8
 Hydrogen jest "wolnym" automatem perkusyjnym opartym o paterny dla
-GNU/Linuksa. Celem programu jest umożliwienie w prosty i szybki sposób
-tworzenia paternów rytmicznych.
+GNU/Linuksa. Celem programu jest umożliwienie w prosty i szybki
+sposób tworzenia paternów rytmicznych.
 
 %package doc
 Summary:	Hydrogen manual and tutorial
@@ -49,60 +53,44 @@
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p0
+%patch0 -p0
+patch -p0 -s < patches/portaudio.patch
+patch -p0 -s < patches/portmidi.patch
 
 %build
-export QTDIR=%{_prefix}
-cp -f /usr/share/automake/config.sub admin
-
-# don't run update-menus (WTF is that?)
-sed -i -e 's|update-menus||' Makefile.in
-
-# clean up CVS trash
-find . -type d -name CVS -print | xargs rm -rf {} \;
-
-%configure
-%{__make} \
-	CXXFLAGS="%{rpmcflags}"
+%{__scons} \
+	prefix=%{_prefix} \
+	portaudio=1 \
+	portmidi=1 \
+	lash=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_mandir}/{man1,ru/man1},%{_pixmapsdir}}
 
-%{__make} install \
+%{__scons} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install data/doc/img/Tutorial2.h2song \
+	$RPM_BUILD_ROOT%{_datadir}/hydrogen/data/demo_songs
 
 # clean up documentation
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,sh}
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README.DOCUMENTATION.txt}
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot}
 rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/img/*.h2song
-rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/*.{sh,ts}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/man
-
-install data/doc/man/C/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
-install data/doc/man/ru/*.1 $RPM_BUILD_ROOT%{_mandir}/ru/man1
-install data/doc/img/Tutorial2.h2song \
-	$RPM_BUILD_ROOT%{_datadir}/hydrogen/data/demo_songs
-install data/img/gray/icon48.png \
-	$RPM_BUILD_ROOT%{_pixmapsdir}/hydrogen.png
+rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/i18n/*.ts
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog README
+%doc AUTHORS ChangeLog README.txt
 %attr(755,root,root) %{_bindir}/*
 
-%dir %{_libdir}/%{name}
-%dir %{_libdir}/%{name}/plugins
-%attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
-
 %dir %{_datadir}/hydrogen
 %dir %{_datadir}/hydrogen/data
 %dir %{_datadir}/hydrogen/data/demo_songs
+%dir %{_datadir}/hydrogen/data/i18n
 
 %{_datadir}/hydrogen/data/*.conf
 %{_datadir}/hydrogen/data/*.h2song
@@ -110,7 +98,7 @@
 %{_datadir}/hydrogen/data/drumkits
 %{_datadir}/hydrogen/data/img
 %{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_pixmapsdir}/*.svg
 
 # demo songs
 %{_datadir}/hydrogen/data/demo_songs/GM_*.h2song
@@ -122,17 +110,18 @@
 %lang(es) %{_datadir}/hydrogen/data/i18n/%{name}.es.qm
 %lang(fr) %{_datadir}/hydrogen/data/i18n/%{name}.fr.qm
 %lang(hu) %{_datadir}/hydrogen/data/i18n/%{name}.hu_HU.qm
+%lang(hr) %{_datadir}/hydrogen/data/i18n/%{name}.hr.qm
 %lang(it) %{_datadir}/hydrogen/data/i18n/%{name}.it.qm
 %lang(ja) %{_datadir}/hydrogen/data/i18n/%{name}.ja.qm
 %lang(nl) %{_datadir}/hydrogen/data/i18n/%{name}.nl.qm
 %lang(pl) %{_datadir}/hydrogen/data/i18n/%{name}.pl.qm
 %lang(pt) %{_datadir}/hydrogen/data/i18n/%{name}.pt_BR.qm
 %lang(ru) %{_datadir}/hydrogen/data/i18n/%{name}.ru.qm
-%{_mandir}/man1/*.1*
-%lang(ru) %{_mandir}/ru/man1/*.1*
+%lang(sv) %{_datadir}/hydrogen/data/i18n/%{name}.sv.qm
 
 %files doc
 %defattr(644,root,root,755)
+%doc data/doc/README.DOCUMENTATION.txt
 %dir %{_datadir}/hydrogen/data/doc
 %dir %{_datadir}/hydrogen/data/doc/img
 
@@ -140,13 +129,13 @@
 %{_datadir}/hydrogen/data/demo_songs/Tutorial2.h2song
 
 # images
-%lang(nl) %{_datadir}/hydrogen/data/doc/img/nl/*.png
+%lang(nl) %{_datadir}/hydrogen/data/doc/img/nl
 %{_datadir}/hydrogen/data/doc/img/*.png
 %{_datadir}/hydrogen/data/doc/img_tutorial
 %{_datadir}/hydrogen/data/doc/infoSplash
 
 # multilang manual & tutorial
-%lang(de) %{_datadir}/hydrogen/data/doc/manual_de.html
+%lang(ca) %{_datadir}/hydrogen/data/doc/manual_ca.html
 %lang(es) %{_datadir}/hydrogen/data/doc/manual_es.html
 %lang(fr) %{_datadir}/hydrogen/data/doc/manual_fr.html
 %lang(fr) %{_datadir}/hydrogen/data/doc/tutorial_fr.html
@@ -163,6 +152,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/01/21 21:28:58  stivi
+- up to ver 0.9.4, works with qt4
+
 Revision 1.31  2007/04/09 01:40:10  shadzik
 mass attack: qt-devel epoch
 

================================================================
Index: packages/hydrogen/hydrogen.desktop.patch
diff -u /dev/null packages/hydrogen/hydrogen.desktop.patch:1.1
--- /dev/null	Thu Jan 21 22:29:04 2010
+++ packages/hydrogen/hydrogen.desktop.patch	Thu Jan 21 22:28:58 2010
@@ -0,0 +1,21 @@
+--- hydrogen.desktop.orig	2010-01-21 16:30:06.150394521 +0100
++++ hydrogen.desktop	2010-01-21 16:30:34.803137742 +0100
+@@ -1,15 +1,18 @@
+ [Desktop Entry]
+ Name=Hydrogen Drum Machine
+ Name[de]=Hydrogen Drumsequencer
++Name[pl]=Automat Perkusyjny Hydrogen
+ Name[ru]=Драм-машина Hydrogen
+ Name[tr]=Hydrogen Davul Makinası
+ Comment=Create drum sequences
+ Comment[de]=Schlagzeugsequenzen erstellen
++Comment[pl]=Tworzenie sekwencji perkusyjnych
+ Comment[ru]=Создание партий ударных инструментов
+ Comment[tr]=Davul partisyonu yaz
+ 
+ GenericName=Drum Machine
+ GenericName[de]=Drumsequencer
++GenericName[pl]=Automat Perkusyjny
+ GenericName[ru]=Драм-машина
+ GenericName[tr]=Davul Makinası
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/hydrogen/hydrogen.spec?r1=1.31&r2=1.32&f=u



More information about the pld-cvs-commit mailing list