dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-ushare-1.0.tar.bz2

.gitignore

@@ -0,0 +1 @@
+ushare-1.1a.tar.bz2

Makefile

@@ -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)

sources

@@ -1 +1 @@
-a6dad95e61ded6f37fc158d9a81358dc  ushare-1.0.tar.bz2
+5bbcdbf1ff85a9710fa3d4e82ccaa251  ushare-1.1a.tar.bz2

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=
+ 

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;
+     }

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

ushare.spec

@@ -1,19 +1,22 @@
 Summary: UPnP (TM) A/V Media Server
 Name: ushare
-Version: 1.0
-Release: 2%{?dist}
-License: GPL
+Version: 1.1a
+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
+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 +27,23 @@ 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
 
 %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 +55,47 @@ 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
+* Sun Mar 09 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.1a-4
+- BZ 436605 & 436607
+
+* Fri Jan 25 2008 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.1a-3
+- Correct some spec error
+
+* Tue Dec 25 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.1a-2
+- Introduce use of alternatives
+
+* Thu Dec 06 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.1a-1
+- Update to 1.1a
+
+* Wed Dec 05 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.1-1
+- Update to 1.1
+
+* Sun Nov 18 2007 Eric Tanguy <eric.tanguy@univ-nantes.fr> - 1.0-4
+- Rebuild for new libupnp.
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.0-2
 - Rebuild for selinux ppc32 issue.
 
@@ -111,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