packages: dss/dss.spec - move adminhtml to datadir, partial merge from dstr...

[glen]

Author: glen                         Date: Sun Aug  1 14:47:33 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move adminhtml to datadir, partial merge from dstreamserv.spec

---- Files affected:
packages/dss:
   dss.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/dss/dss.spec
diff -u packages/dss/dss.spec:1.8 packages/dss/dss.spec:1.9
--- packages/dss/dss.spec:1.8	Sun Aug  1 16:37:03 2010
+++ packages/dss/dss.spec	Sun Aug  1 16:47:28 2010
@@ -4,9 +4,9 @@
 Summary:	Darwin Streaming Server
 Name:		dss
 Version:	6.0.3
-Release:	0.4
+Release:	0.6
 License:	Apple Public Source License
-Group:		Applications
+Group:		Networking/Daemons
 Source0:	http://dss.macosforge.org/downloads/DarwinStreamingSrvr%{version}-Source.tar
 # Source0-md5:	ca676691db8417d05121699c0ca3d549
 Patch0:		%{name}.patch
@@ -26,6 +26,9 @@
 Requires:	rc-scripts
 Provides:	group(qtss)
 Provides:	user(qtss)
+Obsoletes:	DSS
+Obsoletes:	dstreamserv
+Obsoletes:	dstreamsrv
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -39,6 +42,10 @@
 delivers perfectly synchronized audio and video streams ideal for
 Internet video and live events.
 
+%description -l pl.UTF-8
+Serwer strumieni pozwala wysyłać strumienie danych QuickTime do
+klientów w Internecie przy użyciu protokołów RTP i RTSP.
+
 %package Proxy
 Summary:	Apple's Darwin Streaming Proxy
 Group:		Daemons
@@ -63,7 +70,7 @@
 
 %package Utils
 Summary:	Apple's Darwin Streaming Server Movie inspection utilities
-Group:		Daemons
+Group:		Applications
 
 %description Utils
 - QTBroadcaster Requires a target ip address, a source movie, one or
@@ -110,6 +117,7 @@
 Summary:	Darwin Streaming Server - samples
 Summary(pl.UTF-8):	Przykłady do Darwin Streaming Servera
 Group:		Networking/Daemons
+Obsoletes:	dstreamserv-samples
 
 %description samples
 Sample files for Streaming Server.
@@ -130,6 +138,7 @@
 	s|/''usr/local/sbin/StreamingServerModules|%{_libdir}/%{name}/|g
 	s|/''usr/local/|%{_prefix}/|g
 	s|/''etc/streaming|%{_sysconfdir}/%{name}|g
+	s|/var/streaming/AdminHtml|%{_datadir}/%{name}/AdminHtml|g
 	s|/var/streaming/logs|%{_localstatedir}/log/%{name}|g
 	s|/var/streaming/|%{_localstatedir}/lib/%{name}/|g
 '	DSS_MakeRoot streamingserver.xml-POSIX \
@@ -255,8 +264,15 @@
 %dir /var/lib/%{name}
 %dir /var/lib/%{name}/movies
 
-# admin html (subpackage?)
-/var/lib/%{name}/AdminHtml
+# admin server (subpackage?)
+%dir %{_datadir}/%{name}
+%dir %{_datadir}/%{name}/AdminHtml
+%{_datadir}/%{name}/AdminHtml/html_en
+%{_datadir}/%{name}/AdminHtml/images
+%{_datadir}/%{name}/AdminHtml/includes
+%{_datadir}/%{name}/AdminHtml/*.html
+%{_datadir}/%{name}/AdminHtml/*.pl
+%attr(755,root,root) %{_datadir}/%{name}/AdminHtml/*.cgi
 
 %files samples
 %defattr(644,root,root,755)
@@ -268,6 +284,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2010/08/01 14:47:28  glen
+- move adminhtml to datadir, partial merge from dstreamserv.spec
+
 Revision 1.8  2010/08/01 14:37:03  glen
 - add qtss user/group
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dss/dss.spec?r1=1.8&r2=1.9&f=u