dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: xpilot-ng
-# $Id$
-NAME := xpilot-ng
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

xpilot-ng.spec

@@ -11,9 +11,9 @@ Release:        12%{?dist}
 Summary:        Multiplayer space arcade game
 
 Group:          Amusements/Games
-License:        GPL
+License:        GPLv2+
 URL:            http://xpilot.sourceforge.net
-Source0:        http://dl.sourceforge.net/sourceforge/xpilot/xpilot-ng-%{version}.tar.gz
+Source0:        http://downloads.sourceforge.net/xpilot/xpilot-ng-%{version}.tar.gz
 Source1:        xpilot-ng.png
 Source2:        xpilot-ng-x11.desktop
 Source3:        xpilot-ng-sdl.desktop
@@ -110,11 +110,9 @@ chmod a+x $RPM_BUILD_ROOT/%{_datadir}/%{name}/mapconvert.py
 
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE2}
 desktop-file-install --vendor fedora                            \
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
-        --add-category X-Fedora                                 \
         %{SOURCE3}
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
 install -p -m 644 %{SOURCE1} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/
@@ -267,6 +265,10 @@ rm -rf $RPM_BUILD_ROOT
 %{logwatch_scripts}/shared/applyxpilotdate
 
 %changelog
+- License tag clarification
+- Remove X-Fedora from .desktop file
+- Better download URL
+
 * Fri Feb 23 2007 Wart <wart at kobold.org> 4.7.2-12
 - Update logwatch script with a previously unknown log field