diff --git a/.gitignore b/.gitignore index 2b3bb35..fa31fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ hydrogen-0.9.4.1.tar.gz /hydrogen-0.9.5.tar.gz /hydrogen-0.9.5.1.tar.gz /hydrogen-0.9.7.tar.gz +/hydrogen-1.0.1.tar.gz diff --git a/hydrogen-appdata-validation.patch b/hydrogen-appdata-validation.patch new file mode 100644 index 0000000..e50453b --- /dev/null +++ b/hydrogen-appdata-validation.patch @@ -0,0 +1,35 @@ +diff --git a/linux/org.hydrogenmusic.Hydrogen.appdata.xml b/linux/org.hydrogenmusic.Hydrogen.appdata.xml +index 249de11a..195dd9ea 100644 +--- a/linux/org.hydrogenmusic.Hydrogen.appdata.xml ++++ b/linux/org.hydrogenmusic.Hydrogen.appdata.xml +@@ -40,30 +40,5 @@ + + https://github.com/hydrogen-music/hydrogen/releases/tag/1.0.1 + +- +- https://github.com/hydrogen-music/hydrogen/releases/tag/1.0.0 +- +- +- https://github.com/hydrogen-music/hydrogen/releases/tag/1.0.0-rc1 +- +- +- https://github.com/hydrogen-music/hydrogen/releases/tag/1.0.0-beta2 +- +-

Second beta release ahead of 1.0. Changes since 0.9.7:

