From 9286ad2b79e89e57b0540010752be203edf39bd2 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:28:10 +0000 Subject: [PATCH 1/5] Initialize branch FC-6 for wfut --- 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 f2b4d380f2671664b57b039fb4eea53dc9f10db2 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 8 Feb 2007 01:07:04 +0000 Subject: [PATCH 2/5] Update to 1.1.0 --- .cvsignore | 2 +- sources | 2 +- wfut.spec | 12 ++++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5dae48..b4d8ceb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -WFUT-1.0-SNAPSHOT-src.tar.gz +WFUT-1.1.0.tar.gz diff --git a/sources b/sources index 3b7e79f..65d068f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -23d40558c121d5c52917846a36d48b80 WFUT-1.0-SNAPSHOT-src.tar.gz +72bed202a37f2aaee536a6264a4957f2 WFUT-1.1.0.tar.gz diff --git a/wfut.spec b/wfut.spec index bee2e63..ded6325 100644 --- a/wfut.spec +++ b/wfut.spec @@ -1,12 +1,12 @@ Name: wfut -Version: 1.0 -Release: 3%{?dist} +Version: 1.1.0 +Release: 1%{?dist} Summary: Software updater tool for WorldForge applications Group: Development/Libraries License: GPL URL: http://www.worldforge.org -Source0: http://white.worldforge.org/downloads/WFUT/srcs/WFUT-1.0-SNAPSHOT-src.tar.gz +Source0: http://dl.sourceforge.net/worldforge/srcs/WFUT-1.1.0.tar.gz Source1: wfut.desktop Source2: wfut.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -18,7 +18,7 @@ Software updater tool for WorldForge applications. %prep -%setup -q -n WFUT-1.0-SNAPSHOT +%setup -q -n WFUT-%{version} %build @@ -73,6 +73,10 @@ fi %changelog +* Wed Feb 7 2007 Wart 1.1.0-1 +- Update to 1.1.0 +- Upstream moved sources to SourceForge + * Thu Aug 17 2006 Wart 1.0-3 - Remove unnecessary startup script. - Added .desktop file From d36e652da89c0d9f4f3fd8e6aef4f4043db20b49 Mon Sep 17 00:00:00 2001 From: Michael Thomas Date: Thu, 23 Aug 2007 01:32:49 +0000 Subject: [PATCH 3/5] - License tag clarification - Use better download URL --- wfut.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/wfut.spec b/wfut.spec index ded6325..685c0d3 100644 --- a/wfut.spec +++ b/wfut.spec @@ -1,12 +1,12 @@ Name: wfut Version: 1.1.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Software updater tool for WorldForge applications Group: Development/Libraries -License: GPL +License: GPL+ URL: http://www.worldforge.org -Source0: http://dl.sourceforge.net/worldforge/srcs/WFUT-1.1.0.tar.gz +Source0: http://downloads.sourceforge.net/worldforge/WFUT-1.1.0.tar.gz Source1: wfut.desktop Source2: wfut.png BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -42,7 +42,6 @@ mv $RPM_BUILD_ROOT%{_bindir}/wfut-bin $RPM_BUILD_ROOT%{_bindir}/wfut 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 @@ -73,6 +72,9 @@ fi %changelog +- License tag clarification +- Use better download URL + * Wed Feb 7 2007 Wart 1.1.0-1 - Update to 1.1.0 - Upstream moved sources to SourceForge From c6e53d59fccecc06537a0aaf0a98bfcfc83d1d33 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:30 +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 4677fb1..8209390 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: wfut -# $Id$ +# $Id: Makefile,v 1.1 2006/09/04 01:31:51 wart Exp $ NAME := wfut 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 b52b45a3f6244f09174420d29a31d3f702a34246 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:16:17 +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 8209390..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wfut -# $Id: Makefile,v 1.1 2006/09/04 01:31:51 wart Exp $ -NAME := wfut -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