rpms/flumotion/FC-5 flumotion.spec,1.12,1.13

[Thomas Vander Stichele (thomasvs)]

Author: thomasvs

Update of /cvs/extras/rpms/flumotion/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30474/FC-5

Modified Files:
	flumotion.spec 
Log Message:
add a dependency for the next build


Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/FC-5/flumotion.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- flumotion.spec	25 Jan 2007 14:27:11 -0000	1.12
+++ flumotion.spec	16 May 2007 09:16:57 -0000	1.13
@@ -5,8 +5,8 @@
 %define         gstreamer       gstreamer
 
 Name:           flumotion
-Version:        0.2.3
-Release:        1%{?dist}
+Version:        0.4.2
+Release:        2%{?dist}
 Summary:        Flumotion - the Fluendo Streaming Server
 
 Group:          Applications/Internet
@@ -19,18 +19,23 @@
 Requires:	%{gstreamer} >= %{gst_minver}
 Requires:	%{gstreamer}-plugins-base >= %{gstpb_minver}
 Requires:	%{gstreamer}-python >= %{gstpy_minver}
-Requires:	python-twisted >= 1.3.0
+Requires:       python-twisted-core >= 2.4.0
+Requires:       python-twisted-names
+Requires:       python-twisted-web
 Requires:	pygtk2 >= %{pygtk_minver}
 Requires:	python-imaging
 Requires:	pyOpenSSL
 Requires:	pkgconfig
+Requires:       pycrypto
 
 # for make-dummy-cert to work
 Requires(post):	openssl
 
 BuildRequires:	%{gstreamer}-devel >= %{gst_minver}
 BuildRequires:	%{gstreamer}-python >= %{gstpy_minver}
-BuildRequires:	python-twisted >= 1.3.0
+BuildRequires:  python-twisted-core >= 2.4.0
+BuildRequires:  python-twisted-names
+BuildRequires:  python-twisted-web
 BuildRequires:	python-devel >= 2.3
 BuildRequires:	pygtk2-devel >= %{pygtk_minver}
 BuildRequires:	gtk2-devel
@@ -49,6 +54,21 @@
 %description
 Flumotion, the Fluendo Streaming Server.
 
+Flumotion is a GPL streaming media server written in Python. It is distributed
+and component-based: every step in the streaming process (production,
+conversion, consumption) can be run inside a separate process on separate
+machines.
+
+Flumotion uses Twisted and GStreamer. Twisted enables the high-level
+functionality, distributing components over the network. GStreamer, through the
+Python bindings, enables the high-speed low-level functionality: actual media
+processing.
+
+Flumotion uses a central manager process to control the complete network; one
+or more worker processes distributed over machines to run actual streaming
+components; and one or more admin clients connecting to the manager to control
+it.
+
 %prep
 %setup -q
 
@@ -75,12 +95,6 @@
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flumotion
 
-# install make-dummy-cert script
-install -d $RPM_BUILD_ROOT%{_datadir}/flumotion
-install -m 644 \
-	doc/redhat/make-dummy-cert \
-	$RPM_BUILD_ROOT%{_datadir}/flumotion
-
 # install service files
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 install -m 755 \
@@ -92,6 +106,10 @@
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/flumotion
 install -d $RPM_BUILD_ROOT%{_localstatedir}/cache/flumotion
 
+# Install the logrotate entry
+%{__install} -m 0644 -D doc/redhat/flumotion.logrotate \
+    %{buildroot}%{_sysconfdir}/logrotate.d/flumotion
+
 %find_lang flumotion
 
 %clean
@@ -136,7 +154,7 @@
 <!--
     <certificate>default.pem</certificate>
 -->
-    <component name="manager-bouncer" type="htpasswdcrypt">
+    <component name="manager-bouncer" type="htpasswdcrypt-bouncer">
       <property name="data"><![CDATA[
 user:PSfNpHTkpTx1M
 ]]></property>
@@ -184,6 +202,11 @@
 
   rm -rf %{_localstatedir}/lock/flumotion*
   rm -rf %{_localstatedir}/run/flumotion*
+
+  # clean out the cache/home dir too, without deleting it or the user
+  rm -rf %{_localstatedir}/cache/flumotion/*
+  rm -rf %{_localstatedir}/cache/flumotion/.[^.]*
+
   /sbin/chkconfig --del flumotion
 fi
 
@@ -195,9 +218,10 @@
 
 %files -f flumotion.lang
 %defattr(-,root,root,-)
-%doc ChangeLog COPYING README AUTHORS
+%doc ChangeLog COPYING README AUTHORS flumotion.doap
 %doc doc/reference/html
 %doc conf
+%config %{_sysconfdir}/logrotate.d/flumotion
 %{_bindir}/flumotion-manager
 %{_bindir}/flumotion-worker
 %{_bindir}/flumotion-admin
@@ -216,26 +240,38 @@
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/flumotion*.1*
 
+%dir %{_datadir}
 %{_datadir}/flumotion/glade
 %{_datadir}/flumotion/image
 %{_datadir}/flumotion/make-dummy-cert
 %{_datadir}/flumotion/*.xsl
 
-%attr(750,flumotion,flumotion) %{_sysconfdir}/flumotion
-%attr(750,flumotion,flumotion) %{_localstatedir}/run/flumotion
-%attr(750,flumotion,flumotion) %{_localstatedir}/log/flumotion
-%attr(750,flumotion,flumotion) %{_localstatedir}/cache/flumotion
+%attr(750,root,flumotion) %{_sysconfdir}/flumotion
+%attr(770,root,flumotion) %{_localstatedir}/run/flumotion
+%attr(770,root,flumotion) %{_localstatedir}/log/flumotion
+%attr(770,root,flumotion) %{_localstatedir}/cache/flumotion
 %{_sysconfdir}/rc.d/init.d/flumotion
 
 %changelog
-* Thu Jan 25 2007 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.2.3-1
-- new release
-- fix ownership to flumotion:flumotion of various directories
+* Wed May 16 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.2-2
+- Own datadir/flumotion. Fixes #233834.
+- Require pycrypto for the sha256 bouncer.
+- NOT YET BUILT
 
-* Tue Oct 31 2006 Thomas Vander Stichele <thomas at apestaart dot org>
-- 0.2.2-2
-- fix the comment in the xml
+* Sat Apr 14 2007 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.4.2-1
+- new upstream release
+
+* Mon Jan 22 2007 Andy Wingo <wingo at pobox.com>
+- Make the run, log, and cache directories group-writable, so that
+  processes can manage their own pid, log files, and registry caches.
+
+* Tue Dec 19 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- switch around to root:flumotion for ownership of various directories,
+  allowing users in the flumotion group to see logs and config
+- remove flumotion cache/home dir contents
+- clean up commenting in manager config
 
 * Fri Sep 29 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.2-1