Author: qboosh Date: Tue Jan 31 14:52:08 2006 GMT Module: SPECS Tag: HEAD ---- Log message: - use some macros, cleanups
---- Files affected: SPECS: dstreamserv.spec (1.21 -> 1.22) ---- Diffs: ================================================================ Index: SPECS/dstreamserv.spec diff -u SPECS/dstreamserv.spec:1.21 SPECS/dstreamserv.spec:1.22 --- SPECS/dstreamserv.spec:1.21 Sun Dec 4 23:58:06 2005 +++ SPECS/dstreamserv.spec Tue Jan 31 15:52:03 2006 @@ -62,8 +62,8 @@ %patch3 -p1 %build -export CC=%{__cxx} -export CXX=%{__cxx} +export CC="%{__cxx}" +export CXX="%{__cxx}" ./buildtarball dss tar -xvzf DarwinStreamingSrvrdss-Linux.tar.gz cd DarwinStreamingSrvrdss-Linux @@ -78,39 +78,39 @@ $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%{_libdir}/StreamingServerModules \ + $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml \ + $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml/html_en \ + $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml/images \ + $RPM_BUILD_ROOT%{_datadir}/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%{_bindir} \ + $RPM_BUILD_ROOT%{_sbindir} \ $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/ +install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/streaming cd DarwinStreamingSrvrdss-Linux -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/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}/sbin -install streamingadminserver.pl $RPM_BUILD_ROOT%{_prefix}/sbin - -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 MP3Broadcaster $RPM_BUILD_ROOT%{_bindir} +install PlaylistBroadcaster $RPM_BUILD_ROOT%{_bindir} +install qtpasswd $RPM_BUILD_ROOT%{_sbindir} + +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%{_sbindir} +install streamingadminserver.pl $RPM_BUILD_ROOT%{_sbindir} + +install AdminHtml/*.html $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml +install AdminHtml/*.pl $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml +install AdminHtml/*.cgi $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml +install AdminHtml/html_en/* $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml/html_en +install AdminHtml/images/* $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml/images +install AdminHtml/includes/* $RPM_BUILD_ROOT%{_datadir}/streaming/AdminHtml/includes install qtgroups $RPM_BUILD_ROOT%{_sysconfdir}/streaming install qtusers $RPM_BUILD_ROOT%{_sysconfdir}/streaming @@ -154,35 +154,34 @@ %files %defattr(644,root,root,755) +%doc DarwinStreamingSrvrdss-Linux/*-Sample +%doc DarwinStreamingSrvrdss-Linux/*-sample %attr(754,root,root) /etc/rc.d/init.d/%{name} -%attr(755,root,root) %{_prefix}/bin/* -%attr(750,root,root) %{_prefix}/sbin/* +%attr(755,root,root) %{_bindir}/* +%attr(750,root,root) %{_sbindir}/* %dir %attr(770,root,qtss) /var/log/streaming -%dir /usr/lib/StreamingServerModules +%dir %{_libdir}/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/* +%dir %{_datadir}/streaming +%dir %attr(700,qtss,qtss) %{_datadir}/streaming/AdminHtml +%dir %attr(700,qtss,qtss) %{_datadir}/streaming/AdminHtml/images +%dir %attr(700,qtss,qtss) %{_datadir}/streaming/AdminHtml/includes +%dir %attr(700,qtss,qtss) %{_datadir}/streaming/AdminHtml/html_en +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/*.html +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/*.pl +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/*.cgi +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/images/* +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/includes/* +%attr(400,qtss,qtss) %{_datadir}/streaming/AdminHtml/html_en/* # etc %dir %attr(750,qtss,qtss) %{_sysconfdir}/streaming %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/streaming/* -%doc DarwinStreamingSrvrdss-Linux/*-Sample -%doc DarwinStreamingSrvrdss-Linux/*-sample - %files samples %defattr(644,root,root,755) %attr(644,qtss,qtss) /var/lib/streaming/movies/* @@ -193,6 +192,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.22 2006/01/31 14:52:03 qboosh +- use some macros, cleanups + Revision 1.21 2005/12/04 22:58:06 glen - adapterized (sorted %verify flags) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/dstreamserv.spec?r1=1.21&r2=1.22&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit