diff --git a/.gitignore b/.gitignore index 6ee9f31..de050d1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,5 @@ fuse-0.10.0.2-noroms.tar.gz /fuse-1.1.0-noroms.tar.gz /fuse-1.1.1-noroms.tar.gz /fuse-1.2.0-noroms.tar.gz +/fuse-1.2.1-noroms.tar.gz +/fuse-1.3.0-noroms.tar.gz diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 4d5638f..abb527a 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -1,6 +1,6 @@ Name: fuse-emulator -Version: 1.2.0 -Release: 2%{?dist} +Version: 1.3.0 +Release: 1%{?dist} Summary: The Free UNIX Spectrum Emulator Group: Applications/Emulators License: GPLv2+ @@ -12,17 +12,16 @@ Source0: fuse-%{version}-noroms.tar.gz # tarball's directory: # ./generate-tarball.sh 0.9.0 Source1: generate-tarball.sh -Source2: fuse.png -Source3: README.z88sdk -Source4: README_fuseroms.fedora -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source2: README.z88sdk +Source3: README_fuseroms.fedora BuildRequires: alsa-lib-devel BuildRequires: bzip2-devel +BuildRequires: desktop-file-utils BuildRequires: gtk2-devel BuildRequires: libgcrypt-devel >= 1.1.42 BuildRequires: libICE-devel BuildRequires: libpng-devel -BuildRequires: libspectrum-devel >= 1.2.1 +BuildRequires: libspectrum-devel >= 1.3.0 BuildRequires: libxml2-devel BuildRequires: zlib-devel BuildRequires: bison @@ -52,33 +51,65 @@ chmod +x %{__perl_requires} %build -%configure +%configure --enable-desktop-integration make %{?_smp_mflags} %install rm -rf %{buildroot} make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps -install -pm0644 %{SOURCE2} %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +install -pm0644 %{SOURCE2} . install -pm0644 %{SOURCE3} . -install -pm0644 %{SOURCE4} . +desktop-file-install \ + --dir=%{buildroot}%{_datadir}/applications \ + %{buildroot}/%{_datadir}/applications/fuse.desktop + +%post +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : + + +%postun +if [ $1 -eq 0 ] ; then + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /bin/touch --no-create %{_datadir}/mime/packages &> /dev/null || : + /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : + /usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : +fi + +%posttrans +/usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : + %clean rm -rf %{buildroot} - %files -%defattr(-,root,root) %{_mandir}/man1/fuse.1.gz %{_bindir}/fuse %{_datadir}/fuse -%{_datadir}/icons/hicolor/64x64/apps/%{name}.png +%{_datadir}/applications/fuse.desktop +%{_datadir}/icons/hicolor/*/mimetypes/application-x-spectrum.png +%{_datadir}/icons/hicolor/*/apps/fuse.png +%{_datadir}/mime/packages/fuse.xml %doc AUTHORS ChangeLog COPYING README THANKS README.z88sdk README_fuseroms.fedora %changelog +* Wed Oct 05 2016 Lucian Langa - 1.3.0-1 +- misc cleanups +- add desktop integration files +- drop source2 (icon file) - project supplies its own icon file +- new upstream release + +* Fri Jul 29 2016 Lucian Langa - 1.2.1-2 +- rebuild for newer libspectrum + +* Wed Jul 20 2016 Lucian Langa - 1.2.1-1 +- new upstream release + * Sat Jun 11 2016 Lucian Langa - 1.2.0-2 - bump BR libspectrum version (thanks Sergio B) diff --git a/fuse.png b/fuse.png deleted file mode 100644 index 9bc9879..0000000 Binary files a/fuse.png and /dev/null differ diff --git a/sources b/sources index 51caf46..378f260 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad9a4dab88e4e885ceb82d293f4a3884 fuse-1.2.0-noroms.tar.gz +9e9537fdbe6c6c681cbae48b40dd86d7 fuse-1.3.0-noroms.tar.gz