diff --git a/.gitignore b/.gitignore index d874fb4..2410b34 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /fmit-1.1.8.tar.gz /fmit-1.1.12.tar.gz /fmit-1.1.13.tar.gz +/fmit-1.2.6.tar.gz diff --git a/fmit.spec b/fmit.spec index f05de4f..e5ec1af 100644 --- a/fmit.spec +++ b/fmit.spec @@ -1,15 +1,15 @@ Summary: Free Music Instrument Tuner Name: fmit -Version: 1.1.13 -Release: 2%{?dist} +Version: 1.2.6 +Release: 1%{?dist} License: GPLv2+ and LGPLv2+ -Group: Applications/Multimedia URL: http://gillesdegottex.github.io/fmit/ -Source0: https://github.com/gillesdegottex/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +Source0: https://github.com/gillesdegottex/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: libappstream-glib -BuildRequires: qt4-devel +BuildRequires: qt5-devel +BuildRequires: itstool BuildRequires: freeglut-devel BuildRequires: libXi-devel BuildRequires: libXmu-devel @@ -19,34 +19,42 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: portaudio-devel BuildRequires: desktop-file-utils -%global the_icon_file %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %description %{name} is a graphical utility for tuning musical instruments, with error and volume history and advanced features like waveform shape, harmonics ratio (formants), and micro-tonal tuning. + %prep %setup -q -# Otherwise an icon is not visible in the menu (at least in GNOME). -sed -i 's#^Icon=.*#Icon=%{the_icon_file}#g' distrib/%{name}.desktop + +# disable acs_qt capture system on linux +sed -i 's/^\(CONFIG += acs_qt\)/# \1/g' fmit.pro + %build -%{qmake_qt4} PREFIX=%{_prefix} CONFIG+="acs_alsa acs_jack acs_portaudio" -lrelease-qt4 %{name}.pro -make %{?_smp_mflags} +%{qmake_qt5} PREFIX=%{_prefix} CONFIG+="acs_alsa acs_jack acs_portaudio" +lrelease-qt5 %{name}.pro +%make_build + %install -make INSTALL_ROOT=%{buildroot} install +%make_install INSTALL_ROOT=%{buildroot} + # we use svg icon rm -rf %{buildroot}%{_datadir}/icons/hicolor/128x128 + appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata.xml + desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop + mkdir -p %{buildroot}%{_datadir}/%{name}/tr/ cp -a tr/*.qm %{buildroot}%{_datadir}/%{name}/tr/ rm -f %{buildroot}%{_datadir}/%{name}/tr/*.ts %find_lang %{name} --with-qt --without-mo + %files -f %{name}.lang %license COPYING_GPL.txt COPYING_LGPL.txt %doc INSTALL.txt README.txt @@ -57,9 +65,16 @@ rm -f %{buildroot}%{_datadir}/%{name}/tr/*.ts %{_bindir}/%{name} %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml -%{the_icon_file} +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg +%{_datadir}/icons/hicolor/symbolic/apps/%{name}-symbolic.svg + %changelog +* Thu Jan 03 2019 Damian Wrobel - 1.2.6-2 +- Update to the latest available version. +- Switch to compile with qt5. +- Modernize .spec file. + * Fri Jul 13 2018 Fedora Release Engineering - 1.1.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 6249de4..5c25e1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (fmit-1.1.13.tar.gz) = e1febcd15c2425cda451cd4c4ca8396fe1651788f672f5d38ae4190691b3c2457fdfd8bb7aeb813e3f4c30ce29e6d435861f5df289b3839c9401aab1a607da8b +SHA512 (fmit-1.2.6.tar.gz) = 4ed6be980a433fa247b05de4913774b939c7da4191d98331991ad0fbe37bc62b17f4a052f1d510fe1b4d02c7c429f006398b1b0563564c35313cb4e38be5c6b3