rpms/gaim-meanwhile/devel .cvsignore, 1.9, 1.10 gaim-fedora-prefs.xml, 1.1, 1.2 gaim-meanwhile.spec, 1.15, 1.16 sources, 1.9, 1.10

Joshua W. Boyer (jwboyer) fedora-extras-commits at redhat.com
Tue Oct 31 01:31:43 UTC 2006


Author: jwboyer

Update of /cvs/extras/rpms/gaim-meanwhile/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11818

Modified Files:
	.cvsignore gaim-fedora-prefs.xml gaim-meanwhile.spec sources 
Log Message:
Update to beta4



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Jun 2006 03:24:21 -0000	1.9
+++ .cvsignore	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-fedora-prefs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-fedora-prefs.xml	29 Jun 2006 03:24:21 -0000	1.1
+++ gaim-fedora-prefs.xml	31 Oct 2006 01:31:13 -0000	1.2
@@ -1,261 +1,366 @@
 <?xml version='1.0' encoding='UTF-8' ?>
 
-<pref version='1.0' name='/'>
+<pref version='1' name='/'>
 	<pref name='core'>
 		<pref name='away'>
-			<pref name='away_when_idle' type='bool' value='1' />
-			<pref name='mins_before_away' type='int' value='5' />
-			<pref name='default_message' type='string' value='Slightly less boring default' />
-			<pref name='auto_reply' type='string' value='awayidle' />
-		</pref>
-		<pref name='buddies'>
-			<pref name='use_server_alias' type='bool' value='1' />
+			<pref name='idle_reporting' type='string' value='system'/>
+			<pref name='away_when_idle' type='bool' value='1'/>
+			<pref name='mins_before_away' type='int' value='5'/>
+			<pref name='auto_reply' type='string' value='awayidle'/>
 		</pref>
+		<pref name='buddies'/>
 		<pref name='contact'>
-			<pref name='last_match' type='bool' value='0' />
-			<pref name='offline_score' type='int' value='4' />
-			<pref name='away_score' type='int' value='2' />
-			<pref name='idle_score' type='int' value='1' />
+			<pref name='last_match' type='bool' value='0'/>
+			<pref name='offline_score' type='int' value='4'/>
+			<pref name='away_score' type='int' value='2'/>
+			<pref name='idle_score' type='int' value='1'/>
+		</pref>
+		<pref name='debug'>
+			<pref name='timestamps' type='bool' value='0'/>
+		</pref>
+		<pref name='status'>
+			<pref name='scores'>
+				<pref name='offline' type='int' value='-500'/>
+				<pref name='available' type='int' value='100'/>
+				<pref name='invisible' type='int' value='-50'/>
+				<pref name='away' type='int' value='-100'/>
+				<pref name='extended_away' type='int' value='-200'/>
+				<pref name='idle' type='int' value='-10'/>
+			</pref>
+		</pref>
+		<pref name='savedstatus'>
+			<pref name='default' type='int' value='1161808301'/>
+			<pref name='startup' type='int' value='0'/>
+			<pref name='startup_current_status' type='bool' value='1'/>
+			<pref name='idleaway' type='int' value='1161808306'/>
+			<pref name='isidleaway' type='bool' value='0'/>
+			<pref name='current' type='int' value='1153343286'/>
 		</pref>
 		<pref name='conversations'>
-			<pref name='use_alias_for_title' type='bool' value='1' />
 			<pref name='chat'>
-				<pref name='show_nick_change' type='bool' value='1' />
+				<pref name='show_nick_change' type='bool' value='1'/>
 			</pref>
 			<pref name='im'>
-				<pref name='send_typing' type='bool' value='1' />
+				<pref name='send_typing' type='bool' value='1'/>
 			</pref>
 		</pref>
 		<pref name='logging'>
-			<pref name='log_ims' type='bool' value='1' />
-			<pref name='log_chats' type='bool' value='0' />
-			<pref name='log_system' type='bool' value='0' />
-			<pref name='log_signon_signoff' type='bool' value='0' />
-			<pref name='log_idle_state' type='bool' value='0' />
-			<pref name='log_away_state' type='bool' value='0' />
-			<pref name='log_own_states' type='bool' value='0' />
-			<pref name='format' type='string' value='html' />
+			<pref name='log_ims' type='bool' value='1'/>
+			<pref name='log_chats' type='bool' value='0'/>
+			<pref name='log_system' type='bool' value='0'/>
+			<pref name='format' type='string' value='html'/>
 		</pref>
 		<pref name='network'>
