From 8add2cc06369812a4402138772c54d00b717740f Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:22:12 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for ularn --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 91d955822b3a85afd7d810682017da1a3832fc76 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Sun, 4 Mar 2007 04:15:32 +0000 Subject: [PATCH 2/5] - Update .desktop file categories - Use new upstream file location at Sourceforge --- ularn.desktop | 2 +- ularn.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ularn.desktop b/ularn.desktop index 0bb3ce5..6f870fb 100644 --- a/ularn.desktop +++ b/ularn.desktop @@ -7,5 +7,5 @@ Exec=Ularn Icon=ularn.png Terminal=true Type=Application -Categories=Application;Game; +Categories=Game;RolePlaying; Version=1.5p4 diff --git a/ularn.spec b/ularn.spec index 27da618..36063fa 100644 --- a/ularn.spec +++ b/ularn.spec @@ -1,12 +1,12 @@ Name: ularn Version: 1.5p4 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Simple roguelike game Group: Amusements/Games License: GPL URL: http://www.ularn.org -Source0: http://www.ularn.org/Ularn-1.5ishPL4.tar.gz +Source0: http://downloads.sourceforge.net/ularn/Ularn-1.5ishPL4.tar.gz Source1: config.sh.in Source2: ularn.desktop Source3: ularn.png @@ -59,7 +59,6 @@ touch $RPM_BUILD_ROOT/%{_var}/games/Ularn-scoreboard desktop-file-install --vendor fedora \ --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \ - --add-category X-Fedora \ %{SOURCE2} mkdir -p $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/32x32/apps/ @@ -92,6 +91,10 @@ fi %changelog +* Sat Mar 3 2007 Wart 1.5p4-8 +- Update .desktop file categories +- Use new upstream file location at Sourceforge + * Mon Aug 28 2006 Wart 1.5p4-7 - Fixed BR: ncurses -> ncurses-devel From 4b760431a18026eed0d670a9cc551028c1b29481 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Wed, 22 Aug 2007 05:16:13 +0000 Subject: [PATCH 3/5] License tag clarification --- ularn.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ularn.spec b/ularn.spec index 36063fa..1ae9912 100644 --- a/ularn.spec +++ b/ularn.spec @@ -1,10 +1,10 @@ Name: ularn Version: 1.5p4 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Simple roguelike game Group: Amusements/Games -License: GPL +License: GPL+ URL: http://www.ularn.org Source0: http://downloads.sourceforge.net/ularn/Ularn-1.5ishPL4.tar.gz Source1: config.sh.in @@ -91,6 +91,8 @@ fi %changelog +- License tag clarification + * Sat Mar 3 2007 Wart 1.5p4-8 - Update .desktop file categories - Use new upstream file location at Sourceforge From 30f4b10820f62bef7096b8b01629b87830ea0b67 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:14:07 +0000 Subject: [PATCH 4/5] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 26fa128..5904a19 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ularn -# $Id$ +# $Id: Makefile,v 1.1 2006/03/17 18:10:33 wart Exp $ NAME := ularn 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 5e0431d69bb9975b268069a32a2727c397d92adc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:41:10 +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 5904a19..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ularn -# $Id: Makefile,v 1.1 2006/03/17 18:10:33 wart Exp $ -NAME := ularn -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 d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6