rpms/codeina/devel codeina-fedora-installer.patch, NONE, 1.1 codeina.spec, 1.10, 1.11

Fri Apr 4 17:50:43 UTC 2008

Author: hadess

Update of /cvs/pkgs/rpms/codeina/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15603

Modified Files:
	codeina.spec 
Added Files:
	codeina-fedora-installer.patch 
Log Message:
* Fri Apr 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-7.r1421.1
- Add Requires on redhat-lsb
- Add patch to provide an installer via gnome-packagekit
- Remove third-party providers files
- Add PyYAML BR


codeina-fedora-installer.patch:

--- NEW FILE codeina-fedora-installer.patch ---
Index: codeina/installer/fedora_installer.py
===================================================================
--- codeina/installer/fedora_installer.py	(revision 0)
+++ codeina/installer/fedora_installer.py	(revision 0)
@@ -0,0 +1,22 @@
+# -*- Mode: Python -*-
+# -*- coding: utf-8 -*-
+# vi:si:et:sw=4:sts=4:ts=4
+
+from codeina.installer import InterfaceInstaller
+from codeina.extern.log import log
+import os
+
+class Installer(InterfaceInstaller):
+
+    def __init__ (self):
+        import popen2
+        fin, fout = popen2.popen2("rpm -qa --queryformat \"%{NAME}\"")
+        self.installed_packages = fin.readlines ()
+
+    def is_installed(self, package):
+        return package.nick in [ p.strip() for p in self.installed_packages]
+
+    def install(self,package):
+        log.debug('installer', 'trying to install %s' % package)
+        os.system('/usr/bin/pk-install-package %s' % package.nick)
+
Index: codeina/Makefile.am
===================================================================
--- codeina/Makefile.am	(revision 1421)
+++ codeina/Makefile.am	(working copy)
@@ -14,6 +14,7 @@
       installer/synaptic_installer.py \
       installer/urpmi_installer.py \
       installer/user_world.py \
+      installer/fedora_installer.py \
       myutils.py \
       productfile.py \
       productflavor.py \
Index: codeina/ui/igtk/fluendo_codec_buyer.py
===================================================================
--- codeina/ui/igtk/fluendo_codec_buyer.py	(revision 1421)
+++ codeina/ui/igtk/fluendo_codec_buyer.py	(working copy)
@@ -20,6 +20,7 @@
 import codeina.installer.user_world
 import codeina.installer.apt_installer
 import codeina.installer.urpmi_installer
+import codeina.installer.fedora_installer
 from dialog import *
 from window import CodeinaWindow
 from gettext import gettext as _
@@ -84,7 +85,7 @@
             i = codeina.installer.user_world.Installer ()
             errors = i.install (path_package)
         elif path_package.endswith (".rpm"):
-            i = codeina.installer.urpmi_installer.Installer ()
+            i = codeina.installer.fedora_installer.Installer ()
             errors = i.install (path_package)
         elif path_package.endswith (".deb"):
             i = codeina.installer.apt_installer.Installer ()


Index: codeina.spec
===================================================================
RCS file: /cvs/pkgs/rpms/codeina/devel/codeina.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- codeina.spec	4 Apr 2008 16:30:47 -0000	1.10
+++ codeina.spec	4 Apr 2008 17:50:05 -0000	1.11
@@ -6,48 +6,53 @@
 
 %define         svn_rev 1421
 
-Name:           codeina
-Version:        0.10.1
-Release:        7.r%{svn_rev}%{?dist}
-Summary:        GStreamer Codec Installation Application
-
-Group:          Applications/Internet
-License:        GPLv2.1+
-URL:            https://core.fluendo.com/gstreamer/trac/browser/codeina
+Name:		codeina
+Version:	0.10.1
+Release:	7.r%{svn_rev}.1%{?dist}
+Summary:	GStreamer Codec Installation Application
+
+Group:		Applications/Internet
+License:	GPLv2.1+
+URL:		https://core.fluendo.com/gstreamer/trac/browser/codeina
 # Upstream SVN repository is at https://core.fluendo.com/gstreamer/svn/codeina/trunk/
 #
 # To create this new tarball
 # svn co -r1421 https://core.fluendo.com/gstreamer/svn/codeina/trunk/ codeina
 # cd codeina
 # patch -p0 < ../codeina-fix-pynotify-check.patch
+# patch -p0 < ../codeina-fedora-installer.patch
 # ./autogen.sh && make dist
-# mv codeina-0.10.2.tar.bz codeina-0.10.1-r1421.tar.bz2
+# mv codeina-0.10.2.tar.bz codeina-0.10.1-r1421-2.tar.bz2
 #
 # Older version had:
-# Source: http://www.fluendo.com/downloads/codeina/%{name}-%{version}.tar.bz2
-Source:         %{name}-%{version}-r%{svn_rev}.tar.bz2
-Source1:        gst-install-plugins-helper.sh
-Source2:        codeina-fix-pynotify-check.patch
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-
-Requires:       python >= 2.3
-Requires:       gstreamer >= %{gst_minver}
-Requires:       gstreamer-python >= %{gstpy_minver}
-Requires:       pygtk2 >= %{pygtk_minver}
-Requires:       pyxdg
+# Source: http://www.fluendo.com/downloads/codeina/%{name}-%{version}-2.tar.bz2
+Source:		%{name}-%{version}-r%{svn_rev}-2.tar.bz2
+Source1:	gst-install-plugins-helper.sh
+Source2:	codeina-fix-pynotify-check.patch
+Source3:	codeina-fedora-installer.patch
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+Requires:	python >= 2.3
+Requires:	gstreamer >= %{gst_minver}
+Requires:	gstreamer-python >= %{gstpy_minver}
+Requires:	pygtk2 >= %{pygtk_minver}
+Requires:	pyxdg
 Requires:	python-sexy
 Requires:	PyYAML
 Requires:	gnome-python2-gtkmozembed
 Requires:	notify-python
+Requires:	redhat-lsb
+Requires:	gnome-packagekit
 
-BuildRequires:  python-devel >= 2.3
+BuildRequires:	python-devel >= 2.3
 
-BuildRequires:  gettext desktop-file-utils gawk
-BuildRequires:  intltool
-BuildRequires:  gnome-python2-gtkmozembed
-BuildRequires:  notify-python
+BuildRequires:	gettext desktop-file-utils gawk
+BuildRequires:	intltool
+BuildRequires:	gnome-python2-gtkmozembed
+BuildRequires:	notify-python
+BuildRequires:	PyYAML
 
-BuildArch:      noarch
+BuildArch:	noarch
 
 %description
 Codeina installs codecs for GStreamer.
@@ -65,6 +70,8 @@
 # final location
 make DESTDIR=$RPM_BUILD_ROOT install
 
+rm -f $RPM_BUILD_ROOT/%{_sysconfdir}/codeina/providers/{fedora_5.xml,mandrivalinux_2008.0.xml,mandrivalinux_2008.1.xml,plf_2008.1.xml,ubuntu_7.10.xml}
+
 install -D -m 0755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/gst-install-plugins-helper
 
 %find_lang codeina
@@ -86,6 +93,12 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Fri Apr 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-7.r1421.1
+- Add Requires on redhat-lsb
+- Add patch to provide an installer via gnome-packagekit
+- Remove third-party providers files
+- Add PyYAML BR
+
 * Fri Apr 04 2008 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-7.r1421
 - Update to latest upstream
 - Remove obsolete patches