-			<pref name='auto_ip' type='bool' value='1' />
-			<pref name='public_ip' type='string' value='' />
-			<pref name='ports_range_use' type='bool' value='0' />
-			<pref name='ports_range_start' type='int' value='1024' />
-			<pref name='ports_range_end' type='int' value='2048' />
+			<pref name='auto_ip' type='bool' value='1'/>
+			<pref name='public_ip' type='string' value='172.16.80.210'/>
+			<pref name='ports_range_use' type='bool' value='0'/>
+			<pref name='ports_range_start' type='int' value='1024'/>
+			<pref name='ports_range_end' type='int' value='2048'/>
+			<pref name='stun_server' type='string' value=''/>
 		</pref>
 		<pref name='proxy'>
-			<pref name='type' type='string' value='none' />
-			<pref name='host' type='string' value='' />
-			<pref name='port' type='int' value='0' />
-			<pref name='username' type='string' value='' />
-			<pref name='password' type='string' value='' />
+			<pref name='type' type='string' value='none'/>
+			<pref name='host' type='string' value=''/>
+			<pref name='port' type='int' value='0'/>
+			<pref name='username' type='string' value=''/>
+			<pref name='password' type='string' value=''/>
 		</pref>
 		<pref name='sound'>
-			<pref name='while_away' type='bool' value='0' />
+			<pref name='while_away' type='bool' value='0'/>
 		</pref>
 	</pref>
 	<pref name='plugins'>
 		<pref name='core'>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
+			<pref name='psychic'>
+				<pref name='buddies_only' type='bool' value='0'/>
+				<pref name='show_notice' type='bool' value='1'/>
+				<pref name='activate_online' type='bool' value='1'/>
 			</pref>
-			<pref name='autorecon'>
-				<pref name='hide_connected_error' type='bool' value='0' />
-				<pref name='hide_connecting_error' type='bool' value='0' />
-				<pref name='restore_state' type='bool' value='1' />
+			<pref name='statenotify'>
+				<pref name='notify_away' type='bool' value='1'/>
+				<pref name='notify_idle' type='bool' value='1'/>
+				<pref name='notify_signon' type='bool' value='1'/>
 			</pref>
 		</pref>
-		<pref name='lopl' />
+		<pref name='lopl'/>
 		<pref name='prpl'>
+			<pref name='qq'>
+				<pref name='show_status_by_icon' type='bool' value='1'/>
+				<pref name='show_fake_video' type='bool' value='0'/>
+				<pref name='prompt_for_missing_packet' type='bool' value='1'/>
+				<pref name='prompt_group_msg_on_recv' type='bool' value='1'/>
+			</pref>
+			<pref name='oscar'>
+				<pref name='recent_buddies' type='bool' value='0'/>
+				<pref name='show_idle' type='bool' value='0'/>
+			</pref>
 			<pref name='silc'>
-				<pref name='sign_im' type='bool' value='0' />
-				<pref name='verify_im' type='bool' value='0' />
-				<pref name='sign_chat' type='bool' value='0' />
-				<pref name='verify_chat' type='bool' value='0' />
-				<pref name='vcard' type='string' value='' />
+				<pref name='sign_im' type='bool' value='0'/>
+				<pref name='verify_im' type='bool' value='0'/>
+				<pref name='sign_chat' type='bool' value='0'/>
+				<pref name='verify_chat' type='bool' value='0'/>
+				<pref name='vcard' type='string' value=''/>
 			</pref>
 			<pref name='msn'>
-				<pref name='conv_close_notice' type='bool' value='1' />
-				<pref name='conv_timeout_notice' type='bool' value='1' />
+				<pref name='conv_close_notice' type='bool' value='1'/>
+				<pref name='conv_timeout_notice' type='bool' value='1'/>
 			</pref>
 			<pref name='jabber'>
