From 11bd65456503669a178d4586f6b76673328a6636 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 19 Feb 2006 17:18:07 +0000 Subject: [PATCH 01/10] auto-import ushare-0.9.6-1 on branch FC-3 from ushare-0.9.6-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- ushare-0.9.5-buffer.diff | 36 ------------------------------------ ushare.spec | 15 +++++++++++---- 4 files changed, 13 insertions(+), 42 deletions(-) delete mode 100644 ushare-0.9.5-buffer.diff diff --git a/.cvsignore b/.cvsignore index 0a9e287..c3cac3e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.5.tar.bz2 +ushare-0.9.6.tar.bz2 diff --git a/sources b/sources index cca2d4b..3cb3932 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f5371f84a17548988bdd4f0fbe781ff ushare-0.9.5.tar.bz2 +05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 diff --git a/ushare-0.9.5-buffer.diff b/ushare-0.9.5-buffer.diff deleted file mode 100644 index c97a2b8..0000000 --- a/ushare-0.9.5-buffer.diff +++ /dev/null @@ -1,36 +0,0 @@ ---- ushare-0.9.5/src/buffer.c 2005-11-26 15:03:55.000000000 -0500 -+++ ushare-0.9.5.p/src/buffer.c 2005-12-21 21:38:38.000000000 -0500 -@@ -62,7 +62,7 @@ - len = buffer->len + strlen (str); - if (len >= buffer->capacity) - { -- buffer->capacity = MIN (len, 2 * buffer->capacity); -+ buffer->capacity = MAX (len+1, 2 * buffer->capacity); - buffer->buf = realloc (buffer->buf, buffer->capacity); - } - -@@ -74,14 +74,23 @@ - buffer_appendf (struct buffer_t *buffer, const char *format, ...) - { - char str[BUFFER_DEFAULT_CAPACITY]; -+ int size; - va_list va; - - if (!buffer || !format) - return; - - va_start (va, format); -- vsprintf (str, format, va); -- buffer_append (buffer, str); -+ if ((size = vsnprintf (str, BUFFER_DEFAULT_CAPACITY, format, va)) -+ >= BUFFER_DEFAULT_CAPACITY) -+ { -+ char* dynstr = (char*) malloc (size+1); -+ vsnprintf (dynstr,size+1,format,va); -+ buffer_append (buffer, dynstr); -+ free (dynstr); -+ } -+ else -+ buffer_append (buffer, str); - va_end (va); - } diff --git a/ushare.spec b/ushare.spec index 8785bfd..295aadd 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,14 +1,13 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.5 -Release: 4%{?dist} +Version: 0.9.6 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2 Source1:ushare.init -Patch0: ushare-0.9.5-buffer.diff BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libupnp-devel @@ -25,7 +24,6 @@ of libupnp to stream the files to clients. %prep %setup -q -%patch0 -p1 %build %configure @@ -70,6 +68,15 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 +- Update to 0.9.6 + +* Tue Feb 14 2006 Eric Tanguy - 0.9.5-6 +- Rebuild for FC5 + +* Fri Feb 10 2006 Eric Tanguy - 0.9.5-5 +- Rebuild for FC5 + * Tue Dec 27 2005 Eric Tanguy 0.9.5-4 - Use %find_lang macro instead of %{_datadir}/locale/* From b9263009653307fc0d12e82d55de536f13eb8482 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 6 Mar 2006 17:16:10 +0000 Subject: [PATCH 02/10] *** empty log message *** --- ushare.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ushare.spec b/ushare.spec index 295aadd..dd5faf9 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 0.9.6 -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 +* Mon Mar 06 2006 Eric Tanguy - 0.9.6-2 +- Rebuild with libupnp-1.3.1 + * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From 0c03d96dea84a50fd79c9f90fc25b6a01d837b74 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 12 Mar 2006 13:31:27 +0000 Subject: [PATCH 03/10] auto-import ushare-0.9.7-1 on branch FC-3 from ushare-0.9.7-1.src.rpm --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index c3cac3e..63e198f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.6.tar.bz2 +ushare-0.9.7.tar.bz2 diff --git a/sources b/sources index 3cb3932..6d7ee00 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05312707a1fd241dfd44ad78508207eb ushare-0.9.6.tar.bz2 +e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 diff --git a/ushare.spec b/ushare.spec index dd5faf9..65478a6 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.6 -Release: 2%{?dist} +Version: 0.9.7 +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 Mar 06 2006 Eric Tanguy - 0.9.6-2 -- Rebuild with libupnp-1.3.1 +* Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 +- Update to 0.9.7 * Tue Feb 14 2006 Eric Tanguy - 0.9.6-1 - Update to 0.9.6 From 8420e073601e25a1a623ee5c10739031bb11bf91 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 15 May 2007 11:45:42 +0000 Subject: [PATCH 04/10] Initialize branch EL-4 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..6ec5cef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-4 From be39bf8caad703cab1317d04a2193d0e99f95ae5 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 20 May 2007 17:21:30 +0000 Subject: [PATCH 05/10] *** empty log message *** --- ushare.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ushare.spec b/ushare.spec index 65478a6..ff38d7a 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: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -10,7 +10,7 @@ Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2 Source1:ushare.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libupnp-devel +BuildRequires: libupnp-devel, pkgconfig Requires(pre): fedora-usermgmt Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig @@ -68,6 +68,9 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Thu May 17 2006 Eric Tanguy - 0.9.7-2 +- Add BR pkgconfig + * Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 - Update to 0.9.7 From 69cec6dc389b69db6844e6a01bd727c48de281bf Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 22 May 2007 15:17:31 +0000 Subject: [PATCH 06/10] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 20 ++++++++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 63e198f..f5ccdde 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-0.9.7.tar.bz2 +ushare-0.9.10.tar.bz2 diff --git a/sources b/sources index 6d7ee00..88ea1c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e978c648f808cf1740b1583a78b922ff ushare-0.9.7.tar.bz2 +75cf58f64d72848b191c692778928056 ushare-0.9.10.tar.bz2 diff --git a/ushare.spec b/ushare.spec index ff38d7a..f60667e 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: 2%{?dist} +Version: 0.9.10 +Release: 1%{?dist} License: GPL Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -68,8 +68,20 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog -* Thu May 17 2006 Eric Tanguy - 0.9.7-2 -- Add BR pkgconfig +* 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 + +* 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 * Sun Mar 12 2006 Eric Tanguy - 0.9.7-1 - Update to 0.9.7 From 30c087e25ff17e90f7e4ab8c71cd76164fb588fe Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 25 Jun 2007 18:07:59 +0000 Subject: [PATCH 07/10] *** 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 22372ec074045478496bf672a2e79064600a2366 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 6 Jul 2007 18:06:13 +0000 Subject: [PATCH 08/10] *** 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 3830016ec6149c04927e536cbb9e647a81090ade Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:27 +0000 Subject: [PATCH 09/10] 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 0a3580d..3ed673a 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: ushare -# $Id$ +# $Id: Makefile,v 1.1 2006/01/26 17:01:48 tanguy Exp $ 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 20975362e1a1ac2e834856c543f938699089a1de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:49:06 +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 3ed673a..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: ushare -# $Id: Makefile,v 1.1 2006/01/26 17:01:48 tanguy Exp $ -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 6ec5cef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-4