commit 52aeb0e4bb903c0e872b42305a2fbe05cd72917f
Author: Jacek Konieczny <[email protected]>
Date: Fri Dec 11 18:15:27 2015 +0100
Version: 0.4.0
qsynth-soundfont_dir.patch | 20 ++++++++++----------
qsynth.desktop | 10 ----------
qsynth.spec | 31 ++++++++++++++++++-------------
3 files changed, 28 insertions(+), 33 deletions(-)
---
diff --git a/qsynth.spec b/qsynth.spec
index b70b32e..8b06a77 100644
--- a/qsynth.spec
+++ b/qsynth.spec
@@ -1,19 +1,21 @@
Summary: Qt front-end to fluidsynth
Summary(pl.UTF-8): Oparta o Qt nakładka na fluidsynth
Name: qsynth
-Version: 0.2.6
-Release: 4
+Version: 0.4.0
+Release: 1
License: GPL
Group: X11/Applications/Sound
-Source0: http://dl.sourceforge.net/qsynth/%{name}-%{version}.tar.gz
-# Source0-md5: b7600cc92e668f25c82d0b049dde2bc4
-Source1: %{name}.desktop
+Source0:
http://downloads.sourceforge.net/qsynth/%{name}-%{version}.tar.gz
+# Source0-md5: 47f9a2784082372689db9bf220afd63f
Patch0: %{name}-soundfont_dir.patch
URL: http://qsynth.sourceforge.net/qsynth-index.html
+BuildRequires: Qt5Core-devel >= 5.1.0
+BuildRequires: Qt5Gui-devel >= 5.1.0
+BuildRequires: Qt5Widgets-devel >= 5.1.0
+BuildRequires: Qt5X11Extras-devel >= 5.1.0
BuildRequires: autoconf
BuildRequires: fluidsynth-devel >= 1.0.0
-BuildRequires: qmake
-BuildRequires: qt-devel >= 6:3.1.1
+BuildRequires: qt4-qmake
BuildRequires: sed >= 4.0
# because of EA in fluidsynth
ExclusiveArch: %{ix86} %{x8664}
@@ -27,7 +29,7 @@ QSynth jest nakładką graficzną na fluidsynth.
%prep
%setup -q
-%patch0 -p1
+%patch -p1
%build
QTDIR=%{_prefix}
@@ -45,15 +47,18 @@ install -d
$RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install icons/%{name}.png $RPM_BUILD_ROOT%{_pixmapsdir}
+%find_lang %{name} --with-qm --all-name
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(644,root,root,755)
%doc AUTHORS README TODO ChangeLog
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
%{_desktopdir}/*.desktop
-%{_pixmapsdir}/*.png
+%{_iconsdir}/*/*/*/*.png
+%{_mandir}/man1/%{name}.1*
+%{_datadir}/appdata/*.xml
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/translations
diff --git a/qsynth-soundfont_dir.patch b/qsynth-soundfont_dir.patch
index bfff684..5636844 100644
--- a/qsynth-soundfont_dir.patch
+++ b/qsynth-soundfont_dir.patch
@@ -1,12 +1,12 @@
-diff -dur qsynth-0.2.6.orig/src/qsynthOptions.cpp
qsynth-0.2.6/src/qsynthOptions.cpp
---- qsynth-0.2.6.orig/src/qsynthOptions.cpp 2006-11-07 10:01:19.000000000
+0100
-+++ qsynth-0.2.6/src/qsynthOptions.cpp 2009-11-26 18:03:08.000000000 +0100
-@@ -53,7 +53,7 @@
+diff -dur qsynth-0.4.0.orig/src/qsynthOptions.cpp
qsynth-0.4.0/src/qsynthOptions.cpp
+--- qsynth-0.4.0.orig/src/qsynthOptions.cpp 2015-09-07 16:59:23.000000000
+0200
++++ qsynth-0.4.0/src/qsynthOptions.cpp 2015-12-11 18:01:50.031289071 +0100
+@@ -80,7 +80,7 @@
- // Load defaults...
- m_settings.beginGroup("/Defaults");
-- sSoundFontDir = m_settings.readEntry("/SoundFontDir", QString::null);
-+ sSoundFontDir = m_settings.readEntry("/SoundFontDir",
QString("/usr/share/soundfonts"));
- bPresetPreview = m_settings.readBoolEntry("/PresetPreview", false);
- m_settings.endGroup();
+ // Load defaults...
+ m_settings.beginGroup("/Defaults");
+- sSoundFontDir = m_settings.value("/SoundFontDir").toString();
++ sSoundFontDir = m_settings.value("/SoundFontDir",
QString("/usr/share/soundfonts")).toString();
+ bPresetPreview = m_settings.value("/PresetPreview", false).toBool();
+ m_settings.endGroup();
diff --git a/qsynth.desktop b/qsynth.desktop
deleted file mode 100644
index a79a30b..0000000
--- a/qsynth.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=QSynth
-Comment=Qt front-end to fluidsynth
-Comment[pl]=Oparta o Qt nakładka na fluidsynth
-Exec=qsynth
-Icon=qsynth
-Terminal=false
-Type=Application
-Categories=Qt;Audio;Midi;
-# vi: encoding=utf-8
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qsynth.git/commitdiff/52aeb0e4bb903c0e872b42305a2fbe05cd72917f
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