-				<pref name='hide_os' type='bool' value='0' />
+				<pref name='hide_os' type='bool' value='0'/>
 			</pref>
 		</pref>
 		<pref name='gtk'>
-			<pref name='docklet'>
-				<pref name='queue_messages' type='bool' value='0' />
+			<pref name='musicmessaging'>
+				<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
+			</pref>
+			<pref name='extplacement'>
+				<pref name='placement_number' type='int' value='4'/>
+				<pref name='placement_number_separate' type='bool' value='0'/>
+			</pref>
+			<pref name='timestamp'>
+				<pref name='interval' type='int' value='300000'/>
+			</pref>
+			<pref name='timestamp_format'>
+				<pref name='force_24hr' type='bool' value='1'/>
+				<pref name='use_dates'>
+					<pref name='conversation' type='string' value='automatic'/>
+					<pref name='log' type='string' value='automatic'/>
+				</pref>
+			</pref>
+			<pref name='gaimrc'>
+				<pref name='set'>
+					<pref name='gtk-font-name' type='bool' value='0'/>
+					<pref name='gtk-key-theme-name' type='bool' value='0'/>
+					<pref name='color'>
+						<pref name='GtkWidget::cursor-color' type='bool' value='0'/>
+						<pref name='GtkWidget::secondary-cursor-color' type='bool' value='0'/>
+						<pref name='GtkIMHtml::hyperlink-color' type='bool' value='0'/>
+					</pref>
+					<pref name='size'>
+						<pref name='GtkTreeView::expander_size' type='bool' value='0'/>
+						<pref name='GtkTreeView::horizontal_separator' type='bool' value='0'/>
+					</pref>
+					<pref name='font'>
+						<pref name='*gaim_gtkconv_entry' type='bool' value='0'/>
+						<pref name='*gaim_gtkconv_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtklog_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtkrequest_imhtml' type='bool' value='0'/>
+						<pref name='*gaim_gtknotify_imhtml' type='bool' value='0'/>
+					</pref>
+					<pref name='bool'>
+						<pref name='GtkTreeView::indent_expanders' type='bool' value='0'/>
+					</pref>
+				</pref>
+				<pref name='gtk-font-name' type='string' value=''/>
+				<pref name='gtk-key-theme-name' type='string' value=''/>
+				<pref name='color'>
+					<pref name='GtkWidget::cursor-color' type='string' value=''/>
+					<pref name='GtkWidget::secondary-cursor-color' type='string' value=''/>
+					<pref name='GtkIMHtml::hyperlink-color' type='string' value=''/>
+				</pref>
+				<pref name='size'>
+					<pref name='GtkTreeView::expander_size' type='int' value='0'/>
+					<pref name='GtkTreeView::horizontal_separator' type='int' value='0'/>
+				</pref>
+				<pref name='font'>
+					<pref name='*gaim_gtkconv_entry' type='string' value=''/>
+					<pref name='*gaim_gtkconv_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtklog_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtkrequest_imhtml' type='string' value=''/>
+					<pref name='*gaim_gtknotify_imhtml' type='string' value=''/>
+				</pref>
+				<pref name='bool'>
+					<pref name='GtkTreeView::indent_expanders' type='bool' value='1'/>
+				</pref>
 			</pref>
 			<pref name='X11'>
 				<pref name='gestures'>
-					<pref name='visual' type='bool' value='0' />
+					<pref name='visual' type='bool' value='0'/>
 				</pref>
 				<pref name='notify'>
