Fix minor make dist problems

Makefile.am

@@ -1,7 +1,7 @@
 # $Id$
 #
 EXTRA_DIST = reconf configure
-SUBDIRS=src docs admin-root contrib
+SUBDIRS=src admin-root contrib
 
 
 

admin-root/Makefile.am

@@ -1,11 +1,13 @@
 # $Id$
 #
 
+adminrootdir = ${pkgdatadir}/admin-root
+adminroot_DATA = ftr.html linkOpaque.gif status.html aspl-license.txt \
+	gpl-license.txt linkTransparent.gif config-update.html hdr.html mt-daapd.css \
+	mt-daapd.png config.html index.html required.gif gpl-license.html \
+	aspl-license.html
+
 EXTRA_DIST = ftr.html linkOpaque.gif status.html aspl-license.txt \
 	gpl-license.txt linkTransparent.gif config-update.html hdr.html mt-daapd.css \
-	mt-daapd.png config.html index.html required.gif
-
-
-
-
-
+	mt-daapd.png config.html index.html required.gif gpl-license.html \
+	aspl-license.html

configure.in

@@ -96,4 +96,4 @@ AC_CHECK_LIB(socket,socket,V_NETLIBS="-lsocket $V_NETLIBS",,)
 
 AC_SUBST(V_NETLIBS)
 
-AC_OUTPUT(src/Makefile docs/Makefile admin-root/Makefile contrib/Makefile Makefile)
+AC_OUTPUT(src/Makefile admin-root/Makefile contrib/Makefile Makefile)

contrib/Makefile.am

@@ -1,6 +1,7 @@
 # $Id$
 #
-EXTRA_DIST = README
+EXTRA_DIST = README mt-daapd.spec mt-daapd.conf mt-daapd.playlist mt-daapd
+
 
 
 

contrib/mt-daapd

@@ -0,0 +1,54 @@
+#!/bin/bash
+#
+# chkconfig: 2345 85 15
+# description: mt-daapd is a multi-threaded DAAP server for iTunes
+# processname: mt-daapd
+# pidfile: /var/run/mt-daapd
+#
+
+# source function library
+. /etc/init.d/functions
+[ -e /etc/daapd.conf ]
+
+RETVAL=0
+
+start() {
+	echo -n $"Starting DAAP server: "
+	daemon mt-daapd 
+	RETVAL=$?
+	echo
+	[ $RETVAL -eq 0 ] && touch /var/lock/subsys/mt-daapd
+}
+
+stop() {
+	echo -n $"Shutting down DAAP server: "
+	killproc gpm
+	RETVAL=$?
+
+	echo
+	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/mt-daapd
+}
+
+case "$1" in
+  start)
+	start
+	;;
+  stop)
+	stop
+	;;
+  restart|reload)
+	stop
+	start
+	RETVAL=$?
+	;;
+  status)
+	status mt-daapd
+	RETVAL=$?
+	;;
+  *)
+	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+	exit 1
+esac
+
+exit $RETVAL
+

contrib/mt-daapd.conf

@@ -0,0 +1,71 @@
+# $Id$
+#
+# This is the mt-daapd config file.
+#
+
+#
+# web_root (required)
+#
+# Location of the admin web pages.  This should be correct
+#
+
+web_root	/usr/share/mt-daapd/admin-root
+
+#
+# port (required)
+#
+# What port to listen on.  It is possible to use a different
+# port, but this is the default iTunes port
+#
+
+port		3689
+
+#
+# admin_pw (required)
+#
+# This is the password to the administrative pages
+#
+
+admin_pw	mt-daapd
+
+#
+# mp3_dir (required)
+#
+# Location of the mp3 files to share
+#
+
+mp3_dir		/mnt/mp3
+
+#
+# servername (required)
+#
+# This is both the name of the server as advertised
+# via rendezvous, and the name of the database
+# exported via DAAP
+#
+
+servername	mt-daapd
+
+#
+# playlist (optional)
+#
+# This is the location of a playlist file.
+# This is for Apple-style "Smart Playlists"
+# See the mt-daapd.playlist file in the 
+# contrib directory for syntax and examples
+#
+# Note that static playlists will still
+# show up, even if this directive is not
+# specified
+#
+
+playlist	/etc/mt-daapd.playlist
+
+#
+# password (optional)
+#
+# This is the password required to listen to MP3 files
+# i.e. the password that iTunes prompts for
+#
+
+#password	mp3

