From b697ca859f12ada12c472be03d2715f2b1490b1a Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:23:33 +0000 Subject: [PATCH 1/8] Initialize branch FC-6 for ushare --- 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 97353ac4c5f023b9ee6ee077c6faa691c89e9100 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Wed, 13 Dec 2006 21:07:06 +0000 Subject: [PATCH 2/8] auto-import ushare-0.9.8-1 on branch FC-6 from ushare-0.9.8-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 63e198f..cfea580 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.7.tar.bz2 +ushare-0.9.8.tar.bz2 diff --git a/sources b/sources index 6d7ee00..1f2f359 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 +dec4c12d97d476c9a3a0347621d64e27 ushare-0.9.8.tar.bz2 diff --git a/ushare.spec b/ushare.spec index c2b3c6a..ef3e161 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.7 -Release: 3%{?dist} +Version: 0.9.8 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,8 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Mon Aug 28 2006 Eric Tanguy - 0.9.7-3 -- Rebuild for Fedora Extras 6 +* Wed Dec 13 2006 Eric Tanguy - 0.9.8-1 +- Update to 0.9.8 * Thu Jun 29 2006 Eric Tanguy - 0.9.7-2 - Add pkgconfig to buildrequires From e1504bb2c2e0be8c594159df41136ed86d4c1353 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 18 Feb 2007 10:08:26 +0000 Subject: [PATCH 3/8] *** empty log message *** --- ushare.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ushare.spec b/ushare.spec index ef3e161..e4b20f2 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,9 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sat Feb 17 2007 Eric Tanguy - 0.9.8-2 +- Rebuild for libupnp 1.4.2 + * Wed Dec 13 2006 Eric Tanguy - 0.9.8-1 - Update to 0.9.8 From bdca5ddbe533e56f54110fc449570a7fe6913743 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 27 Feb 2007 19:26:54 +0000 Subject: [PATCH 4/8] auto-import ushare-0.9.10-1 on branch FC-6 from ushare-0.9.10-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index cfea580..f5ccdde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.8.tar.bz2 +ushare-0.9.10.tar.bz2 diff --git a/sources b/sources index 1f2f359..88ea1c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dec4c12d97d476c9a3a0347621d64e27 ushare-0.9.8.tar.bz2 +75cf58f64d72848b191c692778928056 ushare-0.9.10.tar.bz2 diff --git a/ushare.spec b/ushare.spec index e4b20f2..f60667e 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.8 -Release: 2%{?dist} +Version: 0.9.10 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,12 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Mon Feb 26 2007 Eric Tanguy - 0.9.10-1 +- Update to 0.9.10 + +* Sun Feb 25 2007 Eric Tanguy - 0.9.9-1 +- Update to 0.9.9 + * Sat Feb 17 2007 Eric Tanguy - 0.9.8-2 - Rebuild for libupnp 1.4.2 From f6e9dc7f8bcb2fb887d00642ba3a22195784b011 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 25 Jun 2007 18:10:45 +0000 Subject: [PATCH 5/8] *** empty log message *** --- ushare.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ushare.spec b/ushare.spec index f60667e..09e907f 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.10 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,12 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sat May 05 2007 Eric Tanguy - 0.9.10-3 +- Rebuild for libupnp-1.6.0 + +* Sat May 05 2007 Eric Tanguy - 0.9.10-2 +- Rebuild + * Mon Feb 26 2007 Eric Tanguy - 0.9.10-1 - Update to 0.9.10 From 5bc2a3ebb2741b3bd2340b4c12dfe21515d298f1 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 6 Jul 2007 18:04:36 +0000 Subject: [PATCH 6/8] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f5ccdde..e8705c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.10.tar.bz2 +ushare-1.0.tar.bz2 diff --git a/sources b/sources index 88ea1c8..acc8bf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75cf58f64d72848b191c692778928056 ushare-0.9.10.tar.bz2 +a6dad95e61ded6f37fc158d9a81358dc ushare-1.0.tar.bz2 diff --git a/ushare.spec b/ushare.spec index 09e907f..b5113ab 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.10 -Release: 3%{?dist} +Version: 1.0 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,6 +68,12 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Fri Jul 06 2007 Eric Tanguy - 1.0-1 +- Update to 1.0 + +* Tue Jun 26 2007 Eric Tanguy - 0.9.10-4 +- Rebuild + * Sat May 05 2007 Eric Tanguy - 0.9.10-3 - Rebuild for libupnp-1.6.0 From 5397c9ec291e09fae8486589de2ad23324b8554f Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:30 +0000 Subject: [PATCH 7/8] 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 0a3580d..69a27cc 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := ushare 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 aeed5d2ac1cd93c0defccf7fe447124a7126b4fe Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:49:17 +0000 Subject: [PATCH 8/8] 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 69a27cc..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ushare -# $Id$ -NAME := ushare -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