-					<pref name='type_im' type='bool' value='1' />
-					<pref name='type_chat' type='bool' value='0' />
-					<pref name='type_focused' type='bool' value='0' />
-					<pref name='method_string' type='bool' value='0' />
-					<pref name='title_string' type='string' value='(*)' />
-					<pref name='method_urgent' type='bool' value='1' />
-					<pref name='method_count' type='bool' value='1' />
-					<pref name='notify_focus' type='bool' value='1' />
-					<pref name='notify_click' type='bool' value='1' />
-					<pref name='notify_type' type='bool' value='1' />
-					<pref name='notify_send' type='bool' value='1' />
-					<pref name='notify_switch' type='bool' value='1' />
+					<pref name='type_im' type='bool' value='1'/>
+					<pref name='type_chat' type='bool' value='0'/>
+					<pref name='type_chat_nick' type='bool' value='0'/>
+					<pref name='type_focused' type='bool' value='0'/>
+					<pref name='method_string' type='bool' value='0'/>
+					<pref name='title_string' type='string' value='(*)'/>
+					<pref name='method_urgent' type='bool' value='1'/>
+					<pref name='method_count' type='bool' value='1'/>
+					<pref name='method_count_xprop' type='bool' value='0'/>
+					<pref name='method_raise' type='bool' value='0'/>
+					<pref name='notify_focus' type='bool' value='1'/>
+					<pref name='notify_click' type='bool' value='1'/>
+					<pref name='notify_type' type='bool' value='1'/>
+					<pref name='notify_send' type='bool' value='1'/>
+					<pref name='notify_switch' type='bool' value='1'/>
 				</pref>
 			</pref>
-			<pref name='timestamp'>
-				<pref name='interval' type='int' value='300000' />
+			<pref name='docklet'>
+				<pref name='blink_im' type='string' value='hidden'/>
+				<pref name='blink_chat' type='string' value='never'/>
 			</pref>
-			<pref name='extplacement'>
-				<pref name='placement_number' type='int' value='4' />
-				<pref name='placement_number_separate' type='bool' value='0' />
+		</pref>
+		<pref name='gnt'>
+			<pref name='gntgf'>
+				<pref name='events'>
+					<pref name='signonf' type='bool' value='1'/>
+					<pref name='immsg' type='bool' value='1'/>
+					<pref name='chatmsg' type='bool' value='1'/>
+					<pref name='chatnick' type='bool' value='1'/>
+				</pref>
+				<pref name='beep' type='bool' value='1'/>
+				<pref name='urgent' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>
 	<pref name='gaim'>
 		<pref name='gtk'>
-			<pref name='accounts'>
-				<pref name='dialog'>
-					<pref name='width' type='int' value='550' />
-					<pref name='height' type='int' value='250' />
-				</pref>
-			</pref>
-			<pref name='away'>
-				<pref name='queue_messages' type='bool' value='0' />
-			</pref>
 			<pref name='browsers'>
-				<pref name='place' type='int' value='0' />
-				<pref name='command' type='string' value='' />
-				<pref name='browser' type='string' value='gnome-open' />
-			</pref>
-			<pref name='idle'>
-				<pref name='reporting_method' type='string' value='system' />
+				<pref name='place' type='int' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='browser' type='string' value='gnome-open'/>
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/autorecon.so' />
-					<item value='/usr/lib/gaim/history.so' />
-					<item value='/usr/lib/gaim/docklet.so' />
-					<item value='/usr/lib/gaim/extplacement.so' />
-					<item value='/usr/lib/gaim/notify.so' />
+					<item value='/usr/lib/gaim/autorecon.so'/>
+					<item value='/usr/lib/gaim/history.so'/>
+					<item value='/usr/lib/gaim/docklet.so'/>
+					<item value='/usr/lib/gaim/extplacement.so'/>
+					<item value='/usr/lib/gaim/notify.so'/>
 				</pref>
 			</pref>
+			<pref name='filelocations'>
+				<pref name='last_save_folder' type='string' value=''/>
+				<pref name='last_open_folder' type='string' value=''/>
+				<pref name='last_icon_folder' type='string' value=''/>
+			</pref>
 			<pref name='smileys'>
-				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
+				<pref name='theme' type='string' value='Default'/>
 			</pref>
 			<pref name='debug'>
-				<pref name='enabled' type='bool' value='0' />
-				<pref name='timestamps' type='bool' value='0' />
-				<pref name='toolbar' type='bool' value='1' />
-				<pref name='width' type='int' value='450' />
-				<pref name='height' type='int' value='250' />
+				<pref name='enabled' type='bool' value='0'/>
+				<pref name='filterlevel' type='int' value='0'/>
+				<pref name='style' type='int' value='3'/>
+				<pref name='toolbar' type='bool' value='1'/>
+				<pref name='width' type='int' value='450'/>
+				<pref name='height' type='int' value='250'/>
+				<pref name='regex' type='string' value=''/>
+				<pref name='filter' type='bool' value='0'/>
+				<pref name='invert' type='bool' value='0'/>
+				<pref name='case_insensitive' type='bool' value='0'/>
+				<pref name='highlight' type='bool' value='0'/>
 			</pref>
 			<pref name='sound'>
 				<pref name='enabled'>
