rpms/mt-daapd/devel mt-daapd.spec,1.7,1.8

[W. Michael Petullo (mikep)]

Author: mikep

Update of /cvs/extras/rpms/mt-daapd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13970

Modified Files:
	mt-daapd.spec 
Log Message:
Fix adduser scripts.



Index: mt-daapd.spec
===================================================================
RCS file: /cvs/extras/rpms/mt-daapd/devel/mt-daapd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mt-daapd.spec	26 Feb 2008 11:08:18 -0000	1.7
+++ mt-daapd.spec	26 Feb 2008 11:59:13 -0000	1.8
@@ -1,4 +1,12 @@
 %define svntag 1696
+%bcond_without fedora
+
+%{?FE_USERADD_REQ}
+
+%global uid 72
+%global username mt-daapd
+%global homedir %_var/lib/%username
+%global gecos mt-daapd
 
 Summary: An iTunes-compatible media server
 Name: mt-daapd
@@ -13,6 +21,7 @@
 Patch1: mt-daapd-svn-1696-fedora.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Url: http://www.fireflymediaserver.org/
+BuildRequires: fedora-usermgmt-devel
 BuildRequires: gdbm-devel, avahi-devel, zlib-devel
 BuildRequires: flac-devel, libogg-devel, libvorbis-devel
 BuildRequires: libid3tag-devel, sqlite-devel
@@ -45,7 +54,6 @@
 mkdir -p %{buildroot}%{_localstatedir}/cache/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 || :
@@ -73,16 +81,13 @@
 %files
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/mt-daapd.conf
-%config(noreplace) %{_sysconfdir}/mt-daapd.playlist
-%{_initrddir}/mt-daapd
 %{_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
+%attr(0700,mt-daapd,root) %{_localstatedir}/cache/mt-daapd
 %doc AUTHORS COPYING CREDITS INSTALL NEWS README TODO
 
 %changelog