rpms/codeina/devel codeina-link.patch, NONE, 1.1 codeina.spec, 1.7, 1.8

[Matthias Clasen (mclasen)]

Author: mclasen

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

Modified Files:
	codeina.spec 
Added Files:
	codeina-link.patch 
Log Message:
Fix #325231


codeina-link.patch:

--- NEW FILE codeina-link.patch ---
diff -ru codeina-0.10.1/codeina/distro/fedora.py codeina-0.10.1/codeina/distro/fedora.py
--- codeina-0.10.1/codeina/distro/fedora.py	2007-08-27 07:16:41.000000000 -0400
+++ codeina-0.10.1/codeina/distro/fedora.py	2007-10-09 13:17:39.000000000 -0400
@@ -23,6 +23,7 @@
 # Boston, MA 02111-1307, USA.
 
 import gtk
+import sexy
 import os
 
 from codeina.extern.log import log
@@ -31,19 +32,27 @@
 
 
 def get_dialog(parent, products):
+    def show_url(widget, url):
+        os.system("gnome-open %s" % (url,))
+        
     log.debug('fedora', 'products: %r', products)
     dlg = gtk.MessageDialog(parent=parent, flags=0,
                             type=gtk.MESSAGE_INFO,
                             buttons=gtk.BUTTONS_CANCEL,
                             message_format=\
                             _('Proprietary and free formats'))
-    dlg.add_button(_("Go to _webshop browser"), gtk.RESPONSE_OK)
+    link = sexy.UrlLabel("For more information, see <a href=\"http://fedoraproject.org/codecbuddy/\">About Proprietary and Free Formats</a>.")
+    dlg.vbox.add(link)
+    link.connect("url-activated", show_url)
+    link.show()
+    dlg.add_button(_("_See available options"), gtk.RESPONSE_OK)
     dlg.set_default_response(gtk.RESPONSE_OK)
     # As per HIG, empty dialogue title
     dlg.set_title(_(''))
-    str1 = _("Fedora does not condone the use of audio and video codecs that require patent licenses to be written and/or distributed.")
-    str2 = _("But due to the existence of such patents, Free Software implementations of such codecs might not be legal in the country you live in, or the file you're trying to play back might not be available in free formats such as Ogg.")
-    str3 = _("The Fluendo webshop has free and for-pay plugins for you to download.")
+    str1 = _("Fedora has the mission of always being freely re-distributable; this means you are free to give your copy of Fedora to anyone else.")
+    str2 = _("Unfortunately, that means that we cannot ship support for certain multimedia codecs, as they require patent licenses before you can view or play media that use them. Imagine if you had to pay a license fee before reading your e-mail, or viewing a picture on the web. This is why Fedora supports free formats, such as Ogg Vorbis and Theora.")
+    str3 = _("However, there are companies and communities that do offer support for certain codecs under Fedora. If you would like to install support, please proceed to see the available options.")
+    
     str = str1 + "\n\n" + str2 + "\n\n" + str3
     dlg.format_secondary_text(str)
     return dlg


Index: codeina.spec
===================================================================
RCS file: /cvs/extras/rpms/codeina/devel/codeina.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- codeina.spec	10 Oct 2007 15:13:01 -0000	1.7
+++ codeina.spec	16 Oct 2007 19:43:49 -0000	1.8
@@ -6,7 +6,7 @@
 
 Name:           codeina
 Version:        0.10.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GStreamer Codec Installation Application
 
 Group:          Applications/Internet
@@ -17,6 +17,7 @@
 Source1:        gst-install-plugins-helper.sh
 Patch0:         codeina-f8-wishlist.patch
 Patch1:         codeina-less-chat.patch
+Patch2:		codeina-link.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires:       python >= 2.3
@@ -41,6 +42,7 @@
 pushd codeina/
 %patch1 -p0 -b .chat
 popd
+%patch2 -p1 -b .link
 
 %build
 %configure
@@ -68,6 +70,12 @@
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Oct 16 2007 Matthias Clasen <mclasen at redhat.com> - 0.10.1-5
+- Fix #325231:
+  + Remove excessive branding
+  + Change the wording of the dialog
+  + Add a link
+
 * Wed Oct 10 2007 - Bastien Nocera <bnocera at redhat.com> - 0.10.1-4
 - Remove some useless verbose (#325301)