rpms/elisa/F-9 elisa-0.5.29-disable-plugin-updates.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 elisa.spec, 1.5, 1.6 sources, 1.5, 1.6

[Matthias Saou]

Author: thias

Update of /cvs/extras/rpms/elisa/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4976/F-9

Modified Files:
	.cvsignore elisa.spec sources 
Added Files:
	elisa-0.5.29-disable-plugin-updates.patch 
Log Message:
Update to 0.5.30 (at last!).


elisa-0.5.29-disable-plugin-updates.patch:

--- NEW FILE elisa-0.5.29-disable-plugin-updates.patch ---
diff -Naupr elisa-0.5.29.orig/elisa/core/plugin_registry.py elisa-0.5.29/elisa/core/plugin_registry.py
--- elisa-0.5.29.orig/elisa/core/plugin_registry.py	2009-02-23 16:58:28.000000000 +0100
+++ elisa-0.5.29/elisa/core/plugin_registry.py	2009-02-28 15:38:10.347332907 +0100
@@ -156,8 +156,8 @@ class PluginRegistry(Loggable):
     default_config = \
         {'repository': 'http://elisa-plugins.fluendo.com/plugin_list',
          'update_plugin_cache': True,
-         'auto_update_plugins': True,
-         'auto_install_new_recommended_plugins': True}
+         'auto_update_plugins': False,
+         'auto_install_new_recommended_plugins': False}
     config_doc = \
         {'repository': 'The plugin repository to query for new plugins and ' \
             'plugin updates.',


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa/F-9/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	23 Feb 2008 23:53:30 -0000	1.5
+++ .cvsignore	4 Mar 2009 10:30:57 -0000	1.6
@@ -1 +1 @@
-elisa-0.3.3.tar.gz
+elisa-0.5.30.tar.gz


Index: elisa.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa/F-9/elisa.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- elisa.spec	23 Feb 2008 23:53:30 -0000	1.5
+++ elisa.spec	4 Mar 2009 10:30:57 -0000	1.6
@@ -2,68 +2,57 @@
 
 Summary: Media Center
 Name: elisa
-Version: 0.3.3
+Version: 0.5.30
 Release: 1%{?dist}
-# Elisa is GPLv3 and plugins are MIT.
+# The base of Elisa is GPLv3, some plugins are MIT but are in other packages.
 # See the included COPYING file for the details.
-License: GPLv3 and MIT
+License: GPLv3
 Group: Applications/Multimedia
 URL: http://elisa.fluendo.com/
-Source: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz
-Patch0: elisa-0.3.2-desktop.patch
+Source0: http://elisa.fluendo.com/static/download/elisa/elisa-%{version}.tar.gz
+Patch0: elisa-0.5.29-disable-plugin-updates.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-# Mandatory
-Requires: python-setuptools
-Requires: python-imaging
-Requires: python-twisted-core
-Requires: gnome-python2-extras
-Requires: gstreamer-python
-Requires: pigment-python >= 0.3.2
-# For uPnP
-Requires: python-Coherence
-# For caching
-Requires: python-sqlite2
-Requires: python-tag
-# Optional, but these are useful to get something useful out of elisa
-Requires: gstreamer-plugins-good
-#Requires: gstreamer-plugins-bad
-#Requires: gstreamer-plugins-ugly
-#Requires: gstreamer-ffmpeg
-#Requires: libdvdcss
-# For lirc
-Requires: python-lirc
-# For DAAP
-Requires: python-daap
-Requires: dbus-python
-Requires: avahi-tools
-# For iPod
-Requires: python-gpod
-# For weather
-Requires: python-metar
-# For the "official" default font ("MgOpen Cosmetica")
-Requires: mgopen-fonts
-# For ... ? (but checked at runtime)
-Requires: python-BeautifulSoup
-# For the "build" itself, most of the above aren't required
+# Our "base" files for building the plugins where the main requirements are
+Requires: elisa-base = %{version}-%{release}
+# Plugins. The bad are actually mandatory (they contain the GUI for instance)
+Requires: elisa-plugins-good >= %{version}
+Requires: elisa-plugins-bad >= %{version}
+# For the "build" itself, most of the above aren't required, just these
 BuildRequires: python-devel
 BuildRequires: python-twisted-core
-BuildRequires: gstreamer-python
-# Must have setuptools to build the package
-# The build portions moved to a subpackage in F-8
-%if 0%{?fedora} >= 8
 BuildRequires: python-setuptools-devel
-%else
-BuildRequires: python-setuptools
-%endif
 Buildarch: noarch
 
 %description
 Media center solution using the GStreamer multimedia framework.
 
 
+%package base
+Summary: Base files for the Elisa Media Center
+Group: Applications/Multimedia
+# Mandatory
+Requires: python-setuptools
+Requires: python-imaging
+Requires: gnome-python2-extras
+# elisa/core/utils/misc.py at least requires this
+Requires: python-twisted-core
+# elisa/core/applition.py at least requires this (as of 0.5.17, still 0.5.18)
+Requires: python-twisted-web
+# We used to have a "common" package providing the "devel"
+# Then we used to have a "devel" package... but now we just BR "base"
+Obsoletes: elisa-common < 0.5.9
+Obsoletes: elisa-devel < 0.5.14
+# The whole point of having this base package is to split off the basic files
+# which are required to build the plugins, since those plugins are runtime
+# required by the main "elisa" package (avoid a dependency loop).
+
+%description base
+Base files for the Elisa Media Center.
+
+
 %prep
 %setup -q
-%patch0 -p1 -b .desktop
+%patch0 -p1
 
 
 %build
@@ -76,9 +65,8 @@
     --single-version-externally-managed \
     -O1 --skip-build --root %{buildroot}
 
-# Remove this i386 only binary plugin...
-%{__rm} -f %{buildroot}%{python_sitelib}/elisa/plugins/ugly/youtube/libgstflvdemux.so
-
+# Create empty plugins directory
+%{__mkdir_p} %{buildroot}%{python_sitelib}/elisa/plugins
 
 %clean
 %{__rm} -rf %{buildroot}
@@ -86,15 +74,148 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ* FIRST_RUN LICENSE* NEWS RELEASE docs/*.txt
+%doc AUTHORS FAQ FIRST_RUN NEWS README docs/*.txt
 %{_bindir}/elisa
 %{_datadir}/applications/elisa.desktop
+%exclude %{_datadir}/applications/elisa-mobile.desktop
+%{_datadir}/dbus-1/services/com.fluendo.elisa.service
+%exclude %{_datadir}/icons/elisa.png
 %{_datadir}/pixmaps/elisa.png
+%{_mandir}/man1/elisa.1*
+
+%files base
+%defattr(-,root,root,-)
+%doc COPYING LICENSE*
 %{python_sitelib}/elisa/
 %{python_sitelib}/elisa-*.egg-info/
+%{python_sitelib}/elisa-*-nspkg.pth
 
 
 %changelog
+* Tue Mar  3 2009 Matthias Saou <http://freshrpms.net/> 0.5.30-1
+- Update to 0.5.30.
+
+* Sat Feb 28 2009 Matthias Saou <http://freshrpms.net/> 0.5.29-1
+- Update to 0.5.29.
+- Include patch to disable automatic updates, which should better conform with
+  Fedora packaging policies.
+
+* Tue Feb 17 2009 Matthias Saou <http://freshrpms.net/> 0.5.28-1
+- Update to 0.5.28.
+
+* Fri Feb 13 2009 Matthias Saou <http://freshrpms.net/> 0.5.27-1
+- Update to 0.5.27.
+
+* Sat Feb  7 2009 Matthias Saou <http://freshrpms.net/> 0.5.26-1
+- Update to 0.5.26.
+
+* Wed Jan 21 2009 Matthias Saou <http://freshrpms.net/> 0.5.24.1-1
+- Update to 0.5.24.1.
+- Drop the mgopen-fonts req, it hasn't been the default font for a while.
+
+* Mon Jan 12 2009 Matthias Saou <http://freshrpms.net/> 0.5.23-1
+- Update to 0.5.23.
+
+* Thu Dec 18 2008 Matthias Saou <http://freshrpms.net/> 0.5.22-1
+- Update to 0.5.22.
+
+* Mon Dec  1 2008 Matthias Saou <http://freshrpms.net/> 0.5.20-1
+- Update to 0.5.20.
+
+* Mon Nov 24 2008 Matthias Saou <http://freshrpms.net/> 0.5.19-1
+- Update to 0.5.19.
+
+* Mon Nov 17 2008 Matthias Saou <http://freshrpms.net/> 0.5.18-1
+- Update to 0.5.18.
+
+* Sun Nov  9 2008 Matthias Saou <http://freshrpms.net/> 0.5.17-2
+- Add (now) missing python-twisted-web requirement.
+
+* Tue Nov  4 2008 Matthias Saou <http://freshrpms.net/> 0.5.17-1
+- Update to 0.5.17.
+
+* Mon Oct 27 2008 Matthias Saou <http://freshrpms.net/> 0.5.16-1
+- Update to 0.5.16.
+
+* Tue Oct 21 2008 Matthias Saou <http://freshrpms.net/> 0.5.15-1
+- Update to 0.5.15.
+
+* Mon Oct 13 2008 Matthias Saou <http://freshrpms.net/> 0.5.14-1
+- Update to 0.5.14.
+
+* Fri Oct 10 2008 Matthias Saou <http://freshrpms.net/> 0.5.13-2
+- Go back to using an elisa/elisa-base split, we'll just BR elisa-base in
+  the plugins.
+
+* Tue Oct  7 2008 Matthias Saou <http://freshrpms.net/> 0.5.13-1
+- Update to 0.5.13.
+
+* Tue Sep 30 2008 Matthias Saou <http://freshrpms.net/> 0.5.12-1
+- Update to 0.5.12.
+
+* Tue Sep 23 2008 Matthias Saou <http://freshrpms.net/> 0.5.11-1
+- Update to 0.5.11.
+
+* Tue Sep 16 2008 Matthias Saou <http://freshrpms.net/> 0.5.10-1
+- Update to 0.5.10.
+
+* Tue Sep  9 2008 Matthias Saou <http://freshrpms.net/> 0.5.9-1
+- Update to 0.5.9.
+
+* Mon Sep  2 2008 Matthias Saou <http://freshrpms.net/> 0.5.8-3
+- Update to 0.5.8.
+- Replace the "common" package approach with a split out "devel" one which
+  contains some duplicated files from the main package.
+
+* Tue Aug 26 2008 Matthias Saou <http://freshrpms.net/> 0.5.7-1
+- Update to 0.5.7.
+
+* Tue Aug 19 2008 Matthias Saou <http://freshrpms.net/> 0.5.6-1
+- Update to 0.5.6.
+- Require the exact same elisa plugins version, as elisa and all plugins are
+  always released all at once and should always match.
+
+* Mon Aug 11 2008 Matthias Saou <http://freshrpms.net/> 0.5.5-1
+- Update to 0.5.5.
+
+* Fri Aug  8 2008 Matthias Saou <http://freshrpms.net/> 0.5.4-1
+- Update to 0.5.4.
+
+* Tue Jul 29 2008 Matthias Saou <http://freshrpms.net/> 0.5.3-1
+- Update to 0.5.3.
+
+* Wed Jul 23 2008 Matthias Saou <http://freshrpms.net/> 0.5.2-4
+- Update to 0.5.2.
+- Split a "common" sub-package required by the main "elisa" package and
+  providing a "devel" sub-package.
+- Add plugins requirements, made possible thanks to the above hack.
+- Update requirements, moving many to the proper plugins sub-packages.
+
+* Tue Jul 15 2008 Matthias Saou <http://freshrpms.net/> 0.5.1-6
+- Update to the fixed 0.5.1 tarball.
+- Remove Windows specific plugins from the default configuration.
+
+* Mon Jul 14 2008 Matthias Saou <http://freshrpms.net/> 0.5.1-4
+- Use the right 0.5 branch, it's the "upicek" one, not "0.5", go figure...
+
+* Sat Jul 12 2008 Matthias Saou <http://freshrpms.net/> 0.5.1-3
+- Use a bzr branch as sources, as the 0.5.1 tarball is completely broken.
+- Don't exclude the docs.
+
+* Fri Jul 11 2008 Matthias Saou <http://freshrpms.net/> 0.5.1-1
+- Update to 0.5.1.
+- Include as sources the no longer provided elisa.desktop and elisa.png.
+- Remove no longer needed desktop file patch.
+
+* Wed Mar 12 2008 Matthias Saou <http://freshrpms.net/> 0.3.5-1
+- Update to 0.3.5.
+- Add new included files.
+- Include empty plugins directory.
+
+* Tue Mar  4 2008 Matthias Saou <http://freshrpms.net/> 0.3.4-1
+- Update to 0.3.4.
+- Add new elisa-plugins-* requirements.
+
 * Sun Feb 24 2008 Matthias Saou <http://freshrpms.net/> 0.3.3-2
 - Require pigment-python instead of pigment now that it has been split out.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/elisa/F-9/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	23 Feb 2008 23:53:30 -0000	1.5
+++ sources	4 Mar 2009 10:30:57 -0000	1.6
@@ -1 +1 @@
-44397c8c0c70fcf3eabae5bad9fd514d  elisa-0.3.3.tar.gz
+e733f377103d2ded6eb4acc16fbf1768  elisa-0.5.30.tar.gz