From faf144d1616281270c12a88e10d812af0a77582f Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:23:24 +0000 Subject: [PATCH 01/10] Initialize branch FC-6 for uqm-content --- 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 789f67e89c5cddb5daeb5ec19dfd0cec3c2764c5 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 22 Dec 2006 20:29:01 +0000 Subject: [PATCH 02/10] Version 0.6.0 --- .cvsignore | 6 +++--- sources | 6 +++--- uqm-content.spec | 11 ++++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index a82fc16..02c0b99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -uqm-0.5.0-3domusic.uqm -uqm-0.5.0-content.uqm -uqm-0.5.0-voice.uqm +uqm-0.6.0-content.uqm +uqm-0.6.0-3domusic.uqm +uqm-0.6.0-voice.uqm diff --git a/sources b/sources index 90d2296..d37e799 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.5.0-3domusic.uqm -1d03864b141a2626a7284bc7cfdefb47 uqm-0.5.0-content.uqm -52a084cfaa0bc7fcc63a295feb8cbd28 uqm-0.5.0-voice.uqm +7e8f0ed8490e24231431420ea2ba6a03 uqm-0.6.0-content.uqm +a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.6.0-3domusic.uqm +d31577b896be935cc2238afd07299b8b uqm-0.6.0-voice.uqm diff --git a/uqm-content.spec b/uqm-content.spec index 16b48c0..fcb5c88 100644 --- a/uqm-content.spec +++ b/uqm-content.spec @@ -1,8 +1,8 @@ %define uqm_contentdir %{_datadir}/games/uqm/content/packages Name: uqm-content -Version: 0.5.0 -Release: 1 +Version: 0.6.0 +Release: 1%{?dist} Summary: Base content files for The Ur-Quan Masters Group: Amusements/Games @@ -14,11 +14,12 @@ Source2: http://download.sourceforge.net/sc2/uqm-%{version}-3domusic.uqm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -PreReq: uqm >= 0.5.0 +PreReq: uqm >= %{version} %description %{summary}. + %package voice Summary: Optional speech package for The Ur-Quan Masters Requires: %{name} = %{version}-%{release} @@ -27,6 +28,7 @@ Group: %{group} %description voice %{summary}. + %package 3domusic Summary: Optional 3DO music package for The Ur-Quan Masters Requires: %{name} = %{version}-%{release} @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-1 +- Upstream 0.6.0 + * Mon Feb 6 2006 Ville Skyttä - 0.5.0-1 - 0.5.0. From 865a85735670f4eb0611177062b50b2d92f35dcb Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Fri, 22 Dec 2006 20:29:06 +0000 Subject: [PATCH 03/10] Version 0.6.0 --- .cvsignore | 6 +++--- sources | 6 +++--- uqm-content.spec | 11 ++++++++--- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index a82fc16..02c0b99 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,3 @@ -uqm-0.5.0-3domusic.uqm -uqm-0.5.0-content.uqm -uqm-0.5.0-voice.uqm +uqm-0.6.0-content.uqm +uqm-0.6.0-3domusic.uqm +uqm-0.6.0-voice.uqm diff --git a/sources b/sources index 90d2296..d37e799 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.5.0-3domusic.uqm -1d03864b141a2626a7284bc7cfdefb47 uqm-0.5.0-content.uqm -52a084cfaa0bc7fcc63a295feb8cbd28 uqm-0.5.0-voice.uqm +7e8f0ed8490e24231431420ea2ba6a03 uqm-0.6.0-content.uqm +a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.6.0-3domusic.uqm +d31577b896be935cc2238afd07299b8b uqm-0.6.0-voice.uqm diff --git a/uqm-content.spec b/uqm-content.spec index 16b48c0..fcb5c88 100644 --- a/uqm-content.spec +++ b/uqm-content.spec @@ -1,8 +1,8 @@ %define uqm_contentdir %{_datadir}/games/uqm/content/packages Name: uqm-content -Version: 0.5.0 -Release: 1 +Version: 0.6.0 +Release: 1%{?dist} Summary: Base content files for The Ur-Quan Masters Group: Amusements/Games @@ -14,11 +14,12 @@ Source2: http://download.sourceforge.net/sc2/uqm-%{version}-3domusic.uqm BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -PreReq: uqm >= 0.5.0 +PreReq: uqm >= %{version} %description %{summary}. + %package voice Summary: Optional speech package for The Ur-Quan Masters Requires: %{name} = %{version}-%{release} @@ -27,6 +28,7 @@ Group: %{group} %description voice %{summary}. + %package 3domusic Summary: Optional 3DO music package for The Ur-Quan Masters Requires: %{name} = %{version}-%{release} @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-1 +- Upstream 0.6.0 + * Mon Feb 6 2006 Ville Skyttä - 0.5.0-1 - 0.5.0. From 177a0ffa88bde9e43856a5cb73bcbd1ecec2af97 Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Sat, 23 Dec 2006 03:08:56 +0000 Subject: [PATCH 04/10] Dropping disttag on a package that doesn't change between distributions. --- uqm-content.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm-content.spec b/uqm-content.spec index fcb5c88..b0dfd99 100644 --- a/uqm-content.spec +++ b/uqm-content.spec @@ -2,7 +2,7 @@ Name: uqm-content Version: 0.6.0 -Release: 1%{?dist} +Release: 2 Summary: Base content files for The Ur-Quan Masters Group: Amusements/Games @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-2 +- Dropping disttag -- this package does not change between distributions. + * Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-1 - Upstream 0.6.0 From 132e547955b32409db0bef2113879e95c1d499fe Mon Sep 17 00:00:00 2001 From: Konstantin Ryabitsev Date: Sat, 23 Dec 2006 03:11:31 +0000 Subject: [PATCH 05/10] Same for FC-5 and devel --- uqm-content.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/uqm-content.spec b/uqm-content.spec index fcb5c88..b0dfd99 100644 --- a/uqm-content.spec +++ b/uqm-content.spec @@ -2,7 +2,7 @@ Name: uqm-content Version: 0.6.0 -Release: 1%{?dist} +Release: 2 Summary: Base content files for The Ur-Quan Masters Group: Amusements/Games @@ -70,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-2 +- Dropping disttag -- this package does not change between distributions. + * Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-1 - Upstream 0.6.0 From cfb7f33776895b3de8ba717bdf4de875f61dcd32 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Thu, 11 Sep 2008 14:20:24 +0000 Subject: [PATCH 06/10] dead package due to licensing issue --- dead.package | 5 +++ sources | 3 -- uqm-content.spec | 97 ------------------------------------------------ 3 files changed, 5 insertions(+), 100 deletions(-) create mode 100644 dead.package delete mode 100644 sources delete mode 100644 uqm-content.spec diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d990d74 --- /dev/null +++ b/dead.package @@ -0,0 +1,5 @@ +The content bits for uqm (Ur-Quan Masters) were under Creative Commons Attribution-NonCommercial-ShareAlike. +The NonCommercial part makes them not okay for Fedora, so this package is now dead. The main uqm package has +been converted to use autodownloader, and now Provides/Obsoletes this package. + +Tom "spot" Callaway Thursday, September 11, 2008 diff --git a/sources b/sources deleted file mode 100644 index d37e799..0000000 --- a/sources +++ /dev/null @@ -1,3 +0,0 @@ -7e8f0ed8490e24231431420ea2ba6a03 uqm-0.6.0-content.uqm -a20cacc8e66f5ff1fdf5e1d3a3b93fd2 uqm-0.6.0-3domusic.uqm -d31577b896be935cc2238afd07299b8b uqm-0.6.0-voice.uqm diff --git a/uqm-content.spec b/uqm-content.spec deleted file mode 100644 index b0dfd99..0000000 --- a/uqm-content.spec +++ /dev/null @@ -1,97 +0,0 @@ -%define uqm_contentdir %{_datadir}/games/uqm/content/packages - -Name: uqm-content -Version: 0.6.0 -Release: 2 -Summary: Base content files for The Ur-Quan Masters - -Group: Amusements/Games -License: Distributable -URL: http://sc2.sourceforge.net/ -Source0: http://download.sourceforge.net/sc2/uqm-%{version}-content.uqm -Source1: http://download.sourceforge.net/sc2/uqm-%{version}-voice.uqm -Source2: http://download.sourceforge.net/sc2/uqm-%{version}-3domusic.uqm -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildArch: noarch -PreReq: uqm >= %{version} - -%description -%{summary}. - - -%package voice -Summary: Optional speech package for The Ur-Quan Masters -Requires: %{name} = %{version}-%{release} -Group: %{group} - -%description voice -%{summary}. - - -%package 3domusic -Summary: Optional 3DO music package for The Ur-Quan Masters -Requires: %{name} = %{version}-%{release} -Group: %{group} - -%description 3domusic -%{summary}. - - -%prep - - -%build - - -%install -rm -rf $RPM_BUILD_ROOT -install -dm 755 $RPM_BUILD_ROOT%{uqm_contentdir} -install -pm 644 %{SOURCE0} $RPM_BUILD_ROOT%{uqm_contentdir}/content.uqm -install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{uqm_contentdir}/voice.uqm -install -pm 644 %{SOURCE2} $RPM_BUILD_ROOT%{uqm_contentdir}/3domusic.uqm - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%{uqm_contentdir}/content.uqm - -%files voice -%defattr(-,root,root,-) -%{uqm_contentdir}/voice.uqm - -%files 3domusic -%defattr(-,root,root,-) -%{uqm_contentdir}/3domusic.uqm - - -%changelog -* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-2 -- Dropping disttag -- this package does not change between distributions. - -* Fri Dec 22 2006 Konstantin Ryabitsev - 0.6.0-1 -- Upstream 0.6.0 - -* Mon Feb 6 2006 Ville Skyttä - 0.5.0-1 -- 0.5.0. - -* Sun May 22 2005 Ville Skyttä - 0.4.0-1 -- 0.4.0. - -* Fri Apr 7 2005 Michael Schwendt - 0.3-2 -- rebuilt - -* Sat Sep 6 2003 Ville Skyttä - 0:0.3-0.fdr.1 -- Update to 0.3. - -* Mon Jul 7 2003 Ville Skyttä - 0:0.2-0.fdr.2 -- Re-bzip2 content and voice zips to save space (#88). -- Fix typos in uqm-voice summary and description (#88). -- Spec cleanups, save it in UTF-8. - -* Sun Mar 23 2003 Ville Skyttä - 0:0.2-0.fdr.1 -- First Fedora release. From 2c35dc9543317a236f94a892abede9b243657f8e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:52:47 +0000 Subject: [PATCH 07/10] 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 f8959f4..67d16eb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := uqm-content 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 5a3e78d9926361ab4912206da722a5ceb30cdab9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:48 +0000 Subject: [PATCH 08/10] 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 f8959f4..67d16eb 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := uqm-content 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 bbadf4ac99341d88385cdd400f30d6699aa120e9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:46:56 +0000 Subject: [PATCH 09/10] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile 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 67d16eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: uqm-content -# $Id$ -NAME := uqm-content -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) From f9885c59e8b583bf69eb0dd2bbbce18d92036567 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:46:57 +0000 Subject: [PATCH 10/10] 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 67d16eb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: uqm-content -# $Id$ -NAME := uqm-content -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