- updated to 5_0_3_2

Changed files:
    dstreamserv.spec -> 1.16

diff --git a/dstreamserv.spec b/dstreamserv.spec
index 6627509a11e85f522f072c084152ad883814d574..0f57433d6d85d354cff9485f127d95e4670001e3 100644 (file)
--- a/dstreamserv.spec
+++ b/dstreamserv.spec
@@ -2,17 +2,30 @@
 Summary:       Darwin Streaming Server
 Summary(pl):   Serwer strumieni z Darwina
 Name:          dstreamserv
-Version:       4.1.2
-Release:       3.1
+Version:       5.0.3.2
+Release:       0.1
 License:       APSL
 Group:         Networking/Daemons
-Source0:       DSS-4_1_2.src.tar.gz
-# Source0-md5: 521975dcfe9d7b64653112b4e1749e47
+Source0:       DSS-v5_0_3_2.zip
+# Source0-md5: 394e74199a01e5f54c743bb02f898edd
+NoSource:      0
 Source1:       %{name}.init
+Source2:       %{name}-relayconfig.xml
 Patch0:                %{name}-Buildit.patch
+Patch1:                %{name}-buildtarball.patch
+Patch2:                %{name}-defaultpath.patch
+Patch3:                %{name}-qtpasswd.patch
 URL:           http://developer.apple.com/darwin/projects/streaming/
 PreReq:                rc-scripts
+BuildRequires:  rpmbuild(macros) >= 1.177
 Requires(post,preun):  /sbin/chkconfig
+Requires(pre): /usr/bin/getgid
+Requires(pre): /bin/id
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
+Requires(post):        fileutils
+Requires(postun):      /usr/sbin/userdel
+Requires(postun):      /usr/sbin/groupdel
 Obsoletes:     dstreamsrv
 Obsoletes:     DSS
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -38,65 +51,64 @@ Sample files for Streaming Server.
 Przyk³adowe pliki do Darwin Streaming Servera.
 
 %prep
-%setup -q -n DSS-4_1_2.src
-%patch0 -p1 
+%setup -q -n DSS-v5_0_3_2
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 export CC=%{__cxx}
 export CXX=%{__cxx}
-./buildtarball
-tar -xvzf DarwinStreamingSrvr4.1.2-Linux.tar.gz
-cd DarwinStreamingSrvr4.1.2-Linux
+./buildtarball dss
+tar -xvzf DarwinStreamingSrvrdss-Linux.tar.gz
+cd DarwinStreamingSrvrdss-Linux
 %{_bindir}/perl perlpath.pl %{_bindir}/perl streamingadminserver.pl AdminHtml/parse_xml.cgi
 echo "admin: dssadmin" > qtgroups
-./qtpasswd -f ./qtusers -p 'dssadmin' 'dssadmin'
-./qtpasswd -f ./qtusers -F -d 'aGFja21l'
+./qtpasswd -f ./qtusers -c -F -r "DSS Admin Server" -p 'aGFja21l' 'dssadmin'
 
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d \
 $RPM_BUILD_ROOT%{_sysconfdir}/streaming \
-       $RPM_BUILD_ROOT/var/streaming \
-       $RPM_BUILD_ROOT/var/streaming/logs \
-       $RPM_BUILD_ROOT/var/streaming/playlists \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_de \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_en \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_fr \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_ja \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/images \
-       $RPM_BUILD_ROOT/var/streaming/AdminHtml/includes \
-       $RPM_BUILD_ROOT%{_prefix}/local/bin \
-       $RPM_BUILD_ROOT%{_prefix}/local/sbin \
-       $RPM_BUILD_ROOT%{_prefix}/local/movies \
+       $RPM_BUILD_ROOT/var/lib/streaming \
+       $RPM_BUILD_ROOT/var/log/streaming \
+       $RPM_BUILD_ROOT/var/lib/streaming/playlists \
+       $RPM_BUILD_ROOT/usr/lib/StreamingServerModules \
+       $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml \
+       $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/html_en \
+       $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/images \
+       $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/includes \
+       $RPM_BUILD_ROOT/var/lib/streaming/movies \
+       $RPM_BUILD_ROOT/var/lib/streaming/http \
+       $RPM_BUILD_ROOT%{_prefix}/bin \
+       $RPM_BUILD_ROOT%{_prefix}/sbin \
        $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/streaming/
 
