From 6aea7cc687a9b258d126825aba6f2928aadd027e Mon Sep 17 00:00:00 2001 From: Andrea Musuruane Date: Nov 08 2015 14:25:14 +0000 Subject: Updated to upstream 1.22-1 - Minor cleanup --- diff --git a/.gitignore b/.gitignore index 8be02c5..76f8a36 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /edgar-1.19-1.tar.gz /edgar-1.20-1.tar.gz /edgar-1.21.tar.gz +/edgar-1.22.tar.gz diff --git a/edgar.spec b/edgar.spec index 35e281f..8c3bb5c 100644 --- a/edgar.spec +++ b/edgar.spec @@ -1,5 +1,5 @@ Name: edgar -Version: 1.21 +Version: 1.22 Release: 1%{?dist} Summary: A platform game @@ -35,9 +35,6 @@ easy... sed -i 's:$(PREFIX)/share/games/edgar/:$(PREFIX)/share/edgar/:' \ makefile -# Use standard Fedora CFLAGS to compile -sed -i 's/^CFLAGS = -Wall -pedantic/CFLAGS +=/' makefile - %build export CFLAGS="%{optflags}" @@ -47,37 +44,32 @@ make %{?_smp_mflags} %install make install DESTDIR=%{buildroot} \ BIN_DIR=%{buildroot}%{_bindir}/ \ - DATA_DIR=%{buildroot}%{_datadir}/%{name}/ \ - DOC_DIR=%{buildroot}%{_pkgdocdir} + DATA_DIR=%{buildroot}%{_datadir}/%{name}/ desktop-file-install \ --delete-original \ --remove-key Encoding \ - --add-category=ActionGame \ --dir %{buildroot}%{_datadir}/applications \ %{buildroot}%{_datadir}/applications/%{name}.desktop -mkdir -p %{buildroot}%{_datadir}/appdata -install -pm0644 icons/%{name}.appdata.xml.in \ - %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml %find_lang %{name} %post -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null + /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : fi %posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang @@ -91,6 +83,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Sat Nov 07 2015 Andrea Musuruane - 1.22-1 +- Updated to upstream 1.22-1 +- Minor cleanup + * Sun Jun 21 2015 Andrea Musuruane - 1.21-1 - Updated to upstream 1.21-1 - Updated Source0 URL diff --git a/sources b/sources index f9675fa..52495ce 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7515663dccc25fc34ae038979670c367 edgar-1.21.tar.gz +f8246c5d3ad3d15aeb357eaead0e3e45 edgar-1.22.tar.gz