rpms/elisa/devel elisa-0.5.13-nowinplugins.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 elisa.spec, 1.5, 1.6 sources, 1.5, 1.6 elisa-0.3.2-desktop.patch, 1.1, NONE

Fri Oct 10 12:31:19 UTC 2008

Author: thias

Update of /cvs/extras/rpms/elisa/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20353

Modified Files:
	.cvsignore elisa.spec sources 
Added Files:
	elisa-0.5.13-nowinplugins.patch 
Removed Files:
	elisa-0.3.2-desktop.patch 
Log Message:
Update to 0.5.13.


elisa-0.5.13-nowinplugins.patch:

--- NEW FILE elisa-0.5.13-nowinplugins.patch ---
diff -Naupr elisa-0.5.13.orig/elisa/core/application.py elisa-0.5.13/elisa/core/application.py
--- elisa-0.5.13.orig/elisa/core/application.py	2008-10-06 20:48:29.000000000 +0200
+++ elisa-0.5.13/elisa/core/application.py	2008-10-08 18:09:08.000000000 +0200
@@ -83,10 +83,10 @@ DEFAULT_CONFIG = """\
 [general]
 version = '%(version)s'
 install_date = '%(install_date)s'
-resource_providers = ['amazon.resource_provider:AmazonResourceProvider', 'discogs.discogs_resource:DiscogsResource', 'database.media_scanner:MediaScanner', 'weather.report_provider:WeatherReportProvider', 'base.local_resource:LocalResource', 'youtube.resource_provider:YoutubeResourceProvider', 'shoutcast.shoutcast_resource:ShoutcastResource', 'flickr.resource_provider:FlickrResourceProvider', 'wmd.wmd_resource:WMDResource', 'filtered_shares.filtered_shares_resource:FilteredSharesResource', 'coherence.coherence_resource:CoherenceResource', 'coherence.upnp_resource:UpnpResource', 'smbwin32.smbwin32_resource:SmbWin32Resource', 'elisa_updater.resource_provider:UpdaterResourceProvider', 'ipod.ipod_resource:IpodResource', 'hal.hal_resource:HALResource', 'avahi.avahi_resource_provider:AvahiResourceProvider', 'daap.daap_resource_provider:DaapResourceProvider', 'search.search_metaresource_provider:SearchMetaresourceProvider', 'yesfm.yesfm_resource:YesfmResource']
+resource_providers = ['amazon.resource_provider:AmazonResourceProvider', 'discogs.discogs_resource:DiscogsResource', 'database.media_scanner:MediaScanner', 'weather.report_provider:WeatherReportProvider', 'base.local_resource:LocalResource', 'youtube.resource_provider:YoutubeResourceProvider', 'shoutcast.shoutcast_resource:ShoutcastResource', 'flickr.resource_provider:FlickrResourceProvider', 'filtered_shares.filtered_shares_resource:FilteredSharesResource', 'coherence.coherence_resource:CoherenceResource', 'coherence.upnp_resource:UpnpResource', 'ipod.ipod_resource:IpodResource', 'hal.hal_resource:HALResource', 'avahi.avahi_resource_provider:AvahiResourceProvider', 'daap.daap_resource_provider:DaapResourceProvider', 'search.search_metaresource_provider:SearchMetaresourceProvider', 'yesfm.yesfm_resource:YesfmResource']
 metadata_providers = []
 service_providers = ['coherence.coherence_service:CoherenceService', 'osso.osso_service:OssoService', 'gnome.gnome_screensaver_service:GnomeScreensaverService', 'database.dbus_service:DatabaseDBusServiceProvider']
-input_providers = ['winremote.streamzap_input:StreamzapInput', 'lirc.lirc_input:LircInput']
+input_providers = ['lirc.lirc_input:LircInput']
 frontends = ['frontend1']
 # database connection string. see https://storm.canonical.com/Manual
 database = '%(database_uri)s'


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/.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	10 Oct 2008 12:30:48 -0000	1.6
@@ -1 +1 @@
-elisa-0.3.3.tar.gz
+elisa-0.5.13.tar.gz


Index: elisa.spec
===================================================================
RCS file: /cvs/extras/rpms/elisa/devel/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	10 Oct 2008 12:30:48 -0000	1.6
@@ -2,68 +2,65 @@
 
 Summary: Media Center
 Name: elisa
-Version: 0.3.3
-Release: 1%{?dist}
+Version: 0.5.13
+Release: 2%{?dist}
 # Elisa is GPLv3 and plugins are MIT.
 # See the included COPYING file for the details.
 License: GPLv3 and MIT
 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
+# Patch to disable trying to load the Windows only plugins we don't include :
+# wmd smbwin32 elisa_updater winremote
+Patch0: elisa-0.5.13-nowinplugins.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
+# Our split out "common" files used for building the plugins
+Requires: elisa-common = %{version}-%{release}
+# elisa/core/utils/misc.py at least requires this
+Requires: python-twisted-core
+# Plugins. The bad are actually mandatory (they contain the GUI for instance)
+Requires: elisa-plugins-good = %{version}
+Requires: elisa-plugins-bad = %{version}
 # 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
 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
+# 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 +73,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 +82,99 @@
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS ChangeLog COPYING FAQ* FIRST_RUN LICENSE* NEWS RELEASE docs/*.txt
 %{_bindir}/elisa
+# Doesn't work (as of 0.5.2), and not sure what it's used for anyway
+%exclude %{_bindir}/elisa-get
 %{_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 FAQ* LICENSE* NEWS RELEASE
 %{python_sitelib}/elisa/
 %{python_sitelib}/elisa-*.egg-info/
+%{python_sitelib}/elisa-*-nspkg.pth
+%{python_sitelib}/elisa_generic_setup.py*
 
 
 %changelog
+* 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/devel/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	10 Oct 2008 12:30:48 -0000	1.6
@@ -1 +1 @@
-44397c8c0c70fcf3eabae5bad9fd514d  elisa-0.3.3.tar.gz
+d264a415c617b38c326e16227a22f9cf  elisa-0.5.13.tar.gz


--- elisa-0.3.2-desktop.patch DELETED ---


