diff -Nru flumotion-0.7.0.2/ChangeLog flumotion-0.7.0.3/ChangeLog --- flumotion-0.7.0.2/ChangeLog 2010-08-27 16:16:31.000000000 +0100 +++ flumotion-0.7.0.3/ChangeLog 2010-09-02 20:58:46.000000000 +0100 @@ -1,3 +1,32 @@ +2010-08-31 Xavier Queralt + + * configure.ac: + * pkg/ubuntu-karmic/changelog: + * pkg/ubuntu-lucid/changelog: + 0.7.0.3 pre-release + +2010-08-31 Xavier Queralt + + reviewed by: Andoni Morales + + * flumotion/component/producers/firewire/wizard_gtk.py: + Default to gstreamer's deinterlace + +2010-08-31 Xavier Queralt + + reviewed by: Andoni Morales + + * flumotion/component/producers/firewire/firewire.py: + Set the name to the decoder so the effects can be plugged properly + +2010-08-30 Andoni Morales Alastruey + + reviewed by: Xavier Queralt + + * pkg/ubuntu-karmic/control: + * pkg/ubuntu-lucid/control: + Add missing 'python-dev' build dependency + 2010-08-27 Xavier Queralt * configure.ac: diff -Nru flumotion-0.7.0.2/configure flumotion-0.7.0.3/configure --- flumotion-0.7.0.2/configure 2010-08-27 16:17:01.000000000 +0100 +++ flumotion-0.7.0.3/configure 2010-09-02 20:59:21.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.67 for flumotion 0.7.0.2-8812. +# Generated by GNU Autoconf 2.67 for flumotion 0.7.0.2-8812-8818. # # Report bugs to . # @@ -702,8 +702,8 @@ # Identity of this package. PACKAGE_NAME='flumotion' PACKAGE_TARNAME='flumotion' -PACKAGE_VERSION='0.7.0.2-8812' -PACKAGE_STRING='flumotion 0.7.0.2-8812' +PACKAGE_VERSION='0.7.0.2-8812-8818' +PACKAGE_STRING='flumotion 0.7.0.2-8812-8818' PACKAGE_BUGREPORT='http://https://code.fluendo.com/flumotion/trac/newticket?component=flumotion' PACKAGE_URL='' @@ -1496,7 +1496,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures flumotion 0.7.0.2-8812 to adapt to many kinds of systems. +\`configure' configures flumotion 0.7.0.2-8812-8818 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1566,7 +1566,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of flumotion 0.7.0.2-8812:";; + short | recursive ) echo "Configuration of flumotion 0.7.0.2-8812-8818:";; esac cat <<\_ACEOF @@ -1675,7 +1675,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -flumotion configure 0.7.0.2-8812 +flumotion configure 0.7.0.2-8812-8818 generated by GNU Autoconf 2.67 Copyright (C) 2010 Free Software Foundation, Inc. @@ -1953,7 +1953,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by flumotion $as_me 0.7.0.2-8812, which was +It was created by flumotion $as_me 0.7.0.2-8812-8818, which was generated by GNU Autoconf 2.67. Invocation command line was $ $0 $@ @@ -2769,7 +2769,7 @@ # Define the identity of the package. PACKAGE='flumotion' - VERSION='0.7.0.2-8812' + VERSION='0.7.0.2-8812-8818' cat >>confdefs.h <<_ACEOF @@ -2811,9 +2811,9 @@ - PACKAGE_VERSION_MAJOR=$(echo 0.7.0.2-8812 | cut -d'.' -f1) - PACKAGE_VERSION_MINOR=$(echo 0.7.0.2-8812 | cut -d'.' -f2) - PACKAGE_VERSION_MICRO=$(echo 0.7.0.2-8812 | cut -d'.' -f3) + PACKAGE_VERSION_MAJOR=$(echo 0.7.0.2-8812-8818 | cut -d'.' -f1) + PACKAGE_VERSION_MINOR=$(echo 0.7.0.2-8812-8818 | cut -d'.' -f2) + PACKAGE_VERSION_MICRO=$(echo 0.7.0.2-8812-8818 | cut -d'.' -f3) @@ -2825,7 +2825,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking nano version" >&5 $as_echo_n "checking nano version... " >&6; } - NANO=$(echo 0.7.0.2-8812 | cut -d'.' -f4) + NANO=$(echo 0.7.0.2-8812-8818 | cut -d'.' -f4) if test x"$NANO" = x || test "x$NANO" = "x0" ; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: 0 (release)" >&5 @@ -13498,7 +13498,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by flumotion $as_me 0.7.0.2-8812, which was +This file was extended by flumotion $as_me 0.7.0.2-8812-8818, which was generated by GNU Autoconf 2.67. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13555,7 +13555,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -flumotion config.status 0.7.0.2-8812 +flumotion config.status 0.7.0.2-8812-8818 configured by $0, generated by GNU Autoconf 2.67, with options \\"\$ac_cs_config\\" diff -Nru flumotion-0.7.0.2/configure.ac flumotion-0.7.0.3/configure.ac --- flumotion-0.7.0.2/configure.ac 2010-08-27 16:16:31.000000000 +0100 +++ flumotion-0.7.0.3/configure.ac 2010-09-02 20:58:00.000000000 +0100 @@ -2,7 +2,7 @@ dnl when going to/from release please remove/add the nano (fourth number) dnl releases only do Wall, cvs and prerelease does Werror too -AC_INIT(flumotion, m4_esyscmd([ test -z "$VERSION" && VERSION=0.7.0.2; +AC_INIT(flumotion, m4_esyscmd([ test -z "$VERSION" && VERSION=0.7.0.3; common/version-gen $VERSION .tarball-version]), http://https://code.fluendo.com/flumotion/trac/newticket?component=flumotion, flumotion) diff -Nru flumotion-0.7.0.2/debian/changelog flumotion-0.7.0.3/debian/changelog --- flumotion-0.7.0.2/debian/changelog 2010-08-28 23:51:33.000000000 +0100 +++ flumotion-0.7.0.3/debian/changelog 2010-09-02 21:00:43.000000000 +0100 @@ -1,8 +1,8 @@ -flumotion (0.7.0.2-1flu1~karmic2) karmic; urgency=low +flumotion (0.7.0.3-1flu1~karmic1) karmic; urgency=low - * Add missing 'python-dev' build dependency + * New pre-release - -- Andoni Morales Alastruey Sat, 28 Aug 2010 23:30:21 +0200 + -- Xavier Queralt Tue, 31 Aug 2010 12:30:21 +0200 flumotion (0.7.0.2-1flu1~karmic1) karmic; urgency=low diff -Nru flumotion-0.7.0.2/flumotion/component/plugs/cortado/cortado_location.py flumotion-0.7.0.3/flumotion/component/plugs/cortado/cortado_location.py --- flumotion-0.7.0.2/flumotion/component/plugs/cortado/cortado_location.py 1970-01-01 01:00:00.000000000 +0100 +++ flumotion-0.7.0.3/flumotion/component/plugs/cortado/cortado_location.py 2010-09-02 20:59:28.000000000 +0100 @@ -0,0 +1,51 @@ +# -*- Mode: Python -*- +# vi:si:et:sw=4:sts=4:ts=4 +# +# Flumotion - a streaming media server +# Copyright (C) 2008 Fluendo, S.L. (www.fluendo.com). +# All rights reserved. + +# This file may be distributed and/or modified under the terms of +# the GNU General Public License version 2 as published by +# the Free Software Foundation. +# This file is distributed without any warranty; without even the implied +# warranty of merchantability or fitness for a particular purpose. +# See "LICENSE.GPL" in the source distribution for more information. + +# Licensees having purchased or holding a valid Flumotion Advanced +# Streaming Server license may use this file in accordance with the +# Flumotion Advanced Streaming Server Commercial License Agreement. +# See "LICENSE.Flumotion" in the source distribution for more information. + +# Headers in this file shall remain intact. + +import os + +CORTADO_PREFIX = "" + + +def getCortadoFilename(): + directories = ['/usr/local', '/usr'] + prefix = CORTADO_PREFIX[:] + if prefix: + if prefix.endswith('/'): + prefix = prefix[1:] + directories.insert(0, CORTADO_PREFIX) + for directory in directories: + # Debian/Ubuntu + name = os.path.join(directory, 'share', 'cortado', 'cortado-ovt.jar') + if os.path.exists(name): + return name + # OpenSuSE + name = os.path.join(directory, 'share', + 'java', 'cortado', 'cortado-ovt.jar') + if os.path.exists(name): + return name + # ant install_applet + for version in ['0.2.2', '0.2.1', '0.2.0']: + name = os.path.join( + directory, 'share', 'cortado', + 'cortado-ovt-stripped-%s.1.jar' % (version, )) + if os.path.exists(name): + return name + return None diff -Nru flumotion-0.7.0.2/flumotion/component/producers/firewire/firewire.py flumotion-0.7.0.3/flumotion/component/producers/firewire/firewire.py --- flumotion-0.7.0.2/flumotion/component/producers/firewire/firewire.py 2010-08-27 16:16:33.000000000 +0100 +++ flumotion-0.7.0.3/flumotion/component/producers/firewire/firewire.py 2010-09-02 20:58:00.000000000 +0100 @@ -29,7 +29,7 @@ from flumotion.component.effects.videorate import videorate from flumotion.component.effects.videoscale import videoscale -__version__ = "$Rev: 8809 $" +__version__ = "$Rev: 8816 $" T_ = gettexter() @@ -100,7 +100,7 @@ ' ! tee name=t' ' ! queue leaky=2 max-size-time=1000000000' ' ! dvdemux name=demux' - ' demux. ! queue ! %s' + ' demux. ! queue ! %s name=decoder' ' ! @feeder:video@' ' demux. ! queue ! audio/x-raw-int ' ' ! volume name=setvolume' @@ -122,11 +122,9 @@ self.addEffect(vol) decoder = pipeline.get_by_name("decoder") - if not decoder: - return if gstreamer.element_has_property(decoder, 'drop-factor'): if self.framerate: - framerate = float(self.framerate[0] / self.framerate[1]) + framerate = float(self.framerate.num / self.framerate.denom) if 12.5 < framerate: drop_factor = 1 elif 6.3 < framerate <= 12.5: diff -Nru flumotion-0.7.0.2/flumotion/component/producers/firewire/wizard_gtk.py flumotion-0.7.0.3/flumotion/component/producers/firewire/wizard_gtk.py --- flumotion-0.7.0.2/flumotion/component/producers/firewire/wizard_gtk.py 2010-08-27 16:16:33.000000000 +0100 +++ flumotion-0.7.0.3/flumotion/component/producers/firewire/wizard_gtk.py 2010-09-02 20:58:00.000000000 +0100 @@ -33,7 +33,7 @@ from flumotion.admin.gtk.basesteps import AudioProducerStep, VideoProducerStep __pychecker__ = 'no-returnvalues' -__version__ = "$Rev: 8809 $" +__version__ = "$Rev: 8817 $" _ = gettext.gettext T_ = gettexter() @@ -47,6 +47,7 @@ self.properties.is_square = True self.properties.framerate = 12.5 self.properties.decoder = 'ffdec_dvvideo' + self.properties.deinterlace_mode = 'tomsmocomp' def __eq__(self, other): if not isinstance(other, FireWireProducer): diff -Nru flumotion-0.7.0.2/flumotion/configure/installed.py flumotion-0.7.0.3/flumotion/configure/installed.py --- flumotion-0.7.0.2/flumotion/configure/installed.py 1970-01-01 01:00:00.000000000 +0100 +++ flumotion-0.7.0.3/flumotion/configure/installed.py 2010-09-02 20:59:28.000000000 +0100 @@ -0,0 +1,64 @@ +# -*- Mode: Python; test-case-name: flumotion.test.test_flumotion_config -*- +# vi:si:et:sw=4:sts=4:ts=4 +# +# Flumotion - a streaming media server +# Copyright (C) 2004,2005,2006,2007 Fluendo, S.L. (www.fluendo.com). +# All rights reserved. + +# This file may be distributed and/or modified under the terms of +# the GNU General Public License version 2 as published by +# the Free Software Foundation. +# This file is distributed without any warranty; without even the implied +# warranty of merchantability or fitness for a particular purpose. +# See "LICENSE.GPL" in the source distribution for more information. + +# Licensees having purchased or holding a valid Flumotion Advanced +# Streaming Server license may use this file in accordance with the +# Flumotion Advanced Streaming Server Commercial License Agreement. +# See "LICENSE.Flumotion" in the source distribution for more information. + +# Headers in this file shall remain intact. + +import os +from flumotion.common.log import safeprintf + + +def get(): + bindir = '/usr/local/bin' + datadir = '/usr/local/share' + localstatedir = '/usr/local/var' + libdir = '/usr/local/lib' + sbindir = '/usr/local/sbin' + sysconfdir = '/usr/local/etc' + + if 'FLU_CACHE_DIR' in os.environ: + cachedir = os.path.realpath(os.environ['FLU_CACHE_DIR']) + daemondir = cachedir + elif 'HOME' in os.environ: + homedir = os.environ['HOME'] + cachedir = os.path.join(homedir, '.flumotion') + daemondir = homedir + else: + cachedir = os.path.join( + localstatedir, 'cache', 'flumotion', + '.flumotion') + daemondir = os.path.join( + localstatedir, 'cache', 'flumotion') + + return { + 'isinstalled': True, + 'bindir': bindir, + 'cachedir': cachedir, + 'configdir': os.path.join(sysconfdir, 'flumotion'), + 'daemondir': daemondir, + 'datadir': os.path.join(datadir, 'flumotion'), + 'gladedir': os.path.join(datadir, 'flumotion', 'glade'), + 'imagedir': os.path.join(datadir, 'flumotion', 'image'), + 'localedatadir': os.path.join(datadir), + 'logdir': os.path.join(localstatedir, 'log', 'flumotion'), + 'pythondir': os.path.join(libdir, 'flumotion', 'python'), + 'registrydir': cachedir, + 'rundir': os.path.join(localstatedir, 'run', 'flumotion'), + 'sbindir': sbindir, + 'version': '0.7.0.2-8812-8818', + } diff -Nru flumotion-0.7.0.2/flumotion/configure/uninstalled.py flumotion-0.7.0.3/flumotion/configure/uninstalled.py --- flumotion-0.7.0.2/flumotion/configure/uninstalled.py 1970-01-01 01:00:00.000000000 +0100 +++ flumotion-0.7.0.3/flumotion/configure/uninstalled.py 2010-09-02 20:59:28.000000000 +0100 @@ -0,0 +1,62 @@ +# -*- Mode: Python; test-case-name: flumotion.test.test_flumotion_config -*- +# vi:si:et:sw=4:sts=4:ts=4 +# +# Flumotion - a streaming media server +# Copyright (C) 2004,2005,2006,2007 Fluendo, S.L. (www.fluendo.com). +# All rights reserved. + +# This file may be distributed and/or modified under the terms of +# the GNU General Public License version 2 as published by +# the Free Software Foundation. +# This file is distributed without any warranty; without even the implied +# warranty of merchantability or fitness for a particular purpose. +# See "LICENSE.GPL" in the source distribution for more information. + +# Licensees having purchased or holding a valid Flumotion Advanced +# Streaming Server license may use this file in accordance with the +# Flumotion Advanced Streaming Server Commercial License Agreement. +# See "LICENSE.Flumotion" in the source distribution for more information. + +# Headers in this file shall remain intact. + +import os +from flumotion.common.log import safeprintf + + +def get(): + # where am I on the disk ? + __thisdir = os.path.dirname(os.path.abspath(__file__)) + # toplevel dir + __toplevel = os.path.normpath(os.path.join(__thisdir, '..', '..')) + + __toplevelwrite = __toplevel + + # distcheck hack: if our __toplevel contains a directory _build, it means + # it was generated in distcheck mode and we should write everything + # under the writable builddir + # Don't change this without testing distcheck on an add-on project! + if os.path.exists(os.path.join(__toplevel, '_build')): + __toplevelwrite = os.path.join(__toplevel, '_build') + + __cachedir = os.environ.get('FLU_CACHE_DIR', + os.path.join(__toplevelwrite, 'cache')) + + ret = { + 'isinstalled': False, + 'cachedir': os.path.join(__cachedir), + 'configdir': os.path.join(__toplevel, 'conf'), + 'daemondir': os.path.join(__toplevelwrite), + 'datadir': os.path.join(__toplevel, 'data'), + 'gladedir': os.path.join(__toplevel, 'data', 'glade'), + 'imagedir': os.path.join(__toplevel, 'data', 'image'), + 'logdir': os.path.join(__toplevelwrite, 'log'), + 'localedatadir': os.path.join(__toplevelwrite), + 'pythondir': os.path.join(__toplevel), + 'registrydir': os.path.join(__cachedir, 'registry'), + 'rundir': os.path.join(__toplevelwrite, 'run'), + 'bindir': os.path.join(__toplevelwrite, 'bin'), + 'sbindir': os.path.join(__toplevelwrite, 'bin'), + 'version': '0.7.0.2-8812-8818', + } + + return ret diff -Nru flumotion-0.7.0.2/flumotion.spec flumotion-0.7.0.3/flumotion.spec --- flumotion-0.7.0.2/flumotion.spec 1970-01-01 01:00:00.000000000 +0100 +++ flumotion-0.7.0.3/flumotion.spec 2010-09-02 20:59:28.000000000 +0100 @@ -0,0 +1,337 @@ +%define gst_minver 0.10.11 +%define gstpb_minver 0.10.11 +%define gstpy_minver 0.10.4 +%define pygtk_minver 2.10.0 +%define kiwi_minver 1.9.13 + +%{!?gstreamer: %define gstreamer gstreamer} + +Name: flumotion +Version: 0.7.0.2_8812_8818 +Release: 0.20100902.215922%{?dist} +Summary: Streaming Server based on GStreamer and Twisted + +Group: Applications/Internet +License: GPL +URL: http://www.flumotion.net/ +Source: http://www.flumotion.net/src/flumotion/flumotion-0.7.0.2-8812-8818.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root + +Requires: python >= 2.4 +Requires: %{gstreamer} >= %{gst_minver} +Requires: %{gstreamer}-plugins-base >= %{gstpb_minver} +Requires: %{gstreamer}-python >= %{gstpy_minver} +Requires: python-twisted-core >= 2.5.0 +Requires: python-twisted-names +Requires: python-twisted-web +Requires: python-twisted-conch +Requires: python-dateutil +Requires: pygtk2-libglade +Requires: pygtk2 >= %{pygtk_minver} +Requires: pycairo +Requires: pyOpenSSL +Requires: pkgconfig +Requires: pyparsing +Requires: python-crypto +Requires: python-kiwi >= %{kiwi_minver} + +# for make-dummy-cert to work +Requires(post): openssl + +BuildRequires: python-devel >= 2.4 +BuildRequires: python >= 2.4 + +# docs +BuildRequires: epydoc +BuildRequires: xorg-x11-server-Xvfb +BuildRequires: pygtk2 +BuildRequires: %{gstreamer}-python +BuildRequires: python-twisted-core + +# sigh, libtool +BuildRequires: gcc-c++ + +BuildRequires: desktop-file-utils +BuildRequires: gettext +BuildRequires: intltool + +# since we compile fdpass, we're no longer noarch +# BuildArch: noarch + +%description +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. + +To define the base name of GStreamer packages to build against +(gstreamer or gstreamer010, depending on your distro), use e.g.: + --define 'gstreamer gstreamer010' + +%prep +%setup -q -n flumotion-0.7.0.2-8812-8818 + +%build +%configure + +make + +%install +rm -rf $RPM_BUILD_ROOT + +# use DESTDIR so compiled python files get tagged correctly with their +# final location +make DESTDIR=$RPM_BUILD_ROOT install + +# desktop file +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 + +# install service files +install -d $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d +install -m 755 \ + doc/redhat/flumotion \ + $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d + +# create log and run and cache and lib rrd directory +install -d $RPM_BUILD_ROOT%{_localstatedir}/log/flumotion +install -d $RPM_BUILD_ROOT%{_localstatedir}/run/flumotion +install -d $RPM_BUILD_ROOT%{_localstatedir}/cache/flumotion +install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/flumotion/rrd + +# Install the logrotate entry +%{__install} -m 0644 -D doc/redhat/flumotion.logrotate \ + %{buildroot}%{_sysconfdir}/logrotate.d/flumotion + +%find_lang flumotion + +%clean +rm -rf $RPM_BUILD_ROOT + +%pre +/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 +/sbin/chkconfig --add flumotion +# generate a default .pem certificate ? +PEM_FILE="%{_sysconfdir}/flumotion/default.pem" +if ! test -e ${PEM_FILE} +then + sh %{_datadir}/flumotion/make-dummy-cert ${PEM_FILE} + chown :flumotion ${PEM_FILE} + chmod 640 ${PEM_FILE} +fi + +# create a default planet config if no manager configs present +# the default login will be user/test +if ! test -e %{_sysconfdir}/flumotion/managers +then + mkdir -p %{_sysconfdir}/flumotion/managers/default/flows + cat > %{_sysconfdir}/flumotion/managers/default/planet.xml < + + + + localhost + + + + + + + + + +EOF +fi + +# create a default worker config if no worker configs present +# the default login will be user/test +if ! test -e %{_sysconfdir}/flumotion/workers +then + mkdir -p %{_sysconfdir}/flumotion/workers + cat > %{_sysconfdir}/flumotion/workers/default.xml < + + + + + + + + + user + test + + + + + +EOF + +fi + +%preun +# if removal and not upgrade, stop the processes, clean up locks +if [ $1 -eq 0 ] +then + /sbin/service flumotion stop > /dev/null + + 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 + +# Think about this first, we don't really want to stop everything +#%postun +# if [ $1 -ge 1 ]; then +# /sbin/service flumotion condrestart +# fi + +%files -f flumotion.lang +%defattr(-,root,root,-) +%doc ChangeLog COPYING README AUTHORS flumotion.doap +%doc doc/reference/html +%doc conf +%config(noreplace) %{_sysconfdir}/logrotate.d/flumotion +%{_bindir}/flumotion-manager +%{_bindir}/flumotion-worker +%{_bindir}/flumotion-admin +%{_bindir}/flumotion-admin-text +%{_bindir}/flumotion-command +%{_bindir}/flumotion-tester +%{_bindir}/flumotion-job +%{_bindir}/flumotion-inspect +%{_bindir}/flumotion-launch +%{_bindir}/flumotion-rrdmon +%{_bindir}/flumotion-nagios +%{_sbindir}/flumotion + +%{_libdir}/flumotion +%{_libdir}/pkgconfig/flumotion.pc + +%{_datadir}/applications/*.desktop +%{_datadir}/pixmaps/* +%{_mandir}/man1/flumotion*.1* + +%{_datadir}/flumotion/glade +%{_datadir}/flumotion/image +%{_datadir}/flumotion/make-dummy-cert +%{_datadir}/flumotion/*.xsl +%{_datadir}/flumotion/*.html +%{_datadir}/hal/fdi/policy/20thirdparty/91-flumotion-device-policy.fdi + +%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}/lib/flumotion +%attr(770,root,flumotion) %{_localstatedir}/lib/flumotion/rrd +%attr(770,flumotion,flumotion) %{_localstatedir}/cache/flumotion +%{_sysconfdir}/rc.d/init.d/flumotion + +%changelog +* Thu Jul 15 2010 Jan Urbanski +- Add BuildRequires necessary for docs building. + +* Thu Jun 03 2010 Andoni Morales Alastruey +- Replace PIL dependency with pycairo. + +* Thu Oct 30 2008 Thomas Vander Stichele +- Add directory for rrd databases now that we have a plug for it. + +* Tue Jul 22 2008 Thomas Vander Stichele +- Add gettext buildrequires; looks like on RHEL5 intltool doesn't pull it in. + +* Wed Apr 02 2008 Thomas Vander Stichele +- Add intltool buildrequires + +* Wed Nov 28 2007 Johan Dahlin +- Add kiwi dependency and bump pygtk to 2.8.4 + +* Fri Aug 24 2007 Zaheer Abbas Merali +- Add flumotion-nagios + +* Mon Jul 30 2007 Arek Korbik +- Add flumotion-rrdmon + +* Tue Jun 26 2007 Christian Schaller +- Adding SELinux policy file for setting device access + +* Wed May 16 2007 Thomas Vander Stichele +- Add a python-crypto dependency for the sha256 bouncer + +* Mon Jan 22 2007 Andy Wingo +- 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 +- 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 + +* Sun Jun 18 2006 Thomas Vander Stichele +- 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 + +* Fri Jul 29 2005 Thomas Vander Stichele +- added translations + +* Thu May 19 2005 Thomas Vander Stichele +- use disted make-dummy-cert + +* Mon Feb 14 2005 Christian Schaller +- Add desktop file for admin tool and icon + +* Thu Nov 11 2004 Thomas Vander Stichele +- Integrate changes from issue 86 + +* Fri Nov 05 2004 Christian Schaller +- Add call to chkconfig script in post and preun parts to get our service into + the service list + +* Fri Nov 05 2004 Thomas Vander Stichele +- use DESTDIR install to fix python compiles + +* Mon Jun 07 2004 Thomas Vander Stichele +- first package diff -Nru flumotion-0.7.0.2/.tarball-version flumotion-0.7.0.3/.tarball-version --- flumotion-0.7.0.2/.tarball-version 2010-08-27 16:22:26.000000000 +0100 +++ flumotion-0.7.0.3/.tarball-version 2010-09-02 21:00:42.000000000 +0100 @@ -1 +1 @@ -0.7.0.2-8812 +0.7.0.2-8812-8818