[adanaxisgpl] Remove no longer needed autoreconf call, %configure from redhat-rpm-config

Hans de Goede jwrdegoede at fedoraproject.org
Fri May 10 07:43:41 UTC 2013


commit dda9472774d617c8e02e79d1a399d8e3f3bb113e
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Fri May 10 09:47:36 2013 +0200

    Remove no longer needed autoreconf call, %configure from redhat-rpm-config
    
      >= 9.1.0-42 updates config.guess and config.sub for new architecture support
    - Remove vendor prefix from desktop files in F19+
    - Drop recovery .desktop file, this just clutters the menu, and can be done
      from the cmdline if needed

 adanaxisgpl.spec |   40 ++++++++++++++++------------------------
 1 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/adanaxisgpl.spec b/adanaxisgpl.spec
index 0732113..0acf962 100644
--- a/adanaxisgpl.spec
+++ b/adanaxisgpl.spec
@@ -1,7 +1,7 @@
 Summary:        Action game in four spatial dimensions
 Name:           adanaxisgpl
 Version:        1.2.5
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv2
 Group:          Amusements/Games
 URL:            http://www.mushware.com/
@@ -17,7 +17,6 @@ BuildRequires:  libtiff-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  pcre-devel
 BuildRequires:  SDL_mixer-devel
-BuildRequires:  libtool
 
 %description
 Adanaxis is a fast-moving first person shooter set in deep space, where the
@@ -39,7 +38,6 @@ Shading Language.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-autoreconf -f -i
 
 
 %build
@@ -49,22 +47,9 @@ make %{?_smp_mflags}
 # Build .desktop files
 cat > %{name}.desktop <<EOF
 [Desktop Entry]
-Encoding=UTF-8
 Name=Adanaxis GPL
 Comment=An action game in four spatial dimensions
-Exec=%{_bindir}/%{name} 
-Icon=%{name}
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Game;ActionGame;
-EOF
-
-cat > %{name}-recover.desktop <<EOF
-[Desktop Entry]
-Name=Adanaxis GPL (Recovery Mode)
-Comment=An action game in four spatial dimensions (Launch in Recovery Mode)
-Exec=%{_bindir}/%{name} --recover
+Exec=%{name} 
 Icon=%{name}
 Terminal=false
 Type=Application
@@ -74,16 +59,16 @@ EOF
 
 
 %install
-make DESTDIR=%{buildroot} INSTALL="install -p" CPPROG="cp -p" install
+%make_install INSTALL="install -p" CPPROG="cp -p"
 
 # Install desktop files
 mkdir -p %{buildroot}%{_datadir}/applications
-desktop-file-install --vendor=mushware         \
+desktop-file-install                           \
   --dir %{buildroot}%{_datadir}/applications   \
+%if 0%{?fedora} && 0%{?fedora} < 19
+ --vendor=mushware                             \
+%endif
   %{name}.desktop
-desktop-file-install --vendor=mushware         \
-  --dir %{buildroot}%{_datadir}/applications   \
-  %{name}-recover.desktop
 
 # Icons
 mkdir -p -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps
@@ -109,9 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files
 %doc COPYING README ChangeLog AUTHORS
-%{_bindir}/*
+%{_bindir}/%{name}
 %{_datadir}/%{name}
-%{_datadir}/applications/*
+%{_datadir}/applications/*%{name}.desktop
 %{_datadir}/icons/hicolor/16x16/apps/%{name}.png
 %{_datadir}/icons/hicolor/32x32/apps/%{name}.png
 %{_datadir}/icons/hicolor/48x48/apps/%{name}.png
@@ -119,6 +104,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri May 10 2013 Hans de Goede <hdegoede at redhat.com> - 1.2.5-16
+- Remove no longer needed autoreconf call, %%configure from redhat-rpm-config
+  >= 9.1.0-42 updates config.guess and config.sub for new architecture support
+- Remove vendor prefix from desktop files in F19+
+- Drop recovery .desktop file, this just clutters the menu, and can be done
+  from the cmdline if needed
+
 * Mon Apr 29 2013 Hans de Goede <hdegoede at redhat.com> - 1.2.5-15
 - Run autoreconf for aarch64 support (rhbz#924970)
 - Use xdg-open to open game manual


More information about the scm-commits mailing list