rpms/gaim/FC-3 gaim-1.3.1-PIE.patch, NONE, 1.1 .cvsignore, 1.22, 1.23 gaim-desktop.patch, 1.11, 1.12 gaim-fedora-prefs.xml, 1.6, 1.7 gaim.spec, 1.59, 1.60 sources, 1.27, 1.28 gaim-1.1.0-PIE.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Jun 10 04:04:32 UTC 2005 

Author: wtogami

Update of /cvs/dist/rpms/gaim/FC-3
In directory cvs.devel.redhat.com:/tmp/cvs-serv10348/FC-3

Modified Files:
	.cvsignore gaim-desktop.patch gaim-fedora-prefs.xml gaim.spec 
	sources 
Added Files:
	gaim-1.3.1-PIE.patch 
Removed Files:
	gaim-1.1.0-PIE.patch 
Log Message:
auto-import gaim-1.3.1-0.fc3 on branch FC-3 from gaim-1.3.1-0.fc3.src.rpm

gaim-1.3.1-PIE.patch:
 Makefile |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE gaim-1.3.1-PIE.patch ---
--- gaim-1.3.1/src/Makefile.orig	2005-06-09 17:20:54.000000000 -1000
+++ gaim-1.3.1/src/Makefile	2005-06-09 17:22:06.000000000 -1000
@@ -88,13 +88,13 @@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -fPIE
 LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
+	$(AM_CFLAGS) $(CFLAGS) -fPIE
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@ -pie
 SOURCES = $(gaim_SOURCES) $(gaim_remote_SOURCES)
 DIST_SOURCES = $(gaim_SOURCES) $(gaim_remote_SOURCES)
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	11 May 2005 03:27:02 -0000	1.22
+++ .cvsignore	10 Jun 2005 04:04:28 -0000	1.23
@@ -1 +1 @@
-gaim-1.3.0.tar.bz2
+gaim-1.3.1.tar.bz2

gaim-desktop.patch:
 gaim.desktop |   44 +++-----------------------------------------
 1 files changed, 3 insertions(+), 41 deletions(-)

Index: gaim-desktop.patch
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/gaim-desktop.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- gaim-desktop.patch	11 May 2005 03:27:02 -0000	1.11
+++ gaim-desktop.patch	10 Jun 2005 04:04:28 -0000	1.12
@@ -1,41 +1,59 @@
-diff -urN gaim-1.3.0cvs.orig/gaim.desktop gaim-1.3.0cvs/gaim.desktop
---- gaim-1.3.0cvs.orig/gaim.desktop	2005-04-13 17:08:07.000000000 -1000
-+++ gaim-1.3.0cvs/gaim.desktop	2005-05-08 13:21:58.000000000 -1000
-@@ -1,28 +1,7 @@
+--- gaim-1.3.1/gaim.desktop.orig	2005-06-08 15:34:09.000000000 -1000
++++ gaim-1.3.1/gaim.desktop	2005-06-09 17:19:03.000000000 -1000
+@@ -1,6 +1,8 @@
  [Desktop Entry]
  Encoding=UTF-8
+-Categories=Application;Network;
++Categories=Application;Network;X-Red-Hat-Base;
++Name=IM
++#GenericName=IM
+ Comment=Send instant messages over multiple protocols
+ Comment[cs]=Posílat instant message různými protokoly
+ Comment[ca]=Envieu missatges instantanis en múltiples protocols
+@@ -23,46 +25,6 @@
+ GenericName[cs]=Internet Messenger
+ Comment[zh_CN]=通过多种协议发送即时消息
+ Comment[zh_TW]=透過多種通訊協定發送即時訊息
+-GenericName=Internet Messenger
+-GenericName[ca]=Missatger d'Internet
+-GenericName[da]=Internet beskeder
+-GenericName[es]=Cliente de mensajería de Internet
+-GenericName[fr]=Messagerie internet
+-GenericName[hu]=IM
+-GenericName[it]=Internet Messenger
+-GenericName[ja]=インスタント・メッセンジャー
+-GenericName[ko]=메신저
+-GenericName[nb]=Lynmeldingsklient
+-GenericName[nl]=Expresberichten
+-GenericName[pl]=Komunikator Internetowy
+-GenericName[pt_BR]=Mensageiro via Internet
+-GenericName[pt]=Mensageiro Internet
+-Name[cs]=Gaim Internet Messenger
+-GenericName[sl]=Spletni sel
+-GenericName[sq]=Lajmësjellës Internet
+-GenericName[sv]=Meddelandeklient
+-GenericName[zh_CN]=互联网通讯程序
+-GenericName[zh_TW]=網路即時通
 -Name=Gaim Internet Messenger
+-Name[ca]=Missatger d'Internet Gaim
 -Name[da]=Gaim - internet beskeder
 -Name[de]=Gaim Internet Messenger
--Name[fr]=Gaim Messagerie Instantanée
+-Name[es]=Gaim - cliente de mensajería de Internet
+-Name[fr]=Gaim Messagerie Internet
 -Name[hu]=Gaim IM
 -Name[it]=Gaim Internet Messenger
+-Name[ja]=Gaim インスタント・メッセンジャー
 -Name[ko]=게임 메신저
+-Name[nb]=Gaim lynmeldingsklient
 -Name[nl]=Gaim - Expresberichten
 -Name[pl]=Komunikator Internetowy Gaim
--Name[pt]=Mensageiro Instantâneo Gaim
+-Name[pt_BR]=Mensageiro via Internet Gaim
+-Name[pt]=Mensageiro Internet Gaim
 -Name[sl]=Gaim - spletni sel
+-Name[sq]=Lajmësjellësi Internet Gaim
 -Name[sv]=Gaim Internet Messenger
