[asylum] Build with RPM_OPT_FLAGS and RPM_LD_FLAGS, fix desktop entry warnings.

Ville Skyttä scop at fedoraproject.org
Sat May 5 08:13:31 UTC 2012


commit fac2f9f6711cd838d59f2fe8dffd0d85a0b248b8
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sat May 5 11:09:05 2012 +0300

    Build with RPM_OPT_FLAGS and RPM_LD_FLAGS, fix desktop entry warnings.

 asylum-0.2.4-makefile.patch |   24 ------------------------
 asylum.spec                 |   11 +++++++----
 2 files changed, 7 insertions(+), 28 deletions(-)
---
diff --git a/asylum.spec b/asylum.spec
index 94d95e5..89fb1f2 100644
--- a/asylum.spec
+++ b/asylum.spec
@@ -1,6 +1,6 @@
 Name:           asylum
 Version:        0.3.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        SDL port of the game Asylum, originally for the Archimedes
 Group:          Amusements/Games
 # For detailed licensing, see the README
@@ -34,17 +34,16 @@ rm -f %{name}
 
 
 %build
-make %{?_smp_mflags} RPMFLAGS="%{optflags}"
+make %{?_smp_mflags} CFLAGS="%{optflags}" LDFLAGS="%{?__global_ldflags}"
 
 # Build desktop icon
 cat >%{name}.desktop <<EOF
 [Desktop Entry]
-Encoding=UTF-8
 Name=Asylum
 GenericName=Platform Game
 Comment=%{summary}
 Exec=%{name}
-Icon=%{name}.png
+Icon=%{name}
 Terminal=false
 Type=Application
 StartupNotify=false
@@ -98,6 +97,10 @@ fi
 
 
 %changelog
+* Fri May  4 2012 Ville Skyttä <ville.skytta at iki.fi> - 0.3.2-2
+- Build with RPM_OPT_FLAGS and RPM_LD_FLAGS.
+- Fix desktop entry warnings.
+
 * Fri Apr 27 2012 Peter Robinson <pbrobinson at fedoraproject.org> - 0.3.2-1
 - Update 0.3.2 - Fix FTBFS, drop not needed patch
 


More information about the scm-commits mailing list