diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 0a9e287..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -ushare-0.9.5.tar.bz2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e8705c2 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +ushare-1.0.tar.bz2 diff --git a/Makefile b/Makefile deleted file mode 100644 index 0a3580d..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 $$/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/sources b/sources index cca2d4b..acc8bf7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f5371f84a17548988bdd4f0fbe781ff ushare-0.9.5.tar.bz2 +a6dad95e61ded6f37fc158d9a81358dc ushare-1.0.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..b5113ab 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,17 +1,16 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 0.9.5 -Release: 4%{?dist} +Version: 1.0 +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 +BuildRequires: libupnp-devel, pkgconfig Requires(pre): fedora-usermgmt Requires(post): /sbin/chkconfig Requires(preun): /sbin/service, /sbin/chkconfig @@ -25,7 +24,6 @@ of libupnp to stream the files to clients. %prep %setup -q -%patch0 -p1 %build %configure @@ -70,6 +68,45 @@ 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 + +* 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 + +* 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 + +* 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/*