From 5df78fd3c91fd652423abb424b9fcac5311b7a3c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 02:43:01 +0000 Subject: [PATCH 1/5] Initialize branch F-7 for abe --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 883dcd7d52a07525d630aee2cac7e8c4c9ab6ff2 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sat, 2 Jun 2007 17:13:02 +0000 Subject: [PATCH 2/5] More useful download URL; Better .desktop file category --- abe.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/abe.spec b/abe.spec index 938476b..5e2d53c 100644 --- a/abe.spec +++ b/abe.spec @@ -1,12 +1,12 @@ Name: abe Version: 1.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games License: GPL URL: http://abe.sourceforge.net/ -Source0: http://dl.sourceforge.net/abe/abe-1.1.tar.gz +Source0: http://downloads.sourceforge.net/abe/abe-%{version}.tar.gz Source1: %{name}.png Patch0: abe-1.1-settings.patch @@ -47,7 +47,7 @@ Icon=abe.png Terminal=false Type=Application Encoding=UTF-8 -Categories=Game;Application;X-Fedora; +Categories=Game;ArcadeGame; EOF desktop-file-install --vendor fedora --dir $RPM_BUILD_ROOT/%{_datadir}/applications/ %{name}.desktop @@ -66,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/pixmaps/* %changelog +* Fri Jun 1 2007 Wart 1.1-5 +- Update desktop category for better game menu integration +- Use improved download URL. + * Thu Aug 31 2006 Wart 1.1-4 - Add missing BuildRequires From e0ff756d5b712e240d2623a83e4b4cacbabcf710 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 16 Aug 2007 20:56:50 +0000 Subject: [PATCH 3/5] License tag clarification --- abe.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/abe.spec b/abe.spec index 5e2d53c..6b0c3fe 100644 --- a/abe.spec +++ b/abe.spec @@ -4,7 +4,7 @@ Release: 5%{?dist} Summary: Scrolling, platform-jumping, ancient pyramid exploring game Group: Amusements/Games -License: GPL +License: GPL+ URL: http://abe.sourceforge.net/ Source0: http://downloads.sourceforge.net/abe/abe-%{version}.tar.gz Source1: %{name}.png @@ -60,12 +60,14 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc COPYING README %{_bindir}/* -%dir %{_datadir}/%{name} -%{_datadir}/%{name}/* +%{_datadir}/%{name} %{_datadir}/applications/* %{_datadir}/pixmaps/* %changelog +- License tag clarification +- Simplify %%file section + * Fri Jun 1 2007 Wart 1.1-5 - Update desktop category for better game menu integration - Use improved download URL. From 50d6fd3d7dc14dad70cd0fe49d77f03759dc2e71 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:24:18 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index bf9fcbd..0f5d919 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := abe 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a1fae791a29e56ca43ddd736870c778297f24dac Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:31:38 +0000 Subject: [PATCH 5/5] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch 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 0f5d919..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: abe -# $Id$ -NAME := abe -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 $$d/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/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7