-					<pref name='login' type='bool' value='1' />
-					<pref name='logout' type='bool' value='1' />
-					<pref name='im_recv' type='bool' value='1' />
-					<pref name='first_im_recv' type='bool' value='0' />
-					<pref name='send_im' type='bool' value='1' />
-					<pref name='join_chat' type='bool' value='0' />
-					<pref name='left_chat' type='bool' value='0' />
-					<pref name='send_chat_msg' type='bool' value='0' />
-					<pref name='chat_msg_recv' type='bool' value='0' />
-					<pref name='nick_said' type='bool' value='0' />
-					<pref name='pounce_default' type='bool' value='1' />
+					<pref name='login' type='bool' value='1'/>
+					<pref name='logout' type='bool' value='1'/>
+					<pref name='im_recv' type='bool' value='1'/>
+					<pref name='first_im_recv' type='bool' value='0'/>
+					<pref name='send_im' type='bool' value='1'/>
+					<pref name='join_chat' type='bool' value='0'/>
+					<pref name='left_chat' type='bool' value='0'/>
+					<pref name='send_chat_msg' type='bool' value='0'/>
+					<pref name='chat_msg_recv' type='bool' value='0'/>
+					<pref name='nick_said' type='bool' value='0'/>
+					<pref name='pounce_default' type='bool' value='1'/>
 				</pref>
 				<pref name='file'>
-					<pref name='login' type='string' value='' />
-					<pref name='logout' type='string' value='' />
-					<pref name='im_recv' type='string' value='' />
-					<pref name='first_im_recv' type='string' value='' />
-					<pref name='send_im' type='string' value='' />
-					<pref name='join_chat' type='string' value='' />
-					<pref name='left_chat' type='string' value='' />
-					<pref name='send_chat_msg' type='string' value='' />
-					<pref name='chat_msg_recv' type='string' value='' />
-					<pref name='nick_said' type='string' value='' />
-					<pref name='pounce_default' type='string' value='' />
-				</pref>
-				<pref name='conv_focus' type='bool' value='1' />
-				<pref name='command' type='string' value='' />
-				<pref name='method' type='string' value='automatic' />
+					<pref name='login' type='string' value=''/>
+					<pref name='logout' type='string' value=''/>
+					<pref name='im_recv' type='string' value=''/>
+					<pref name='first_im_recv' type='string' value=''/>
+					<pref name='send_im' type='string' value=''/>
+					<pref name='join_chat' type='string' value=''/>
+					<pref name='left_chat' type='string' value=''/>
+					<pref name='send_chat_msg' type='string' value=''/>
+					<pref name='chat_msg_recv' type='string' value=''/>
+					<pref name='nick_said' type='string' value=''/>
+					<pref name='pounce_default' type='string' value=''/>
+				</pref>
+				<pref name='conv_focus' type='bool' value='1'/>
+				<pref name='mute' type='bool' value='0'/>
+				<pref name='command' type='string' value=''/>
+				<pref name='method' type='string' value='automatic'/>
+				<pref name='volume' type='int' value='50'/>
+			</pref>
+			<pref name='accounts'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
+				<pref name='buddyicon' type='string' value=''/>
 			</pref>
 			<pref name='blist'>
