rpms/ices/F-13 ices-2.0.1-noserial.patch, NONE, 1.1 ices.init, 1.1, 1.2 ices.spec, 1.9, 1.10

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/ices/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10410/F-13

Modified Files:
	ices.init ices.spec 
Added Files:
	ices-2.0.1-noserial.patch 
Log Message:
Multiple fixes.


ices-2.0.1-noserial.patch:
 im_playlist.c |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE ices-2.0.1-noserial.patch ---
diff -Naur ices-2.0.1/src/im_playlist.c ices-2.0.1-new/src/im_playlist.c
--- ices-2.0.1/src/im_playlist.c	2004-07-19 18:53:15.000000000 -0300
+++ ices-2.0.1-new/src/im_playlist.c	2010-04-23 23:11:39.000000000 -0300
@@ -166,6 +166,8 @@
         {
             if (ogg_page_bos (&og))
             {
+// this is non sense - roma 20100423
+#if 0
                if (ogg_page_serialno (&og) == pl->current_serial)
                {
                    LOG_WARN1 ("Skipping \"%s\" as the serial number is the same as previous", pl->filename);
@@ -173,6 +175,7 @@
                    pl->errors++;
                    return 0;
                }
+#endif
                pl->current_serial = ogg_page_serialno (&og);
             }
             if (input_calculate_ogg_sleep (&og) < 0)


Index: ices.init
===================================================================
RCS file: /cvs/pkgs/rpms/ices/F-13/ices.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ices.init	24 Apr 2006 08:53:24 -0000	1.1
+++ ices.init	1 Jun 2010 19:08:11 -0000	1.2
@@ -3,7 +3,7 @@
 # ices		This shellscript takes care of starting and stopping
 #		the ices client
 #
-# chkconfig: 345 40 60
+# chkconfig: - 40 60
 # description: IceS is a source client for broadcasting in Ogg Vorbis format \
 #              to an icecast2 server
 # processname: ices
@@ -50,7 +50,7 @@ case "$1" in
 	start
 	;;
   status)
-	status $PROCESS
+	status ices
 	RETVAL=$?
 	;;
   condrestart)


Index: ices.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ices/F-13/ices.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- ices.spec	25 Jul 2009 03:07:11 -0000	1.9
+++ ices.spec	1 Jun 2010 19:08:11 -0000	1.10
@@ -1,6 +1,6 @@
 Name: ices
 Version: 2.0.1
-Release: 9%{?dist}
+Release: 10%{?dist}
 Summary: Source streaming for Icecast
 Group: System Environment/Daemons
 License: GPLv2
@@ -8,6 +8,7 @@ URL: http://www.icecast.org
 Source0: http://downloads.us.xiph.org/releases/ices/ices-%{version}.tar.bz2
 Source1: ices.init
 Source2: ices.logrotate
+Patch0:  ices-2.0.1-noserial.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libxml2-devel, libshout-devel >= 2.0, libvorbis-devel,
 BuildRequires: alsa-lib-devel, pkgconfig, zlib-devel, libogg-devel
@@ -28,6 +29,7 @@ could be used if certain conditions are 
 
 %prep
 %setup -q
+%patch0 -p1 -b .noserial
 perl -pi -e 's|<background>0</background>|<background>1</background>|' conf/*.xml
 
 %build
@@ -51,7 +53,7 @@ rm -rf %{buildroot}
 
 %pre
 /usr/sbin/useradd -c "IceS Shoutcast source" \
-        -s /sbin/nologin -r -d /tmp ices 2> /dev/null || :
+        -s /sbin/nologin -r -d / ices 2> /dev/null || :
 
 %post
 if [ $1 = 1 ]; then
@@ -66,7 +68,7 @@ fi
 
 %postun
 if [ "$1" -ge "1" ]; then
-        /sbin/service ices condrestart >/dev/null 2>&1
+        /sbin/service ices condrestart &>/dev/null 2>&1 || :
 fi
 
 %files
@@ -76,9 +78,17 @@ fi
 %config(noreplace) %{_sysconfdir}/ices.conf
 %config %{_sysconfdir}/logrotate.d/ices
 %{_initrddir}/ices
-%attr(0770,root,ices) %{_var}/log/ices
+%attr(0755,root,ices) %{_var}/log/ices
 
 %changelog
+* Fri Apr 23 2010 Paulo Roma <roma at lcg.ufrj.br> - 2.0.1-10
+- Removed the non sense serial test.
+- Removed service-default-enabled warning.
+- Removed non-standard-dir-perm /var/log/ices 0770 warning.
+- Removed use-tmp-in-%%pre (changed /tpm for /).
+- Fixed %%postun scriptlet failed.
+- Fixed status in ices.init.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild