rpms/ushare/devel ushare-conf.patch, NONE, 1.1 ushare-error.patch, NONE, 1.1 ushare.spec, 1.18, 1.19

Eric Tanguy (tanguy) fedora-extras-commits at redhat.com
Sun Mar 9 10:18:13 UTC 2008


Author: tanguy

Update of /cvs/extras/rpms/ushare/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32294

Modified Files:
	ushare.spec 
Added Files:
	ushare-conf.patch ushare-error.patch 
Log Message:


ushare-conf.patch:

--- NEW FILE ushare-conf.patch ---
--- 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:

--- NEW FILE ushare-error.patch ---
--- 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;
     }


Index: ushare.spec
===================================================================
RCS file: /cvs/extras/rpms/ushare/devel/ushare.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ushare.spec	2 Feb 2008 16:24:25 -0000	1.18
+++ ushare.spec	9 Mar 2008 10:17:31 -0000	1.19
@@ -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 @@
 
 %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 @@
 %attr(770,ushare,ushare) %dir %{_var}/lib/ushare/
 
 %changelog
+* Sun Mar 09 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1a-4
+- BZ 436605 & 436607
+
 * Fri Jan 25 2008 Eric Tanguy <eric.tanguy at univ-nantes.fr> - 1.1a-3
 - Correct some spec error
 




More information about the fedora-extras-commits mailing list