-				<pref name='auto_expand_contacts' type='bool' value='1' />
-				<pref name='button_style' type='int' value='3' />
-				<pref name='grey_idle_buddies' type='bool' value='1' />
-				<pref name='raise_on_events' type='bool' value='0' />
-				<pref name='show_buddy_icons' type='bool' value='0' />
-				<pref name='show_empty_groups' type='bool' value='0' />
-				<pref name='show_idle_time' type='bool' value='1' />
-				<pref name='show_offline_buddies' type='bool' value='0' />
-				<pref name='show_warning_level' type='bool' value='1' />
-				<pref name='sort_type' type='string' value='alphabetical' />
-				<pref name='x' type='int' value='0' />
-				<pref name='y' type='int' value='0' />
-				<pref name='width' type='int' value='309' />
-				<pref name='height' type='int' value='500' />
-				<pref name='tooltip_delay' type='int' value='500' />
+				<pref name='show_buddy_icons' type='bool' value='0'/>
+				<pref name='show_empty_groups' type='bool' value='0'/>
+				<pref name='show_idle_time' type='bool' value='1'/>
+				<pref name='show_offline_buddies' type='bool' value='0'/>
+				<pref name='list_visible' type='bool' value='1'/>
+				<pref name='list_maximized' type='bool' value='0'/>
+				<pref name='sort_type' type='string' value='alphabetical'/>
+				<pref name='x' type='int' value='133'/>
+				<pref name='y' type='int' value='75'/>
+				<pref name='width' type='int' value='309'/>
+				<pref name='height' type='int' value='500'/>
+				<pref name='tooltip_delay' type='int' value='500'/>
+			</pref>
+			<pref name='status'>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='550'/>
+					<pref name='height' type='int' value='250'/>
+				</pref>
 			</pref>
 			<pref name='conversations'>
-				<pref name='close_on_tabs' type='bool' value='1' />
-				<pref name='ctrl_enter_sends' type='bool' value='0' />
-				<pref name='enter_sends' type='bool' value='1' />
-				<pref name='escape_closes' type='bool' value='0' />
-				<pref name='send_formatting' type='bool' value='0' />
-				<pref name='send_bold' type='bool' value='0' />
-				<pref name='send_italic' type='bool' value='0' />
-				<pref name='send_underline' type='bool' value='0' />
-				<pref name='show_timestamps' type='bool' value='1' />
-				<pref name='spellcheck' type='bool' value='1' />
-				<pref name='ignore_colors' type='bool' value='0' />
-				<pref name='ignore_fonts' type='bool' value='0' />
-				<pref name='ignore_font_sizes' type='bool' value='0' />
-				<pref name='html_shortcuts' type='bool' value='1' />
-				<pref name='smiley_shortcuts' type='bool' value='0' />
-				<pref name='show_formatting_toolbar' type='bool' value='1' />
-				<pref name='passthrough_unknown_commands' type='bool' value='0' />
-				<pref name='placement' type='string' value='last' />
-				<pref name='placement_number' type='int' value='1' />
-				<pref name='bgcolor' type='string' value='' />
-				<pref name='fgcolor' type='string' value='' />
-				<pref name='font_face' type='string' value='' />
-				<pref name='font_size' type='int' value='3' />
-				<pref name='tabs' type='bool' value='1' />
-				<pref name='tab_side' type='int' value='2' />
-				<pref name='button_type' type='int' value='3' />
+				<pref name='use_smooth_scrolling' type='bool' value='1'/>
+				<pref name='close_on_tabs' type='bool' value='1'/>
+				<pref name='send_bold' type='bool' value='0'/>
+				<pref name='send_italic' type='bool' value='0'/>
+				<pref name='send_underline' type='bool' value='0'/>
+				<pref name='spellcheck' type='bool' value='1'/>
+				<pref name='show_incoming_formatting' type='bool' value='1'/>
+				<pref name='show_timestamps' type='bool' value='1'/>
+				<pref name='show_formatting_toolbar' type='bool' value='1'/>
+				<pref name='passthrough_unknown_commands' type='bool' value='0'/>
+				<pref name='placement' type='string' value='last'/>
+				<pref name='placement_number' type='int' value='1'/>
+				<pref name='bgcolor' type='string' value=''/>
+				<pref name='fgcolor' type='string' value=''/>
+				<pref name='font_face' type='string' value=''/>
+				<pref name='font_size' type='int' value='3'/>
+				<pref name='tabs' type='bool' value='1'/>
+				<pref name='tab_side' type='int' value='2'/>
+				<pref name='scrollback_lines' type='int' value='4000'/>
 				<pref name='chat'>
-					<pref name='color_nicks' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='userlist_width' type='int' value='80'/>
 				</pref>
 				<pref name='im'>
