diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 37ca60e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: yadex -# $Id$ -NAME := yadex -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) diff --git a/yadex.desktop b/yadex.desktop index 271aaf6..0e7b33d 100644 --- a/yadex.desktop +++ b/yadex.desktop @@ -8,4 +8,4 @@ Icon=yadex.png Terminal=true Type=Application Categories=Application;GUIDesigner;Graphics; -Version=1.7.0 +Version=1.0 diff --git a/yadex.spec b/yadex.spec index 72318e5..f412f8f 100644 --- a/yadex.spec +++ b/yadex.spec @@ -1,10 +1,10 @@ Name: yadex Version: 1.7.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Doom level editor Group: Amusements/Graphics -License: GPL +License: GPLv2+ URL: http://www.teaser.fr/~amajorel/yadex Source0: http://www.teaser.fr/~amajorel/yadex/yadex-1.7.0.tar.gz Source1: yadex.desktop @@ -64,7 +64,6 @@ install -p -m644 docsrc/%{name}.6.new $RPM_BUILD_ROOT/%{_mandir}/man6/ # .desktop file integration desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ %{SOURCE1} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ install -p -m 644 %{SOURCE2} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/48x48/apps/ @@ -100,6 +99,10 @@ fi %changelog +* Tue Aug 21 2007 Wart 1.7.0-7 +- Minor .desktop file cleanup +- License tag clarification + * Tue Oct 17 2006 Wart 1.7.0-6 - Own an extra directory