From 307fb1cb19af673f87e336e7a0ecaff516bbdb2d Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Sat, 11 Jun 2016 18:21:56 +0200 Subject: [PATCH 1/5] use the correct version in BR --- fuse-emulator.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 4d5638f..930c50b 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -22,7 +22,7 @@ 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.2.0 BuildRequires: libxml2-devel BuildRequires: zlib-devel BuildRequires: bison From f5fdbc3a6fd1615e85420712dc9c1a051108afe0 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 29 Jul 2016 22:36:55 +0200 Subject: [PATCH 2/5] new upstream release --- .gitignore | 1 + fuse-emulator.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6ee9f31..f3a4f5c 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ 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 diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 930c50b..873f0c2 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.2.1 +Release: 1%{?dist} Summary: The Free UNIX Spectrum Emulator Group: Applications/Emulators License: GPLv2+ @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* 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/sources b/sources index 51caf46..c45ac66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad9a4dab88e4e885ceb82d293f4a3884 fuse-1.2.0-noroms.tar.gz +a776316185e42b3618bc1b9811482697 fuse-1.2.1-noroms.tar.gz From 328fd1a79aa814adfe8856b4acd72656092adc6c Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 29 Jul 2016 22:39:44 +0200 Subject: [PATCH 3/5] require correct libpsectrum version --- fuse-emulator.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 873f0c2..12d03fc 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -22,7 +22,7 @@ BuildRequires: gtk2-devel BuildRequires: libgcrypt-devel >= 1.1.42 BuildRequires: libICE-devel BuildRequires: libpng-devel -BuildRequires: libspectrum-devel >= 1.2.0 +BuildRequires: libspectrum-devel >= 1.2.1 BuildRequires: libxml2-devel BuildRequires: zlib-devel BuildRequires: bison From 73ac3d894763e3168c671c8da2f6d1c166bf1e63 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Fri, 29 Jul 2016 22:47:29 +0200 Subject: [PATCH 4/5] rebuild for newer libspectrum --- fuse-emulator.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/fuse-emulator.spec b/fuse-emulator.spec index 12d03fc..5f231ab 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -1,6 +1,6 @@ Name: fuse-emulator Version: 1.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The Free UNIX Spectrum Emulator Group: Applications/Emulators License: GPLv2+ @@ -79,6 +79,9 @@ rm -rf %{buildroot} %changelog +* 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 From 2199b9dc31e8a968062bae8d9b709fb1b9cc8765 Mon Sep 17 00:00:00 2001 From: Lucian Langa Date: Wed, 5 Oct 2016 18:38:26 +0200 Subject: [PATCH 5/5] new upstream release --- .gitignore | 1 + fuse-emulator.spec | 53 +++++++++++++++++++++++++++++++++------------ fuse.png | Bin 1637 -> 0 bytes sources | 2 +- 4 files changed, 41 insertions(+), 15 deletions(-) delete mode 100644 fuse.png diff --git a/.gitignore b/.gitignore index f3a4f5c..de050d1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ fuse-0.10.0.2-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 5f231ab..abb527a 100644 --- a/fuse-emulator.spec +++ b/fuse-emulator.spec @@ -1,6 +1,6 @@ Name: fuse-emulator -Version: 1.2.1 -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,59 @@ 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 diff --git a/fuse.png b/fuse.png deleted file mode 100644 index 9bc98792f26b59797cdac21785cc3a7802c60ed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1637 zcmV-r2AcVaP)DruXx-KW5LK^S$Sub1qmc7K_DVu~;k? zi^XEGSS%Kc#bWt?L5|+6udkb4uZK=k%#a3**8Kd+75UJPudS__B#sfKh7Q!rWLREa zmUjxUzP@gPAYfx-1D&QrI})_pWV1PL-1yxG6XD5|CuVJJjU-7Z6^lcE=Xo9r3kxhA z5y9QRNYj+*LPf&kHYLZ}XHiWrO;{68_UgC1lO z20=KQdLku6#=w}v$09s>`<55=UCK%r&*xD?WN9e z1g#eBARy41D2hhfwg9bG>$m{DZg(^RMCb%9T+c%TL0@y~qe&jz-zBR<&de&>;xcz; zk{2%`(lkaXLz;Tb&rh+j5m9Rj#CaA@Pau1lu>K}QCw&@Q5c-D2^LcVvg-#9iogQ18 zZPI8^&~%y-Mtxj0TK(;HyT=9S_Ie`;AR>q{eD>L|s8lLsy*Z4;T>iMkci+Zz-5#yj zV>;=RrV&BQ07BT)^rMJ=Uz5*IGOiN-@%MFGgU;8&Qr!-0f0tG)S~&ESDqbhTQ$rcNFsh zzORYg3NxJve%RQgzSG_lZi?L47`56at?(tm_(?8boH=O74_E(1ZF37TCC;6hRRyllsY%l!`FJCsu=M8UO6{r?72Q4to89Lnv$)@y;;pwv$ z#r!mxtQ@q+eqGZK9WVyjn>oTT97%wqZS&x&SSXBK1QVmlX@ssZ$*?8K^gfj5r4~sqqXw(`Ndd#%Pa?Zw+Oo@%Hz)fJrsE z+&INTfvn?@#4+IrTNj{QE*}?Qetw>N_wJ2kC`l3)FRu{RYMh&KnaDIaeQw}voPcPd zGzEppCi`*D%nW7#5H2itc&a;tJuZXQtjhjkCj4ZvND{jk4risD7Ur^5zJEN)g}GTe z-Ofl0Hz28B^CnRg4P|We z?Iw#$OH?mh;N+!?EG;d4kOR@<$B&JwZS&^M8(Kjy^mh}b5}#hX#^U0lyz@8=aQpUc zbF@#s*XTr2=00000NkvXXu0mjfr+y3U diff --git a/sources b/sources index c45ac66..378f260 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a776316185e42b3618bc1b9811482697 fuse-1.2.1-noroms.tar.gz +9e9537fdbe6c6c681cbae48b40dd86d7 fuse-1.3.0-noroms.tar.gz