-					<pref name='animate_buddy_icons' type='bool' value='1' />
-					<pref name='default_width' type='int' value='410' />
-					<pref name='default_height' type='int' value='160' />
-					<pref name='entry_height' type='int' value='50' />
-					<pref name='raise_on_events' type='bool' value='0' />
-					<pref name='show_buddy_icons' type='bool' value='1' />
+					<pref name='animate_buddy_icons' type='bool' value='1'/>
+					<pref name='default_width' type='int' value='410'/>
+					<pref name='default_height' type='int' value='160'/>
+					<pref name='entry_height' type='int' value='50'/>
+					<pref name='show_buddy_icons' type='bool' value='1'/>
+					<pref name='hide_new' type='string' value='never'/>
 				</pref>
 			</pref>
 			<pref name='pounces'>
 				<pref name='default_actions'>
-					<pref name='open-window' type='bool' value='0' />
-					<pref name='popup-notify' type='bool' value='0' />
-					<pref name='send-message' type='bool' value='1' />
-					<pref name='execute-command' type='bool' value='0' />
-					<pref name='play-sound' type='bool' value='0' />
+					<pref name='open-window' type='bool' value='0'/>
+					<pref name='popup-notify' type='bool' value='0'/>
+					<pref name='send-message' type='bool' value='1'/>
+					<pref name='execute-command' type='bool' value='0'/>
+					<pref name='play-sound' type='bool' value='0'/>
+				</pref>
+				<pref name='dialog'>
+					<pref name='width' type='int' value='520'/>
+					<pref name='height' type='int' value='321'/>
 				</pref>
 			</pref>
 			<pref name='filetransfer'>
-				<pref name='clear_finished' type='bool' value='1' />
-				<pref name='keep_open' type='bool' value='0' />
+				<pref name='clear_finished' type='bool' value='1'/>
+				<pref name='keep_open' type='bool' value='0'/>
 			</pref>
 		</pref>
 	</pref>


Index: gaim-meanwhile.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/gaim-meanwhile.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gaim-meanwhile.spec	28 Aug 2006 00:56:48 -0000	1.15
+++ gaim-meanwhile.spec	31 Oct 2006 01:31:13 -0000	1.16
@@ -23,11 +23,11 @@
 %define meanwhile_integration	1
 
 # Prerelease define
-%define betaver	beta3
+%define betaver	beta4
 
 Name:		gaim-meanwhile
 Version:	2.0.0
-Release:	0.4.%{betaver}%{?dist}
+Release:	0.5.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -88,7 +88,7 @@
 %endif
 # Evolution integration (FC3+)
 %if %{evolution_integration}
-BuildRequires:	evolution-data-server-devel
+BuildRequires:	evolution-data-server-devel >= 1.9.1
 %endif
 # SILC integration (FC3+)
 %if %{silc_integration}
@@ -121,7 +121,8 @@
 
 %prep
 %setup -q -n gaim-%{version}%{betaver}
-%patch5 -p1
+#PIE patch is broken
+#%patch5 -p1
 
 # Relabel internal version for support purposes
 sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -200,6 +201,8 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/libgaim*
 rm -rf $RPM_BUILD_ROOT%{_datadir}
 rm -rf $RPM_BUILD_ROOT%{_prefix}/src
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/gaim.schemas
+rm -rf $RPM_BUILD_ROOT%{_libdir}/gaim/private
 
 #preserve the libsametime debug libraries and delete the rest
 #mv $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/libsametime.so.debug $RPM_BUILD_ROOT%{_libdir}/debug/usr/lib/gaim/sametime.tmp
@@ -250,6 +253,9 @@
 %{_libdir}/gaim/
 
 %changelog
+* Sat Oct 28 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.5.beta4
+- Rebuild against most recent core package
+
 * Sun Aug 27 2006 Josh Boyer <jwboyer at jdub.homelinux.org> 2.0.0-0.4.beta3
 - Bump and rebuild for FE6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-meanwhile/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	29 Jun 2006 03:24:21 -0000	1.9
+++ sources	31 Oct 2006 01:31:13 -0000	1.10
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74  gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6  gaim-2.0.0beta4.tar.bz2




More information about the scm-commits mailing list