+- +- +- +- +- http://hydrogen-music.org/release_100_beta1 +- + + diff --git a/hydrogen.spec b/hydrogen.spec index 821ec67..adeab21 100644 --- a/hydrogen.spec +++ b/hydrogen.spec @@ -1,12 +1,14 @@ Summary: Advanced drum machine for GNU/Linux Name: hydrogen -Version: 0.9.7 -Release: 15%{?dist} +Version: 1.0.1 +Release: 1%{?dist} URL: http://www.hydrogen-music.org/ -Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz -Patch0: hydrogen-desktop.patch +Source0: https://github.com/hydrogen-music/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz License: GPLv2+ +# Workaround appdata validator version ordering bug +# See https://github.com/hughsie/appstream-glib/issues/234 +Patch0: %{name}-appdata-validation.patch BuildRequires: alsa-lib-devel BuildRequires: desktop-file-utils @@ -17,35 +19,23 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: pulseaudio-libs-devel BuildRequires: ladspa-devel BuildRequires: libsndfile-devel -BuildRequires: libtar-devel BuildRequires: libarchive-devel -BuildRequires: qt4-devel +BuildRequires: liblo-devel +BuildRequires: qt5-qtbase-devel +BuildRequires: qt5-qtxmlpatterns-devel +BuildRequires: qt5-linguist BuildRequires: cmake BuildRequires: cppunit-devel BuildRequires: make +BuildRequires: doxygen +BuildRequires: libappstream-glib -%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}} +Requires: hicolor-icon-theme %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. -# According to the old wasp home page -# http://linux01.gwdg.de/~nlissne/wasp/index.html -# wasp code is now maintained in hydrogen tree. -%package -n ladspa-wasp-plugins -Summary: Wave Sculpting Plugins -License: GPLv2+ -Requires: ladspa - -%description -n ladspa-wasp-plugins -The Wave Sculpting Plugins (WASP) is a set of LADSPA plugins which includes both -processors and generators. While being pretty simple and not CPU-hungry, they -incorporate such interesting algorithms as a multi-mode wave shaper, noisifier, -clipping booster and variable noise source. - -WASP is now part of the hydrogen drum machine. - %package devel Summary: Hydrogen header files License: GPLv2+ @@ -56,53 +46,42 @@ Obsoletes: devel <= 0.9.7-9 Header files for the hydrogen drum machine. %prep -%setup -q -%patch0 -p0 -b .desktop +%autosetup -p1 %build -export QTDIR=%{_qt4_prefix} -%cmake . -DCMAKE_POSITION_INDEPENDENT_CODE=ON +%cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWANT_DEBUG=OFF %cmake_build -## Build the wasp plugins -pushd src -pushd plugins - %{qmake_qt4} - make %{?_smp_mflags} -popd -popd - %install -export QTDIR=%{_qt4_prefix} %cmake_install # install hydrogen.desktop properly. desktop-file-install \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - --add-category X-Drumming \ - --add-category Midi \ - --add-category X-Jack \ - --add-category AudioVideoEditing \ - --remove-mime-type text/xml \ - --delete-original \ - $RPM_BUILD_ROOT%{_datadir}/applications/hydrogen.desktop + --dir %{buildroot}%{_datadir}/applications \ + --add-category X-Drumming \ + --add-category Midi \ + --add-category X-Jack \ + --add-category AudioVideoEditing \ + --remove-mime-type text/xml \ + --delete-original \ + %{buildroot}%{_datadir}/applications/org.hydrogenmusic.Hydrogen.desktop # Move the icon to the proper place -mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/ -cp $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/img/gray/*.svg \ - $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/ +mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ +cp %{buildroot}%{_datadir}/%{name}/data/img/gray/*.svg \ + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/ # No need to package these (they will not be installed automatically in rc3?): -rm -f $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/{Makefile,README}* \ - $RPM_BUILD_ROOT%{_datadir}/hydrogen/data/doc/*.{docbook,po,pot} +rm -f %{buildroot}%{_datadir}/%{name}/data/doc/{Makefile,README}* \ + %{buildroot}%{_datadir}/%{name}/data/doc/*.{docbook,po,pot} -#Install the wasp plugins -mkdir -p $RPM_BUILD_ROOT%{_libdir}/ladspa -cp -a src/plugins/libwasp*.so $RPM_BUILD_ROOT%{_libdir}/ladspa/ +# Move appdata to the proper place +mkdir -p %{buildroot}%{_metainfodir} +mv %{buildroot}%{_datadir}/appdata/org.hydrogenmusic.Hydrogen.appdata.xml \ + %{buildroot}%{_metainfodir} -#Move the man page to the proper place. -mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1 -mv $RPM_BUILD_ROOT/%{_prefix}/man/man1/hydrogen.1 $RPM_BUILD_ROOT%{_mandir}/man1/hydrogen.1 +# Validate appdata +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml %files %doc AUTHORS ChangeLog README.txt @@ -110,21 +89,21 @@ mv $RPM_BUILD_ROOT/%{_prefix}/man/man1/hydrogen.1 $RPM_BUILD_ROOT%{_mandir}/man1 %{_bindir}/hydrogen %{_bindir}/h2* %{_datadir}/hydrogen/ -%{_datadir}/applications/hydrogen.desktop +%{_datadir}/applications/org.hydrogenmusic.Hydrogen.desktop %{_datadir}/icons/hicolor/scalable/apps/*.svg -%{_libdir}/libhydrogen-core-0.9.7.so +%{_libdir}/libhydrogen-core-1.0.1.so %{_mandir}/man1/hydrogen.1* -%{_datadir}/appdata/hydrogen.appdata.xml - -%files -n ladspa-wasp-plugins -%doc src/plugins/wasp/AUTHORS src/plugins/wasp/ChangeLog -%license src/plugins/wasp/LICENSE -%{_libdir}/ladspa/libwasp*.so +%{_metainfodir}/org.hydrogenmusic.Hydrogen.appdata.xml %files devel %{_includedir}/hydrogen/ %changelog +* Fri Dec 18 2020 Guido Aulisi - 1.0.1-1 +- Update to 1.0.1 +- Use Qt5 +- Drop unmaintained subpackage ladspa-wasp-plugins + * Tue Aug 04 2020 Guido Aulisi - 0.9.7-15 - Fix FTBFS in Fedora rawhide/f33 (#1863864) - Some spec cleanup diff --git a/sources b/sources index 5a56283..a8dc99e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fcc5639144f74efdb70c76c8edfc4f64 hydrogen-0.9.7.tar.gz +SHA512 (hydrogen-1.0.1.tar.gz) = 95dd17acb610a0bd601260ab25c2b920bb1de464577069340420928860155015e1ef267c1bc2115f8521cd7ec044b9e88f84dd932ce76f5c98a5006619f28faa