rpms/flumotion/devel flumotion.spec,1.5,1.6

[Thomas Vander Stichele (thomasvs)]

Author: thomasvs

Update of /cvs/extras/rpms/flumotion/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21997

Modified Files:
	flumotion.spec 
Log Message:
sync with FC5 spec



Index: flumotion.spec
===================================================================
RCS file: /cvs/extras/rpms/flumotion/devel/flumotion.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- flumotion.spec	8 May 2006 16:03:39 -0000	1.5
+++ flumotion.spec	18 Jun 2006 10:30:14 -0000	1.6
@@ -1,11 +1,12 @@
 %define         gst_minver      0.10.1
 %define         gstpb_minver    0.10.1
 %define         gstpy_minver    0.10.0
+%define         pygtk_minver    2.8.0
 %define         gstreamer       gstreamer
 
 Name:           flumotion
 Version:        0.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Flumotion - the Fluendo Streaming Server
 
 Group:          Applications/Internet
@@ -19,9 +20,10 @@
 Requires:	%{gstreamer}-plugins-base >= %{gstpb_minver}
 Requires:	%{gstreamer}-python >= %{gstpy_minver}
 Requires:	python-twisted >= 1.3.0
-Requires:	pygtk2 >= 2.8.0
+Requires:	pygtk2 >= %{pygtk_minver}
 Requires:	python-imaging
-Requires:       pyOpenSSL
+Requires:	pyOpenSSL
+Requires:	pkgconfig
 
 # for make-dummy-cert to work
 Requires(post):	openssl
@@ -30,7 +32,7 @@
 BuildRequires:	%{gstreamer}-python >= %{gstpy_minver}
 BuildRequires:	python-twisted >= 1.3.0
 BuildRequires:	python-devel >= 2.3
-BuildRequires:	pygtk2-devel >= 2.8.0
+BuildRequires:	pygtk2-devel >= %{pygtk_minver}
 BuildRequires:	gtk2-devel
 
 # docs
@@ -63,14 +65,15 @@
 make DESTDIR=$RPM_BUILD_ROOT install
 
 # desktop file
-desktop-file-install --vendor fedora                    \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications         \
-  --add-category X-Fedora                               \
-  --delete-original                                     \
-  $RPM_BUILD_ROOT/%{_datadir}/applications/flumotion-admin.desktop
+desktop-file-install \
+  --vendor fedora \
+  --mode 644 \
+  --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+  --add-category X-Fedora \
+  --delete-original \
+  $RPM_BUILD_ROOT%{_datadir}/applications/flumotion-admin.desktop
 
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flumotion/managers/default/flows
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flumotion/workers
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/flumotion
 
 # install make-dummy-cert script
 install -d $RPM_BUILD_ROOT%{_datadir}/flumotion
@@ -84,11 +87,6 @@
 	doc/redhat/flumotion \
 	$RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d
 
-# create a .flumotion in the new home
-# FIXME: needs to be done more gracefully
-
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/flumotion/.flumotion
-
 # create log and run and cache directory
 install -d $RPM_BUILD_ROOT%{_localstatedir}/log/flumotion
 install -d $RPM_BUILD_ROOT%{_localstatedir}/run/flumotion
@@ -100,7 +98,11 @@
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-/usr/sbin/useradd -s /sbin/nologin -r -d %{_localstatedir}/cache/flumotion -M -r \
+/usr/sbin/useradd -s /sbin/nologin \
+	-r -d %{_localstatedir}/cache/flumotion -M \
+	flumotion > /dev/null 2> /dev/null || :
+# for old installs, we need to move the homedir
+/usr/sbin/usermod -d %{_localstatedir}/cache/flumotion \
 	flumotion > /dev/null 2> /dev/null || :
 
 %post
@@ -116,21 +118,26 @@
 
 # create a default planet config if no manager configs present
 # the default login will be user/test
-# FIXME: still need a way of specifying we really do not want a default manager
-if ! ls %{_sysconfdir}/flumotion/managers/*/*.xml >/dev/null 2>&1
+if ! test -e %{_sysconfdir}/flumotion/managers
 then
+  mkdir -p %{_sysconfdir}/flumotion/managers/default/flows
   cat > %{_sysconfdir}/flumotion/managers/default/planet.xml <<EOF
 <planet>
  
   <manager>
+    <!-- <debug>3</debug> -->
     <host>localhost</host>
 <!--
     <port>7531</port>
+    <transport>ssl</transport>
+    <!-- certificate path can be relative to $sysconfdir/flumotion,
+         or absolute -->
+    <certificate>default.pem</certificate>
 -->
     <component name="manager-bouncer" type="htpasswdcrypt">
-      <data><![CDATA[
+      <property name="data"><![CDATA[
 user:PSfNpHTkpTx1M
-]]></data>
+]]></property>
     </component>
   </manager>
  
@@ -140,9 +147,9 @@
 
 # create a default worker config if no worker configs present
 # the default login will be user/test
-# FIXME: still need a way of specifying we really do not want a default worker
-if ! test -e %{_sysconfdir}/flumotion/workers/default.xml
+if ! test -e %{_sysconfdir}/flumotion/workers
 then
+  mkdir -p %{_sysconfdir}/flumotion/workers
   cat > %{_sysconfdir}/flumotion/workers/default.xml <<EOF
 <worker>
  
@@ -219,6 +226,13 @@
 %{_sysconfdir}/rc.d/init.d/flumotion
 
 %changelog
+* Sun Jun 18 2006 Thomas Vander Stichele <thomas at apestaart dot org>
+- 0.2.2-2
+- only create default worker if there is not /etc/flumotion/workers
+- only create default manager if there is not /etc/flumotion/managers
+- make gstreamer versions defines
+- change flumotion home directory to /var/cache/flumotion
+
 * Mon May 08 2006 Thomas Vander Stichele <thomas at apestaart dot org>
 - 0.2.1-1
 - new upstream release