-cd DarwinStreamingSrvr4.1.2-Linux
+cd DarwinStreamingSrvrdss-Linux
 
-install MP3Broadcaster $RPM_BUILD_ROOT%{_prefix}/local/bin
-install PlaylistBroadcaster $RPM_BUILD_ROOT%{_prefix}/local/bin
-install qtpasswd $RPM_BUILD_ROOT%{_prefix}/local/bin
+install MP3Broadcaster $RPM_BUILD_ROOT%{_prefix}/bin
+install PlaylistBroadcaster $RPM_BUILD_ROOT%{_prefix}/bin
+install qtpasswd $RPM_BUILD_ROOT%{_prefix}/sbin
 
-install *.mov $RPM_BUILD_ROOT%{_prefix}/local/movies/
-install *.mp3 $RPM_BUILD_ROOT%{_prefix}/local/movies/
-install *.mp4 $RPM_BUILD_ROOT%{_prefix}/local/movies/
+install *.mov $RPM_BUILD_ROOT/var/lib/streaming/movies/
+install *.mp3 $RPM_BUILD_ROOT/var/lib/streaming/movies/
+install *.mp4 $RPM_BUILD_ROOT/var/lib/streaming/movies/
 
-install DarwinStreamingServer $RPM_BUILD_ROOT%{_prefix}/local/sbin
-install streamingadminserver.pl $RPM_BUILD_ROOT%{_prefix}/local/sbin
+install DarwinStreamingServer $RPM_BUILD_ROOT%{_prefix}/sbin
+install streamingadminserver.pl $RPM_BUILD_ROOT%{_prefix}/sbin
 
-install readme.pdf $RPM_BUILD_ROOT/var/streaming
+#install readme.pdf $RPM_BUILD_ROOT/var/streaming
 