contrib/mt-daapd.playlist

@@ -0,0 +1,71 @@
+# $Id$
+#
+# This is the playlist file, for specifying iTunes-style
+# "Smart Playlists".
+# 
+# The syntax is as follows:
+#
+# "Playlist Name" { expression }
+#
+# An expression consists of:
+#
+# ID3-tag-name operator operand
+#
+# Where valid ID3-tag-names are:
+#   Artist (string)
+#   Album (string)
+#   Genre (string)
+#   Year (int)
+#
+# Valid operators include:
+#   is, includes (string)
+#   >, <, <=, >=, = (int)
+#
+# the "is" operator must exactly match the tag,
+# while the "includes" operator matches a substring.
+# Both matches are case-insensitive
+#
+# Valid operands include:
+#   "string value" (string)
+#   integer (int)
+#
+# Multiple expressions can be anded or ored together,
+# using the keywords OR and AND (or || and &&).
+# The unary not operator is also supported using the
+# keyword NOT (or !)
+#
+# Examples:
+#
+# "techno" {
+#    genre includes "techno" ||
+#    artist includes "zombie"
+# }
+#
+# This would match songs by "Rob Zombie" or "White Zombie",
+# as well as those with a genre of "Techno-Industrial" or
+# "Trance/Techno", for example.
+#
+# I expect that this language will grow over time.  If you want
+# to hack on it, see src/lexer.l, src/parser.y, and src/playlist.c
+#
+
+"60's Music" {
+	Year > 1959 && Year < 1970
+}
+
+"70's Music" {
+	Year > 1969 && Year < 1980
+}
+
+"80's Music" {
+	Year > 1979 && Year < 1990
+}
+
+"90's Music" {
+	Year > 1989 && Year < 2000
+}
+
+"00's Music" {
+	Year > 1999
+}
+

contrib/mt-daapd.spec

@@ -7,10 +7,12 @@ Group: Development/Networking
 URL: http://www.pedde.com/downloads/%{name}-%{version}.tar.gz
 Source0: %{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
+Requires: howl libid3tag
+BuildRequires: libid3tag-devel
 
 %description
 A multi-threaded implementation of Apple's DAAP server, mt-daapd
-allows a linux machine to advertise MP3 files to to used by 
+allows a Linux machine to advertise MP3 files to to used by 
 Windows or Mac iTunes clients.
 %prep
 %setup -q
@@ -24,6 +26,8 @@ rm -rf $RPM_BUILD_ROOT
 make install
 mkdir -p $RPM_BUILD_ROOT/etc/init.d
 cp contrib/mt-daapd $RPM_BUILD_ROOT/etc/init.d
+cp contrib/mt-daapd.conf $RPM_BUILD_ROOT/etc
+cp contrib/mt-daapd.playlist $RPM_BUILD_ROOT/etc
 
 %post
 /sbin/chkconfig --add mt-daapd
@@ -33,6 +37,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
+/etc/*
+/usr/sbin/*
+/usr/share/mt-daapd/*
+
 %doc
 
 

src/Makefile.am

@@ -7,7 +7,7 @@ AM_YFLAGS=-d
 sbin_PROGRAMS = mt-daapd
 
 if COND_REND_POSIX
-RENDSRC=mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c mdns/mDNSUNP.c rend-posix.c
+RENDSRC=mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c mdns/mDNSUNP.c rend-posix.c mdns/mDNSPlatformFunctions.h
 endif
 
 if COND_REND_HOWL
@@ -25,6 +25,7 @@ mt_daapd_SOURCES = main.c daapd.h rend.h uici.c uici.h webserver.c \
 	lexer.l parser.y $(RENDSRC)
 
 EXTRA_DIST = mdns/mDNS.c mdns/mDNSClientAPI.h mdns/mDNSDebug.h mdns/mDNSPosix.c \
-	mdns/mDNSUNP.c rend-howl.c rend-posix.c rend-osx.c
+	mdns/mDNSUNP.c mdns/mDNSPlatformFunctions.h mdns/mDNSPosix.h mdns/mDNSUNP.h \
+	rend-howl.c rend-posix.c rend-osx.c
 
 

src/mt-daapd.conf

@@ -1,8 +0,0 @@
-web_root	../admin-root
-port		3689
-admin_pw	secret
-mp3_dir		mp3
-servername	Ron's Secret Stash
-playlist	mt-daapd.playlist
-password	mp3
-