rpms/padevchooser/EL-5 padevchooser-0.9.4-audio-card.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 padevchooser.spec, 1.2, 1.3 sources, 1.3, 1.4

Lubomir Kundrak (lkundrak) fedora-extras-commits at redhat.com
Sat Apr 19 15:08:00 UTC 2008 

Author: lkundrak

Update of /cvs/pkgs/rpms/padevchooser/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30453/EL-5

Modified Files:
	.cvsignore padevchooser.spec sources 
Added Files:
	padevchooser-0.9.4-audio-card.patch 
Log Message:
* Sat Apr 19 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.9.4-0.4.svn20070925.1
- Included audio-card icon
- Fixed License tag

padevchooser-0.9.4-audio-card.patch:

--- NEW FILE padevchooser-0.9.4-audio-card.patch ---
diff -urp padevchooser-0.9.4.orig/src/padevchooser.c padevchooser-0.9.4/src/padevchooser.c
--- padevchooser-0.9.4.orig/src/padevchooser.c	2007-09-25 03:20:38.000000000 +0200
+++ padevchooser-0.9.4/src/padevchooser.c	2008-04-19 16:46:38.000000000 +0200
@@ -171,13 +171,13 @@ static void notify_event(const char *tit
 
     if (!notification) {
         s = g_strdup_printf("<i>%s</i>\n%s", title, text);
-        notification = notify_notification_new_with_status_icon(title, s, "audio-card", tray_icon);
+        notification = notify_notification_new_with_status_icon(title, s, "padevchooser-audio-card", tray_icon);
         notify_notification_set_category(notification, "device.added");
         notify_notification_set_urgency(notification, NOTIFY_URGENCY_LOW);
         g_signal_connect_swapped(G_OBJECT(notification), "closed", G_CALLBACK(notification_closed), NULL);
     } else {
         s = g_strdup_printf("%s\n\n<i>%s</i>\n%s", last_events, title, text);
-        notify_notification_update(notification, title, s, "audio-card");
+        notify_notification_update(notification, title, s, "padevchooser-audio-card");
     }
 
     g_free(last_events);
@@ -563,7 +563,7 @@ static GtkStatusIcon *create_tray_icon(v
 
     g_signal_connect_object(G_OBJECT(tray_icon), "activate", G_CALLBACK(tray_icon_on_click), tray_icon, 0);
     g_signal_connect_object(G_OBJECT(tray_icon), "popup-menu", G_CALLBACK(tray_icon_on_click), tray_icon, 0);
-    gtk_status_icon_set_from_icon_name(tray_icon, "audio-card");
+    gtk_status_icon_set_from_icon_name(tray_icon, "padevchooser-audio-card");
     gtk_status_icon_set_tooltip(tray_icon, "PulseAudio Applet");
     gtk_status_icon_set_visible(tray_icon, TRUE);
 
@@ -622,7 +622,7 @@ static GtkMenu *create_menu(void) {
     append_default_device_menu_items(server_submenu, &no_servers_menu_item, &default_server_menu_item, &other_server_menu_item, server_default_cb, server_other_cb);
 
     append_submenu(menu, "Default S_erver", server_submenu, "network-wired");
-    append_submenu(menu, "Default S_ink", sink_submenu, "audio-card");
+    append_submenu(menu, "Default S_ink", sink_submenu, "padevchooser-audio-card");
     append_submenu(menu, "Default S_ource", source_submenu, "audio-input-microphone");
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), gtk_separator_menu_item_new());
 
diff -urp padevchooser-0.9.4.orig/src/padevchooser.desktop padevchooser-0.9.4/src/padevchooser.desktop
--- padevchooser-0.9.4.orig/src/padevchooser.desktop	2007-08-04 16:35:42.000000000 +0200
+++ padevchooser-0.9.4/src/padevchooser.desktop	2008-04-19 16:46:38.000000000 +0200
@@ -5,7 +5,7 @@ Name=PulseAudio Device Chooser
 GenericName=Device Chooser
 Comment=An Applet for Quick Device Changing
 Exec=padevchooser
-Icon=audio-card
+Icon=padevchooser-audio-card
 StartupNotify=true
 Type=Application
 Categories=Application;AudioVideo;Audio;
diff -urp padevchooser-0.9.4.orig/src/padevchooser.glade padevchooser-0.9.4/src/padevchooser.glade
--- padevchooser-0.9.4.orig/src/padevchooser.glade	2007-08-16 01:31:34.000000000 +0200
+++ padevchooser-0.9.4/src/padevchooser.glade	2008-04-19 16:46:38.000000000 +0200
@@ -26,7 +26,7 @@
                       <widget class="GtkImage" id="image1">
                         <property name="visible">True</property>
                         <property name="icon_size">6</property>
-                        <property name="icon_name">audio-card</property>
+                        <property name="icon_name">padevchooser-audio-card</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/EL-5/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	19 Apr 2008 13:22:19 -0000	1.3
+++ .cvsignore	19 Apr 2008 15:07:23 -0000	1.4
@@ -1 +1,2 @@
 padevchooser-0.9.4.svn20070925.tar.gz
+audio-card.tar.gz


Index: padevchooser.spec
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/EL-5/padevchooser.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- padevchooser.spec	19 Apr 2008 13:22:19 -0000	1.2
+++ padevchooser.spec	19 Apr 2008 15:07:23 -0000	1.3
@@ -1,13 +1,15 @@
 Name:           padevchooser
 Version:        0.9.4
-Release:        0.4.svn20070925%{?dist}
+Release:        0.4.svn20070925%{?dist}.1
 Summary:        Control applet for PulseAudio
 
 Group:          Applications/Multimedia
-License:        GPL
+License:        GPLv2+
 URL:            http://0pointer.de/lennart/projects/padevchooser
 Source0:	padevchooser-0.9.4.svn20070925.tar.gz
 #Source0:        http://0pointer.de/lennart/projects/padevchooser/padevchooser-%{version}.tar.gz
+Source1:        audio-card.tar.gz
+Patch0:         padevchooser-0.9.4-audio-card.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  pulseaudio-lib-devel gtk2-devel libnotify-devel
@@ -21,6 +23,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -36,20 +39,42 @@
     --add-category="X-Fedora" --vendor="" \
     $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
 
+install -d $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+tar xzf %{SOURCE1} -C $RPM_BUILD_ROOT%{_datadir}/icons/hicolor
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor
+if [ -x %{_bindir}/gtk-update-icon-cache ]; then
+  %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+fi
+
+
 %files
 %defattr(-,root,root,-)
 %doc LICENSE doc/README
 %{_bindir}/padevchooser
 %{_datadir}/applications/padevchooser.desktop
 %{_datadir}/padevchooser
+%{_datadir}/icons/hicolor/*/*/*
 
 
 %changelog
+* Sat Apr 19 2008 Lubomir Kundrak <lkundrak at redhat.com> - 0.9.4-0.4.svn20070925.1
+- Included audio-card icon
+- Fixed License tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.4-0.4.svn20070925
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/padevchooser/EL-5/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	19 Apr 2008 13:22:19 -0000	1.3
+++ sources	19 Apr 2008 15:07:23 -0000	1.4
@@ -1 +1,2 @@
 164cc955445b3165d49f3de48e9551cf  padevchooser-0.9.4.svn20070925.tar.gz
+fb3d6d2f0212d65ea6c97ee7b6170209  audio-card.tar.gz

More information about the fedora-extras-commits mailing list