-install AdminHtml/*.html $RPM_BUILD_ROOT/var/streaming/AdminHtml/
-install AdminHtml/*.pl $RPM_BUILD_ROOT/var/streaming/AdminHtml/
-install AdminHtml/*.cgi $RPM_BUILD_ROOT/var/streaming/AdminHtml/
-install AdminHtml/html_de/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_de/
-install AdminHtml/html_en/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_en/
-install AdminHtml/html_fr/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_fr/
-install AdminHtml/html_ja/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/html_ja/
-install AdminHtml/images/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/images/
-install AdminHtml/includes/* $RPM_BUILD_ROOT/var/streaming/AdminHtml/includes/
+install AdminHtml/*.html $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/
+install AdminHtml/*.pl $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/
+install AdminHtml/*.cgi $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/
+install AdminHtml/html_en/* $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/html_en/
+install AdminHtml/images/* $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/images/
+install AdminHtml/includes/* $RPM_BUILD_ROOT/usr/share/streaming/AdminHtml/includes/
 
 install qtgroups $RPM_BUILD_ROOT%{_sysconfdir}/streaming
 install qtusers $RPM_BUILD_ROOT%{_sysconfdir}/streaming
@@ -113,8 +125,12 @@ if [ -f /var/lock/subsys/DSS ]; then
 else
        echo "Run \"/etc/rc.d/init.d/%{name} start\" to start Streaming Server daemon."
 fi
-echo "Default admin username is aGFja21l. Set a password for it or, better "
-echo "delete it and create new admin username and password (using qtpasswd)"
+%banner %{name} -e <<EOF
+Default admin password is aGFja21l. Set a password for it or, better 
+delete it and create new admin username and password (using qtpasswd)
+
+EOF
+
 
 %preun
 if [ "$1" = "0" ]; then
@@ -124,27 +140,59 @@ if [ "$1" = "0" ]; then
        /sbin/chkconfig --del %{name}
 fi
 
+%pre 
+if [ -n "`/usr/bin/getgid qtss`" ]; then
+        if [ "`/usr/bin/getgid qtss`" != "148" ]; then
+                echo "Error: group qtss doesn't have gid=148. Correct this before installing dstreamserv." 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/groupadd -f -g 148 qtss 1>&2
+fi
+if [ -n "`/bin/id -u qtss 2>/dev/null`" ]; then
+        if [ "`/bin/id -u qtss`" != "148" ]; then
+                echo "Error: user qtss doesn't have uid=148. Correct this before installing dstreamserv." 1>&2
+                exit 1
+        fi
+else
+        /usr/sbin/useradd -g qtss -d /tmp -u 148 -s /bin/false qtss 1>&2
+fi
+
+%postun
+%userremove qtss
+%groupremove qtss
+
 %files
 %defattr(644,root,root,755)
 %attr(754,root,root) /etc/rc.d/init.d/%{name}
-%attr(755,root,root) %{_prefix}/local/bin/*
-%attr(750,root,root) %{_prefix}/local/sbin/*
-%attr(644,root,root) /var/streaming/readme.pdf
-%attr(777,root,root) /var/streaming/playlists
-%attr(755,root,root) /var/streaming/logs
-%attr(600,root,root) /var/streaming/AdminHtml/*.html
-%attr(600,root,root) /var/streaming/AdminHtml/*.pl
-%attr(600,root,root) /var/streaming/AdminHtml/*.cgi
-%attr(600,root,root) /var/streaming/AdminHtml/images/*
-%attr(600,root,root) /var/streaming/AdminHtml/includes/*
-%attr(600,root,root) /var/streaming/AdminHtml/html_de
-%attr(600,root,root) /var/streaming/AdminHtml/html_en
-%attr(600,root,root) /var/streaming/AdminHtml/html_fr
-%attr(600,root,root) /var/streaming/AdminHtml/html_ja
-%attr(600,root,root) %{_sysconfdir}/streaming/*
-%doc DarwinStreamingSrvr4.1.2-Linux/*-Sample
-%doc DarwinStreamingSrvr4.1.2-Linux/*-sample
+%attr(755,root,root) %{_prefix}/bin/*
+%attr(750,root,root) %{_prefix}/sbin/*
+%dir %attr(770,root,qtss) /var/log/streaming
+%dir /usr/lib/StreamingServerModules
+# /var/lib files 
+%dir /var/lib/streaming
+%dir %attr(750,qtss,qtss) /var/lib/streaming/playlists
+%dir %attr(750,qtss,qtss) /var/lib/streaming/movies
+%dir %attr(750,qtss,qtss) /var/lib/streaming/http
+# admin server
+%dir /usr/share/streaming
+%dir %attr(700,qtss,qtss) /usr/share/streaming/AdminHtml
+%dir %attr(700,qtss,qtss) /usr/share/streaming/AdminHtml/images
+%dir %attr(700,qtss,qtss) /usr/share/streaming/AdminHtml/includes
+%dir %attr(700,qtss,qtss) /usr/share/streaming/AdminHtml/html_en
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/*.html
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/*.pl
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/*.cgi
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/images/*
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/includes/*
+%attr(400,qtss,qtss) /usr/share/streaming/AdminHtml/html_en/*
+# etc 
+%dir %attr(750,qtss,qtss) %{_sysconfdir}/streaming
+%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/streaming/*
+
+%doc DarwinStreamingSrvrdss-Linux/*-Sample
+%doc DarwinStreamingSrvrdss-Linux/*-sample
 
 %files samples
-%defattr(644,root,root,755)
-%{_prefix}/local/movies/*
+%defattr(644,qtss,qtss,755)
+/var/lib/streaming/movies/*