--GenericName=Internet Messenger
--GenericName[da]=Internet beskeder
--GenericName[fr]=Messagerie instantanée
--GenericName[hu]=IM
--GenericName[it]=Internet Messenger
--GenericName[ko]=메신저
--GenericName[nl]=Expresberichten
--GenericName[pl]=Komunikator Internetowy
--GenericName[pt]=Mensageiro Instantâneo
--GenericName[pt_BR]=Mensageiro da Internet Gaim
--GenericName[sl]=Spletni sel
-+Name=IM
-+#GenericName=IM
- Comment=Multi-protocol Messaging Client
- Comment[da]=Multiprotokolsklient til at sende og modtage beskeder
- Comment[de]=Multi-Protokoll Instant Messenger Client
-@@ -41,5 +20,5 @@
+-Name[zh_CN]=Gaim 互联网通讯程序
+-Name[zh_TW]=Gaim 網路即時通
+ Exec=gaim
  Icon=gaim.png
- Terminal=false
- Type=Application
--Categories=Application;Network;
-+Categories=Application;Network;X-Red-Hat-Base;
  StartupNotify=true


Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/gaim-fedora-prefs.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gaim-fedora-prefs.xml	8 Oct 2004 04:40:38 -0000	1.6
+++ gaim-fedora-prefs.xml	10 Jun 2005 04:04:28 -0000	1.7
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8' ?>
-<pref name='/'>
+
+<pref version='1.0' name='/'>
 	<pref name='core'>
 		<pref name='away'>
 			<pref name='away_when_idle' type='bool' value='1' />
@@ -55,17 +56,33 @@
 	</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>
 			<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>
-			<pref name='statenotify'>
-				<pref name='notify_away' type='bool' value='1' />
-				<pref name='notify_idle' type='bool' value='1' />
-			</pref>
 		</pref>
 		<pref name='lopl' />
+		<pref name='prpl'>
+			<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>
+			<pref name='msn'>
+				<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>
+		</pref>
 		<pref name='gtk'>
 			<pref name='docklet'>
 				<pref name='queue_messages' type='bool' value='0' />
@@ -80,10 +97,10 @@
 					<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='0' />
-					<pref name='method_count' type='bool' value='0' />
-					<pref name='notify_focus' type='bool' value='0' />
-					<pref name='notify_click' type='bool' value='0' />
+					<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' />
@@ -119,13 +136,15 @@
 			</pref>
 			<pref name='plugins'>
 				<pref name='loaded' type='stringlist'>
-					<item value='/usr/lib/gaim/extplacement.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='smileys'>
-				<pref name='theme' type='string' value='default' />
+				<pref name='theme' type='string' value='/usr/share/pixmaps/gaim/smileys/default/theme' />
 			</pref>
 			<pref name='debug'>
 				<pref name='enabled' type='bool' value='0' />


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/gaim.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- gaim.spec	11 May 2005 03:27:02 -0000	1.59
+++ gaim.spec	10 Jun 2005 04:04:28 -0000	1.60
@@ -12,8 +12,8 @@
 %define silc_integration	1
 
 Name:		gaim
-Version:	1.3.0
-Release:	1.fc3
+Version:	1.3.1
+Release:	0.fc3
 Epoch:		1
 License:	GPL
 Group:		Applications/Internet
@@ -25,6 +25,9 @@
 # - enable System Tray Icon
 # - enable ExtPlacement plugin
 # - enable History plugin
+# - enable Message Notification plugin
+#   Insert count of new messages into window title
+#   Set window manager "URGENT" hint
 # - disable buddy icon in buddy list
 # - enable Logging (in HTML)
 # - Browser "GNOME Default"
@@ -35,7 +38,7 @@
 Patch0:		gaim-desktop.patch
 # to be replaced by upstream fix
 Patch4:		gaim-0.76-xinput.patch
-Patch5:		gaim-1.1.0-PIE.patch
+Patch5:		gaim-1.3.1-PIE.patch
 # GNOME running check is naive and wrong for both KDE and older distributions
 Patch6:		gaim-1.0.1-naive-gnome-check.patch
 
@@ -102,6 +105,7 @@
 %setup -q
 %patch0 -p1
 %patch4 -p1
+#patch5 happens after configure, yes this sucks
 %patch6 -p1
 
 # CVS backports go here
@@ -180,8 +184,7 @@
 %{_libdir}/gaim
 %{_includedir}/gaim
 %{_libdir}/pkgconfig/gaim.pc
-%{_libdir}/libgaim*.so
-%{_libdir}/libgaim*.so.0.*
+%{_libdir}/libgaim*.so*
 %{_mandir}/*/*
 #%%{_datadir}/applets/Network/gaim_applet.desktop
 %{_datadir}/applications/gaim.desktop
@@ -196,6 +199,11 @@
 %endif
 
 %changelog
+* Thu Jun 09 2005 Warren Togami <wtogami at redhat.com> 1:1.3.1-0
+- 1.3.1 more bug fixes
+  CAN-2005-1269 CAN-2005-1934
+- enable Message Notification plugin by default
+
 * Tue May 10 2005 Warren Togami <wtogami at redhat.com> 1:1.3.0-1
 - 1.3.0 many bug fixes and two security fixes
   long URL crash fix (#157017) CAN-2005-1261


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-3/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	11 May 2005 03:27:02 -0000	1.27
+++ sources	10 Jun 2005 04:04:28 -0000	1.28
@@ -1 +1 @@
-4816d0e92f7a2622fb66e1b97d3c0b7d  gaim-1.3.0.tar.bz2
+a76e59c5093773169fbb232782a2f116  gaim-1.3.1.tar.bz2


--- gaim-1.1.0-PIE.patch DELETED ---

More information about the fedora-cvs-commits mailing list