From 6a89f4afd06a0b94c8e570bae8a5d07eaad08564 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Wed, 13 Dec 2006 21:07:06 +0000 Subject: [PATCH 01/10] 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 f3688e6da2d42845f8b914228f8b652cad2b4ac4 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 18 Feb 2007 10:08:26 +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 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 13298cd60c72d7f0d320a9b35514ceb7c358501c Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 27 Feb 2007 19:26:54 +0000 Subject: [PATCH 03/10] 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 435716a261329a7baf1df1b25634467ac62731b3 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 15 May 2007 11:44:54 +0000 Subject: [PATCH 04/10] Initialize branch EL-5 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..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 0a868af78cbacb69f19dc14ac452ee850aec662d Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 25 Jun 2007 18:09:23 +0000 Subject: [PATCH 05/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 16020c781625eb73523369ec43b70e4e97607c55 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 6 Jul 2007 18:07:47 +0000 Subject: [PATCH 06/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 50b7680b77ea55a3685a3d558d7bf0278e7cc1c9 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Mon, 3 Dec 2007 18:46:56 +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 b5113ab..685d4f5 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,7 +1,7 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 1.0 -Release: 1%{?dist} +Release: 4%{?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 +* Sun Nov 18 2007 Eric Tanguy - 1.0-4 +- Rebuild for new libupnp. + +* Wed Aug 29 2007 Fedora Release Engineering - 1.0-2 +- Rebuild for selinux ppc32 issue. + * Fri Jul 06 2007 Eric Tanguy - 1.0-1 - Update to 1.0 From dacf2f0de4bbd066302f8b232dc5563fe7e43c63 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:27 +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 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 f979be94a787912449b94250c39bcf03db1fd579 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:49:10 +0000 Subject: [PATCH 09/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 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 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 From 550030c5a39a0730f00e6f0aa60337e670698b96 Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 20 Dec 2014 18:00:58 +0100 Subject: [PATCH 10/10] 2014-12-20: Retired because of broken deps: unresolved dependencies for ushare-1.0-4.el5.i386: libupnp.so.3 libthreadutil.so.2 libixml.so.2 --- .gitignore | 1 - dead.package | 6 +++ sources | 1 - ushare.init | 80 -------------------------------- ushare.spec | 127 --------------------------------------------------- 5 files changed, 6 insertions(+), 209 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 sources delete mode 100644 ushare.init delete mode 100644 ushare.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index e8705c2..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -ushare-1.0.tar.bz2 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..d6bfeef --- /dev/null +++ b/dead.package @@ -0,0 +1,6 @@ +2014-12-20: Retired because of broken deps: +unresolved dependencies for ushare-1.0-4.el5.i386: +libupnp.so.3 +libthreadutil.so.2 +libixml.so.2 + diff --git a/sources b/sources deleted file mode 100644 index acc8bf7..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -a6dad95e61ded6f37fc158d9a81358dc ushare-1.0.tar.bz2 diff --git a/ushare.init b/ushare.init deleted file mode 100644 index 66aee98..0000000 --- a/ushare.init +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# ushare This shell script takes care of starting and stopping ushare. -# -# chkconfig: - 75 25 -# description: uShare UPnP A/V Media Server. -# - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source networking configuration. -. /etc/sysconfig/network - -# Check that networking is up. -[ ${NETWORKING} = "no" ] && exit 0 - -OPTIONS="" -prog=ushare -DESC="UPnP A/V Media Server" - -[ -r "/etc/ushare.conf" ] && . /etc/ushare.conf -# abort if no shared directory is defined -[ -z "$USHARE_DIR" ] && exit 0 - - -start() { - echo -n $"Starting $prog: " - daemon --user ushare $prog -D - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog -} - -stop() { - echo -n $"Stopping $prog: " - killproc $prog - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$prog /var/run/ircd.pid -} - -reload() { - echo -n $"Reloading $prog: " - killproc $prog -HUP - RETVAL=$? - echo -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $prog - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$prog ]; then - stop - start - fi - ;; - reload) - reload - ;; - *) - echo $"Usage: $prog {start|stop|restart|condrestart|reload|status" - exit 1 -esac - -exit $RETVAL diff --git a/ushare.spec b/ushare.spec deleted file mode 100644 index 685d4f5..0000000 --- a/ushare.spec +++ /dev/null @@ -1,127 +0,0 @@ -Summary: UPnP (TM) A/V Media Server -Name: ushare -Version: 1.0 -Release: 4%{?dist} -License: GPL -Group: Applications/Multimedia -URL: http://ushare.geexbox.org/ - -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, pkgconfig -Requires(pre): fedora-usermgmt -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig -Requires(postun): /sbin/service - -%description -uShare is a UPnP (TM) A/V Media Server. It implements the server -component that provides UPnP media devices with information on -available multimedia files. uShare uses the built-in http server -of libupnp to stream the files to clients. - -%prep -%setup -q - -%build -%configure -make %{?_smp_mflags} - -%install -rm -rf %{buildroot} -%makeinstall -%{__rm} -rf %{buildroot}%{_sysconfdir}/init.d -%{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare -%{__mkdir_p} %{buildroot}%{_var}/lib/ushare -%find_lang %{name} - -%clean -rm -rf %{buildroot} - -%pre -%{_sbindir}/fedora-useradd 21 -s /sbin/nologin -M -r -d %{_var}/lib/ushare \ - -c "ushare service account" ushare &>/dev/null || : - -%post -/sbin/chkconfig --add ushare - -%preun -if [ $1 -eq 0 ]; then - /sbin/service ushare stop &>/dev/null || : - /sbin/chkconfig --del ushare -fi - -%postun -if [ $1 -ge 1 ]; then - /sbin/service ushare condrestart &>/dev/null || : -fi - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/ushare -%config(noreplace) %{_sysconfdir}/ushare.conf -%{_initrddir}/ushare -%{_mandir}/man1/* -%attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ - -%changelog -* Sun Nov 18 2007 Eric Tanguy - 1.0-4 -- Rebuild for new libupnp. - -* Wed Aug 29 2007 Fedora Release Engineering - 1.0-2 -- Rebuild for selinux ppc32 issue. - -* 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/* - -* Tue Dec 27 2005 Eric Tanguy 0.9.5-3 -- Drop "Requires: libupnp" -- replace %{_sysconfdir}/ushare.conf by %config(noreplace) %{_sysconfdir}/ushare.conf - -* Tue Dec 27 2005 Eric Tanguy 0.9.5-2 -- add patch for buffer - -* Tue Dec 27 2005 Eric Tanguy 0.9.5-1 -- First build