rpms/mt-daapd/F-9 mt-daapd-0.2.4.2-defaults.patch, NONE, 1.1 mt-daapd-0.2.4.2-fedora.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 mt-daapd.spec, 1.9, 1.10 sources, 1.3, 1.4 mt-daapd-svn-1696-check-input.patch, 1.1, NONE mt-daapd-svn-1696-defaults.patch, 1.1, NONE mt-daapd-svn-1696-fedora.patch, 1.1, NONE

Thu May 15 01:50:38 UTC 2008

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9236

Modified Files:
	.cvsignore mt-daapd.spec sources 
Added Files:
	mt-daapd-0.2.4.2-defaults.patch mt-daapd-0.2.4.2-fedora.patch 
Removed Files:
	mt-daapd-svn-1696-check-input.patch 
	mt-daapd-svn-1696-defaults.patch 
	mt-daapd-svn-1696-fedora.patch 
Log Message:
New upstream version.


mt-daapd-0.2.4.2-defaults.patch:

--- NEW FILE mt-daapd-0.2.4.2-defaults.patch ---
diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd.conf mt-daapd-0.2.4.2/contrib/mt-daapd.conf
--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd.conf	2008-05-14 21:20:00.000000000 -0400
+++ mt-daapd-0.2.4.2/contrib/mt-daapd.conf	2008-05-14 21:25:59.000000000 -0400
@@ -83,7 +83,7 @@
 # as root or not.
 #
 
-runas	nobody
+runas	mt-daapd
 
 #
 # playlist (optional)
@@ -122,7 +122,7 @@
 #
 #
 
-extensions .mp3,.m4a,.m4p
+extensions .mp3,.m4a,.m4p,.ogg,.flac
 
 #
 # logfile (optional)
@@ -136,7 +136,7 @@
 # will vary the amount of logging you get.
 #
 
-#logfile /var/log/mt-daapd.log
+logfile /var/log/mt-daapd.log
 
 #
 # art_filename (optional)

mt-daapd-0.2.4.2-fedora.patch:

--- NEW FILE mt-daapd-0.2.4.2-fedora.patch ---
diff -u --recursive mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd mt-daapd-0.2.4.2/contrib/mt-daapd
--- mt-daapd-0.2.4.2-vanilla/contrib/mt-daapd	2008-05-14 21:20:00.000000000 -0400
+++ mt-daapd-0.2.4.2/contrib/mt-daapd	2008-05-14 21:30:07.000000000 -0400
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# chkconfig: 2345 85 15
+# chkconfig: - 85 15
 # description: mt-daapd is a multi-threaded DAAP server for iTunes
 # processname: mt-daapd
 # pidfile: /var/run/mt-daapd


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-9/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	26 Feb 2008 10:24:36 -0000	1.3
+++ .cvsignore	15 May 2008 01:49:57 -0000	1.4
@@ -1 +1 @@
-mt-daapd-svn-1696.tar.gz
+mt-daapd-0.2.4.2.tar.gz


Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-9/mt-daapd.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- mt-daapd.spec	17 Apr 2008 19:52:39 -0000	1.9
+++ mt-daapd.spec	15 May 2008 01:49:57 -0000	1.10
@@ -1,4 +1,3 @@
-%define svntag 1696
 %bcond_without fedora
 
 %{?FE_USERADD_REQ}
@@ -10,16 +9,13 @@
 
 Summary: An iTunes-compatible media server
 Name: mt-daapd
-Version: 0.9
-Release: 0.2.%{svntag}%{?dist}
+Version: 0.2.4.2
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
-#Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-# Nightly build
-Source: mt-daapd-svn-%{svntag}.tar.gz
-Patch0: mt-daapd-svn-1696-defaults.patch
-Patch1: mt-daapd-svn-1696-fedora.patch
-Patch2: mt-daapd-svn-1696-check-input.patch
+Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
+Patch0: mt-daapd-0.2.4.2-defaults.patch
+Patch1: mt-daapd-0.2.4.2-fedora.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.fireflymediaserver.org/
 BuildRequires: fedora-usermgmt-devel
@@ -41,10 +37,9 @@
 devices.
 
 %prep
-%setup -q -n mt-daapd-svn-%{svntag}
+%setup -q
 %patch0 -p1 -b .defaults
 %patch1 -p1 -b .fedora
-%patch2 -p1 -b .check-input
 
 %build
 %configure --enable-avahi --enable-oggvorbis --enable-sqlite3 --enable-flac
@@ -54,7 +49,7 @@
 make DESTDIR=%{buildroot} install
 mkdir -p %{buildroot}%{_initrddir}
 mkdir -p %{buildroot}%{_localstatedir}/cache/mt-daapd
-install contrib/init.d/mt-daapd-fedora %{buildroot}%{_sysconfdir}/rc.d/init.d/mt-daapd
+install contrib/mt-daapd %{buildroot}%{_sysconfdir}/rc.d/init.d/mt-daapd
 install -m 0640 contrib/mt-daapd.conf %{buildroot}%{_sysconfdir}/mt-daapd.conf
 
 %pre
@@ -85,14 +80,15 @@
 %config(noreplace) %{_sysconfdir}/mt-daapd.conf
 %{_sbindir}/mt-daapd
 %{_datadir}/mt-daapd
-%{_bindir}/mt-daapd-ssc.sh
-%{_bindir}/wavstreamer
-%{_libdir}/mt-daapd
 %{_sysconfdir}/rc.d/init.d/mt-daapd
 %attr(0700,mt-daapd,root) %{_localstatedir}/cache/mt-daapd
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog
+* Wed May 14 2008 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.2-1
+   - New upstream version.
+   - Remove check-input patch; it's upstream.
+
 * Fri Apr 18 2008 W. Michael Petullo <mike[at]flyn.org> - 0.9-0.2.1696
    - Apply patch by Nico Golde to fix integer overflow, Bugzilla #442688.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	26 Feb 2008 10:24:36 -0000	1.3
+++ sources	15 May 2008 01:49:57 -0000	1.4
@@ -1 +1 @@
-42ba1f432bb88e18a8cb4ce0fc52eb64  mt-daapd-svn-1696.tar.gz
+67bef9fb14d487693b0dfb792c3f1b05  mt-daapd-0.2.4.2.tar.gz


--- mt-daapd-svn-1696-check-input.patch DELETED ---


--- mt-daapd-svn-1696-defaults.patch DELETED ---


--- mt-daapd-svn-1696-fedora.patch DELETED ---


