From 20b96d75546612287054cc8475a76e07e4c60bd9 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 10:51:31 +0000 Subject: [PATCH 01/11] Initialize branch F-7 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..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From 2ab445bf08d0392c937ea5fa147a5f1f1eab07f9 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 26 Jun 2007 10:22:51 +0000 Subject: [PATCH 02/11] *** empty log message *** --- ushare.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ushare.spec b/ushare.spec index 2ee755f..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: 2%{?dist} +Release: 3%{?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 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 From 002301881f1f607f800fa9557d494987c0ddba85 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Tue, 26 Jun 2007 17:17:45 +0000 Subject: [PATCH 03/11] *** empty log message *** --- ushare.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ushare.spec b/ushare.spec index 09e907f..3d2571d 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} +Release: 4%{?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 +* 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 bc28573f912e315fdc596c78809cd79c3f465242 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Fri, 6 Jul 2007 18:19:26 +0000 Subject: [PATCH 04/11] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 7 +++++-- 3 files changed, 7 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 3d2571d..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: 4%{?dist} +Version: 1.0 +Release: 1%{?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 +* Fri Jul 06 2007 Eric Tanguy - 1.0-1 +- Update to 1.0 + * Tue Jun 26 2007 Eric Tanguy - 0.9.10-4 - Rebuild From 9fc1048f556b0ab5cb598dea03bc97921067631b Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 18 Nov 2007 18:54:55 +0000 Subject: [PATCH 05/11] *** 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 7cc274f5551c5186c724f2b9262bf851bb283720 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 3 Feb 2008 07:59:22 +0000 Subject: [PATCH 06/11] *** empty log message *** --- .cvsignore | 2 +- sources | 2 +- ushare.spec | 38 ++++++++++++++++++++++++++++---------- 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.cvsignore b/.cvsignore index e8705c2..9b53975 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ushare-1.0.tar.bz2 +ushare-1.1a.tar.bz2 diff --git a/sources b/sources index acc8bf7..a19f06a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6dad95e61ded6f37fc158d9a81358dc ushare-1.0.tar.bz2 +5bbcdbf1ff85a9710fa3d4e82ccaa251 ushare-1.1a.tar.bz2 diff --git a/ushare.spec b/ushare.spec index 685d4f5..bc034a6 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,8 +1,8 @@ Summary: UPnP (TM) A/V Media Server Name: ushare -Version: 1.0 -Release: 4%{?dist} -License: GPL +Version: 1.1a +Release: 3%{?dist} +License: LGPLv2+ Group: Applications/Multimedia URL: http://ushare.geexbox.org/ @@ -11,9 +11,10 @@ Source1:ushare.init BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libupnp-devel, pkgconfig +Requires: /usr/sbin/alternatives Requires(pre): fedora-usermgmt -Requires(post): /sbin/chkconfig -Requires(preun): /sbin/service, /sbin/chkconfig +Requires(post): /sbin/chkconfig, /usr/sbin/alternatives +Requires(preun): /sbin/service, /sbin/chkconfig, /usr/sbin/alternatives Requires(postun): /sbin/service %description @@ -24,17 +25,21 @@ of libupnp to stream the files to clients. %prep %setup -q +iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8 +cp -af AUTHORS.utf8 AUTHORS %build -%configure +export CFLAGS="$RPM_OPT_FLAGS" +./configure --prefix=%{_prefix} --localedir=%{_datadir}/locale --sysconfdir=%{_sysconfdir} --disable-dlna --enable-debug make %{?_smp_mflags} %install rm -rf %{buildroot} -%makeinstall +%makeinstall DESTDIR=%{buildroot} %{__rm} -rf %{buildroot}%{_sysconfdir}/init.d %{__install} -m 0755 -D %{SOURCE1} %{buildroot}%{_initrddir}/ushare %{__mkdir_p} %{buildroot}%{_var}/lib/ushare +%{__mv} %{buildroot}%{_bindir}/ushare %{buildroot}%{_bindir}/ushare-fedora %find_lang %{name} %clean @@ -46,28 +51,41 @@ rm -rf %{buildroot} %post /sbin/chkconfig --add ushare +alternatives --install %{_bindir}/ushare ushare %{_bindir}/ushare-fedora 10 %preun if [ $1 -eq 0 ]; then /sbin/service ushare stop &>/dev/null || : /sbin/chkconfig --del ushare +alternatives --remove ushare %{_bindir}/ushare-fedora fi %postun if [ $1 -ge 1 ]; then - /sbin/service ushare condrestart &>/dev/null || : + /sbin/service ushare condrestart &>/dev/null || : fi %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING NEWS README -%{_bindir}/ushare +%{_bindir}/ushare-fedora %config(noreplace) %{_sysconfdir}/ushare.conf %{_initrddir}/ushare -%{_mandir}/man1/* %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Fri Jan 25 2008 Eric Tanguy - 1.1a-3 +- Correct some spec error + +* Tue Dec 25 2007 Eric Tanguy - 1.1a-2 +- Introduce use of alternatives + +* Thu Dec 06 2007 Eric Tanguy - 1.1a-1 +- Update to 1.1a + +* Wed Dec 05 2007 Eric Tanguy - 1.1-1 +- Update to 1.1 + * Sun Nov 18 2007 Eric Tanguy - 1.0-4 - Rebuild for new libupnp. From 12319e856a402ebb08246fca3556339be7079477 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Wed, 13 Feb 2008 19:29:02 +0000 Subject: [PATCH 07/11] *** empty log message *** --- ushare.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ushare.init b/ushare.init index 66aee98..da645d4 100644 --- a/ushare.init +++ b/ushare.init @@ -26,7 +26,7 @@ DESC="UPnP A/V Media Server" start() { echo -n $"Starting $prog: " - daemon --user ushare $prog -D + daemon --user ushare $prog -d -D RETVAL=$? echo [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$prog From d120e5437289ef6c1325fa082962107b20b300c7 Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 9 Mar 2008 10:27:14 +0000 Subject: [PATCH 08/11] *** empty log message *** --- ushare-conf.patch | 22 ++++++++++++++++++++++ ushare-error.patch | 11 +++++++++++ ushare.spec | 9 ++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 ushare-conf.patch create mode 100644 ushare-error.patch diff --git a/ushare-conf.patch b/ushare-conf.patch new file mode 100644 index 0000000..2a8e1cc --- /dev/null +++ b/ushare-conf.patch @@ -0,0 +1,22 @@ +--- ushare-1.1a/scripts/ushare.conf 2007-12-09 14:03:36.000000000 +0100 ++++ ushare-1.1a/scripts/ushare.conf.new 2008-03-09 09:53:12.000000000 +0100 +@@ -31,15 +31,15 @@ + USHARE_OVERRIDE_ICONV_ERR= + + # Enable Web interface (yes/no) +-ENABLE_WEB= ++USHARE_ENABLE_WEB= + + # Enable Telnet control interface (yes/no) +-ENABLE_TELNET= ++USHARE_ENABLE_TELNET= + + # Use XboX 360 compatibility mode (yes/no) +-ENABLE_XBOX= ++USHARE_ENABLE_XBOX= + + # Use DLNA profile (yes/no) + # This is needed for PlayStation3 to work (among other devices) +-ENABLE_DLNA= ++USHARE_ENABLE_DLNA= + diff --git a/ushare-error.patch b/ushare-error.patch new file mode 100644 index 0000000..211ab24 --- /dev/null +++ b/ushare-error.patch @@ -0,0 +1,11 @@ +--- ushare-1.1a/src/ushare.c 2007-12-09 14:03:36.000000000 +0100 ++++ ushare-1.1a/src/ushare.c.new 2008-03-09 09:58:06.000000000 +0100 +@@ -424,8 +424,6 @@ + if ((itf->ifa_flags & IFF_UP) + && !strncmp (itf->ifa_name, interface, IFNAMSIZ)) + { +- log_error (_("Interface %s is down.\n"), interface); +- log_error (_("Recheck uShare's configuration and try again !\n")); + freeifaddrs (itflist); + return true; + } diff --git a/ushare.spec b/ushare.spec index bc034a6..331a394 100644 --- a/ushare.spec +++ b/ushare.spec @@ -1,13 +1,15 @@ Summary: UPnP (TM) A/V Media Server Name: ushare Version: 1.1a -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: Applications/Multimedia URL: http://ushare.geexbox.org/ Source: http://ushare.geexbox.org/releases/%{name}-%{version}.tar.bz2 Source1:ushare.init +Patch0: ushare-conf.patch +Patch1: ushare-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libupnp-devel, pkgconfig @@ -25,6 +27,8 @@ of libupnp to stream the files to clients. %prep %setup -q +%patch0 -p1 +%patch1 -p1 iconv -f ISO_8859-1 -t UTF-8 AUTHORS --output AUTHORS.utf8 cp -af AUTHORS.utf8 AUTHORS @@ -74,6 +78,9 @@ fi %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/ %changelog +* Sun Mar 09 2008 Eric Tanguy - 1.1a-4 +- BZ 436605 & 436607 + * Fri Jan 25 2008 Eric Tanguy - 1.1a-3 - Correct some spec error From ff57df1b17e2896b733e2fb52de8cf81a4b8919c Mon Sep 17 00:00:00 2001 From: Eric Tanguy Date: Sun, 16 Mar 2008 09:21:18 +0000 Subject: [PATCH 09/11] *** empty log message *** --- ushare.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ushare.spec b/ushare.spec index 331a394..57e9008 100644 --- a/ushare.spec +++ b/ushare.spec @@ -139,11 +139,11 @@ fi - Rebuild for FC5 * Tue Dec 27 2005 Eric Tanguy 0.9.5-4 -- Use %find_lang macro instead of %{_datadir}/locale/* +- 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 +- replace %%{_sysconfdir}/ushare.conf by %%config(noreplace) %%{_sysconfdir}/ushare.conf * Tue Dec 27 2005 Eric Tanguy 0.9.5-2 - add patch for buffer From 26196249b05a65cf9558c0e571696093a99e09df Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:16:29 +0000 Subject: [PATCH 10/11] 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 20c945620084d868d19abe5a6bdf91771f0e89aa Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 14:49:03 +0000 Subject: [PATCH 11/11] 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 c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7