Version: 0.5.3

diff --git a/desktop_install.patch b/desktop_install.patch
new file mode 100644 (file)
index 0000000..15adb7a
--- /dev/null
+++ b/desktop_install.patch
@@ -0,0 +1,11 @@
+--- qsynth-0.5.3/src/CMakeLists.txt~   2018-10-10 16:35:48.000000000 +0200
++++ qsynth-0.5.3/src/CMakeLists.txt    2018-11-19 09:57:29.000000000 +0100
+@@ -140,7 +140,7 @@
+      RUNTIME DESTINATION bin )
+   install ( FILES ${QM_FILES}
+      DESTINATION share/qsynth/translations )
+-  install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/qsynth.desktop
++  install ( FILES qsynth.desktop
+      DESTINATION share/applications )
+   install ( FILES images/qsynth.png
+      DESTINATION share/pixmaps )

diff --git a/qsynth.spec b/qsynth.spec
index 8b06a77687986908e7261011195d727177c076b9..fe37ba8deb726094c5a99a98345ff2cc1829a978 100644 (file)
--- a/qsynth.spec
+++ b/qsynth.spec
@@ -1,21 +1,22 @@
 Summary:       Qt front-end to fluidsynth
 Summary(pl.UTF-8):     Oparta o Qt nakładka na fluidsynth
 Name:          qsynth
-Version:       0.4.0
+Version:       0.5.3
 Release:       1
 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       http://downloads.sourceforge.net/qsynth/%{name}-%{version}.tar.gz
-# Source0-md5: 47f9a2784082372689db9bf220afd63f
+# Source0-md5: af719e0ad2dd624ad946dcc05e93cf97
 Patch0:                %{name}-soundfont_dir.patch
+Patch1:                desktop_install.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: qt4-qmake
+BuildRequires: cmake >= 2.6
+BuildRequires: fluidsynth-devel >= 2.0.0
+BuildRequires: qt5-qmake
 BuildRequires: sed >= 4.0
 # because of EA in fluidsynth
 ExclusiveArch: %{ix86} %{x8664}
@@ -29,24 +30,30 @@ QSynth jest nakładką graficzną na fluidsynth.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-QTDIR=%{_prefix}
-CFLAGS="$CFLAGS -I%{_includedir}/qt"
-CPPFLAGS="$CPPFLAGS -I%{_includedir}/qt"
-export CFLAGS CPPFLAGS QTDIR
-%{__autoconf}
-%configure
-%{__make}
+mkdir -p build
+cd build
+
+%cmake \
+       ..
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_desktopdir},%{_pixmapsdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/appdata,%{_mandir}/man1}
+
+cd build
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+cd ..
+
+install -m 644 src/appdata/*.xml  $RPM_BUILD_ROOT%{_datadir}/appdata
+install -m 644 qsynth.1 $RPM_BUILD_ROOT%{_mandir}/man1
+
 %find_lang %{name} --with-qm --all-name
 
 %clean
@@ -57,8 +64,8 @@ rm -rf $RPM_BUILD_ROOT
 %doc AUTHORS README TODO ChangeLog
 %attr(755,root,root) %{_bindir}/%{name}
 %{_desktopdir}/*.desktop
-%{_iconsdir}/*/*/*/*.png
 %{_mandir}/man1/%{name}.1*
 %{_datadir}/appdata/*.xml
+%{_pixmapsdir}/qsynth.png
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/translations