rpms/mt-daapd/devel mt-daapd-svn-1696-defaults.patch, NONE, 1.1 mt-daapd-svn-1696-fedora.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mt-daapd.spec, 1.2, 1.3 sources, 1.2, 1.3 mt-daapd-0.2.4.1-fedora.patch, 1.1, NONE
W. Michael Petullo (mikep)
fedora-extras-commits at redhat.com
Tue Feb 26 10:25:15 UTC 2008
Author: mikep
Update of /cvs/extras/rpms/mt-daapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4553
Modified Files:
.cvsignore mt-daapd.spec sources
Added Files:
mt-daapd-svn-1696-defaults.patch
mt-daapd-svn-1696-fedora.patch
Removed Files:
mt-daapd-0.2.4.1-fedora.patch
Log Message:
New upstream version.
mt-daapd-svn-1696-defaults.patch:
--- NEW FILE mt-daapd-svn-1696-defaults.patch ---
--- mt-daapd-svn-1696/contrib/mt-daapd.conf.templ.defaults 2007-12-23 00:07:01.000000000 -0500
+++ mt-daapd-svn-1696/contrib/mt-daapd.conf.templ 2007-12-23 00:07:52.000000000 -0500
@@ -57,7 +57,7 @@
# info in. Valid choices are "sqlite" and "sqlite3".
#
-db_type = sqlite
+db_type = sqlite3
#
# db_parms
@@ -105,7 +105,7 @@
# This is also ignored on Windows.
#
-runas = nobody
+runas = mt-daapd
#
# password (optional)
@@ -136,7 +136,7 @@
# --enable-musepack.
#
-extensions = .mp3,.m4a,.m4p
+extensions = .mp3,.m4a,.m4p,.ogg,.flac
#
# ssc_codectypes (optional)
@@ -194,7 +194,7 @@
# will vary the amount of logging you get.
#
-#logfile = /var/log/mt-daapd.log
+logfile = /var/log/mt-daapd.log
#
# rescan_interval
mt-daapd-svn-1696-fedora.patch:
--- NEW FILE mt-daapd-svn-1696-fedora.patch ---
diff -u --recursive mt-daapd-svn-1696-vanilla/contrib/init.d/mt-daapd-fedora.templ mt-daapd-svn-1696/contrib/init.d/mt-daapd-fedora.templ
--- mt-daapd-svn-1696-vanilla/contrib/init.d/mt-daapd-fedora.templ 2008-02-26 14:46:04.000000000 +0430
+++ mt-daapd-svn-1696/contrib/init.d/mt-daapd-fedora.templ 2008-02-26 14:47:14.000000000 +0430
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# 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/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 25 Dec 2007 11:09:50 -0000 1.2
+++ .cvsignore 26 Feb 2008 10:24:36 -0000 1.3
@@ -1 +1 @@
-mt-daapd-0.2.4.1.tar.gz
+mt-daapd-svn-1696.tar.gz
Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/devel/mt-daapd.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mt-daapd.spec 19 Feb 2008 13:46:44 -0000 1.2
+++ mt-daapd.spec 26 Feb 2008 10:24:36 -0000 1.3
@@ -1,18 +1,27 @@
+%define svntag 1696
+
Summary: An iTunes-compatible media server
Name: mt-daapd
-Version: 0.2.4.1
-Release: 6%{?dist}
+Version: 0.9
+Release: 0.1.%{svntag}%{?dist}
License: GPLv2+
Group: Applications/Multimedia
-Source: http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
-Patch0: mt-daapd-0.2.4.1-fedora.patch
+#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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Url: http://www.fireflymediaserver.org/
-BuildRequires: gdbm-devel, avahi-devel, libogg-devel, libvorbis-devel, zlib-devel, libid3tag-devel
+BuildRequires: gdbm-devel, avahi-devel, libogg-devel, libvorbis-devel, zlib-devel
+BuildRequires: libid3tag-devel, sqlite-devel
+Requires(pre): /usr/sbin/useradd
Requires(preun): /sbin/chkconfig
Requires(preun): /sbin/service
Requires(postun): /sbin/service
Requires(post): /sbin/chkconfig
+Provides: group(%username) = %uid
+Provides: user(%username) = %uid
%description
The purpose of this project is built the best server software to serve
@@ -22,7 +31,8 @@
%prep
%setup -q
-%patch0 -p1
+%patch0 -p1 -b .defaults
+%patch1 -p1 -b .fedora
%build
%configure --enable-avahi --enable-oggvorbis
@@ -32,10 +42,14 @@
make DESTDIR=%{buildroot} install
mkdir -p %{buildroot}%{_initrddir}
mkdir -p %{buildroot}%{_localstatedir}/cache/mt-daapd
-install contrib/mt-daapd %{buildroot}%{_sysconfdir}/rc.d/init.d/mt-daapd
+install contrib/init.d/mt-daapd.fedora %{buildroot}%{_sysconfdir}/rc.d/init.d/mt-daapd
install -m 0640 contrib/mt-daapd.conf %{buildroot}%{_sysconfdir}/mt-daapd.conf
install -m 0644 contrib/mt-daapd.playlist %{buildroot}%{_sysconfdir}/mt-daapd.playlist
+%pre
+%__fe_groupadd %uid -r %username &>/dev/null || :
+%__fe_useradd %uid -r -s /sbin/nologin -d %homedir -M -c '%gecos' -g %username %username &>/dev/null || :
+
%preun
if [ $1 = 0 ]; then
/sbin/service mt-daapd stop >/dev/null 2>&1
@@ -49,6 +63,8 @@
if [ "$1" -ge "1" ]; then
/sbin/service mt-daapd condrestart >/dev/null 2>&1 || :
fi
+%__fe_userdel %username &>/dev/null || :
+%__fe_groupdel %username &>/dev/null || :
%clean
rm -rf %{buildroot}
@@ -61,11 +77,16 @@
%{_sbindir}/mt-daapd
%{_datadir}/mt-daapd
%{_localstatedir}/cache/mt-daapd
+%{_bindir}/mt-daapd-ssc.sh
+%{_bindir}/wavstreamer
+%{_libdir}/mt-daapd
+%{_sysconfdir}/rc.d/init.d/mt-daapd
+%attr(0700,mt-daapd,root) /var/cache/mt-daapd
%doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
%changelog
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.2.4.1-6
-- Autorebuild for GCC 4.3
+* Tue Feb 26 2008 W. Michael Petullo <mike[at]flyn.org> - 0.9-0.1.1696
+ - New upstream version.
* Mon Dec 24 2007 W. Michael Petullo <mike[at]flyn.org> - 0.2.4.1-5
- Change license to GPLv2+.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 25 Dec 2007 11:09:50 -0000 1.2
+++ sources 26 Feb 2008 10:24:36 -0000 1.3
@@ -1 +1 @@
-8117141e8a88bfab54fe98b6bbd5cb3a mt-daapd-0.2.4.1.tar.gz
+42ba1f432bb88e18a8cb4ce0fc52eb64 mt-daapd-svn-1696.tar.gz
--- mt-daapd-0.2.4.1-fedora.patch DELETED ---
More information about the fedora-extras-commits
mailing list