rpms/gaim/FC-6 .cvsignore, 1.34, 1.35 gaim-fedora-prefs.xml, 1.8, 1.9 gaim.spec, 1.143, 1.144 sources, 1.34, 1.35 gaim-2.0.0-beta3-config.h.patch, 1.1, NONE gaim-2.0.0-beta3-silc-realname.patch, 1.1, NONE gaim-2.0.0-beta3-threadsafe-dbus.patch, 1.1, NONE gaim-2.0.0-beta3-transparent.patch, 1.1, NONE gaim-2.0.0-beta3-utf8-name-crash.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Oct 25 20:40:45 UTC 2006
Author: wtogami
Update of /cvs/dist/rpms/gaim/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv11055
Modified Files:
.cvsignore gaim-fedora-prefs.xml gaim.spec sources
Removed Files:
gaim-2.0.0-beta3-config.h.patch
gaim-2.0.0-beta3-silc-realname.patch
gaim-2.0.0-beta3-threadsafe-dbus.patch
gaim-2.0.0-beta3-transparent.patch
gaim-2.0.0-beta3-utf8-name-crash.patch
Log Message:
- temporary workaround for gstreamer build bug in beta4
--enable-gstreamer prevented it from working =)
NOTE: beta4 removed libao support entirely. Distros that lack gstreamer-0.10+
will need to use command line sound output from now on.
- Gadu Gadu is re-included in beta4 without requirement of external library
- 2.0.0 beta4
- gaim-text ncurses interface!
- gstreamer integration with FC5+
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/.cvsignore,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- .cvsignore 27 Jun 2006 17:53:21 -0000 1.34
+++ .cvsignore 25 Oct 2006 20:40:39 -0000 1.35
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2
Index: gaim-fedora-prefs.xml
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/gaim-fedora-prefs.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gaim-fedora-prefs.xml 19 Jul 2006 21:24:04 -0000 1.8
+++ gaim-fedora-prefs.xml 25 Oct 2006 20:40:39 -0000 1.9
@@ -29,10 +29,12 @@
</pref>
</pref>
<pref name='savedstatus'>
- <pref name='current' type='int' value='1153343286'/>
+ <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='1153343293'/>
+ <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='chat'>
@@ -50,7 +52,7 @@
</pref>
<pref name='network'>
<pref name='auto_ip' type='bool' value='1'/>
- <pref name='public_ip' type='string' value=''/>
+ <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'/>
@@ -82,6 +84,12 @@
</pref>
<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'/>
@@ -105,10 +113,6 @@
<pref name='musicmessaging'>
<pref name='editor_path' type='string' value='/usr/local/bin/gscore'/>
</pref>
- <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'/>
@@ -182,6 +186,7 @@
<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'/>
@@ -190,6 +195,22 @@
<pref name='notify_switch' type='bool' value='1'/>
</pref>
</pref>
+ <pref name='docklet'>
+ <pref name='blink_im' type='string' value='hidden'/>
+ <pref name='blink_chat' type='string' value='never'/>
+ </pref>
+ </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'>
@@ -218,6 +239,8 @@
</pref>
<pref name='debug'>
<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'/>
@@ -265,6 +288,7 @@
<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='show_buddy_icons' type='bool' value='0'/>
@@ -310,6 +334,7 @@
<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'/>
Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/gaim.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- gaim.spec 5 Oct 2006 14:22:26 -0000 1.143
+++ gaim.spec 25 Oct 2006 20:40:39 -0000 1.144
@@ -12,6 +12,8 @@
%define silc_integration 1
# OPTION: dbus integration (FC5+)
%define dbus_integration 1
+# OPTION: gstreamer integration (FC5+)
+%define gstreamer_integration 1
# OPTION: dbus-glib split (FC6+)
%define dbus_glib_splt 1
@@ -19,17 +21,15 @@
%define mono_integration 0
# OPTION: Howl integration (seems broken)
%define howl_integration 0
-# OPTION: gadugadu integration (not shipped in core)
-%define gadugadu_integration 0
# OPTION: Meanwhile integration (not shipped in core)
%define meanwhile_integration 0
# Prerelease define
-%define betaver beta3
+%define betaver beta4
Name: gaim
Version: 2.0.0
-Release: 0.15.%{betaver}%{?dist}
+Release: 0.17.%{betaver}%{?dist}
License: GPL
Group: Applications/Internet
URL: http://gaim.sourceforge.net/
@@ -55,11 +55,6 @@
Patch5: gaim2-PIE.patch
## Patches 100+: To be Included in Future Upstream
-Patch181: gaim-2.0.0-beta3-silc-realname.patch
-Patch182: gaim-2.0.0-beta3-utf8-name-crash.patch
-Patch183: gaim-2.0.0-beta3-config.h.patch
-
-Patch200: gaim-2.0.0-beta3-transparent.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -72,6 +67,7 @@
Requires: glib2 >= %{glib_ver}
# Basic Library Requirements
+BuildRequires: autoconf
BuildRequires: libao-devel, startup-notification-devel, audiofile-devel
BuildRequires: cyrus-sasl-devel
BuildRequires: mozilla-nss-devel
@@ -81,6 +77,7 @@
BuildRequires: intltool
BuildRequires: desktop-file-utils
BuildRequires: libSM-devel
+BuildRequires: ncurses-devel
# krb5 needed for Zephyr (FC1+)
%if %{krb_integration}
@@ -108,6 +105,10 @@
%if %{dbus_integration}
BuildRequires: dbus-devel >= 0.35
%endif
+# GStreamer integration (FC5+)
+%if %{gstreamer_integration}
+BuildRequires: gstreamer-devel >= 0.10
+%endif
# DBus GLIB Split (FC6+)
%if %{dbus_glib_splt}
BuildRequires: dbus-glib-devel >= 0.70
@@ -125,12 +126,7 @@
%if %{meanwhile_integration}
BuildRequires: meanwhile-devel
%endif
-# Gadugadu integration (not shipped in core)
-%if %{gadugadu_integration}
-BuildRequires: ekg-devel
-%endif
-BuildRequires: autoconf
%description
Gaim allows you to talk to anyone using a variety of messaging
@@ -161,16 +157,9 @@
%prep
%setup -q -n gaim-%{version}%{betaver}
## Patches 0-99: Fedora specific or upstream wont accept
-%patch5 -p1
+# PIE patch is broken, hoping for a better future proofed upstream solution
+#%patch5 -p1
## Patches 100+: To be Included in Future Upstream
-%patch181 -p2
-%patch182 -p0
-%patch183 -p1
-
-%patch200 -p1 -b .transparent
-
-# patch 183 touches configure.ac
-autoconf
# Relabel internal version for support purposes
sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -211,6 +200,14 @@
%else
WITH_DBUS="--disable-dbus"
%endif
+%if %{gstreamer_integration}
+ # Temporary workaround for bug in beta4, uncomment this later
+ #WITH_GSTREAMER="--enable-gstreamer"
+ WITH_GSTREAMER=""
+%else
+ WITH_GSTREAMER="--disable-gstreamer"
+%endif
+
# FC5+ automatic -fstack-protector-all switch
@@ -222,7 +219,7 @@
%configure --disable-tcl --disable-tk --enable-gnutls=no --enable-nss=yes \
--enable-cyrus-sasl \
$WITH_KRB $WITH_SILC $WITH_PERL $WITH_HOWL $WITH_MONO \
- $WITH_SASL $WITH_DBUS
+ $WITH_SASL $WITH_DBUS $WITH_GSTREAMER
# smp_mflags breaks the mono plugin
make
@@ -285,10 +282,12 @@
%files -f gaim.lang
%defattr(-,root,root,-)
-%doc doc/CREDITS NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
+%doc NEWS COPYING AUTHORS doc/FAQ README ChangeLog doc/PERL-HOWTO.dox
%{_bindir}/*
%{_libdir}/gaim/
%{_libdir}/libgaim-client.so.*
+%{_libdir}/libgaim.so.*
+%{_libdir}/libgnt.so.*
%{_mandir}/man1/*
%{_mandir}/man3/*
%{_datadir}/aclocal/gaim.m4
@@ -299,6 +298,7 @@
%{_datadir}/pixmaps/gaim.svg
%{_datadir}/sounds/gaim/
%{_sysconfdir}/gaim/
+%{_sysconfdir}/gconf/schemas/gaim.schemas
%if %{perl_integration}
%{perl_vendorarch}/Gaim*
%{perl_vendorarch}/auto/Gaim/
@@ -307,10 +307,26 @@
%files devel
%defattr(-,root,root,-)
%{_includedir}/gaim/
+%{_includedir}/gnt/
%{_libdir}/libgaim-client.so
+%{_libdir}/libgaim.so
+%{_libdir}/libgnt.so
%{_libdir}/pkgconfig/gaim.pc
+%{_libdir}/pkgconfig/gnt.pc
%changelog
+* Wed Oct 25 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.17.beta4
+- temporary workaround for gstreamer build bug in beta4
+ --enable-gstreamer prevented it from working =)
+ NOTE: beta4 removed libao support entirely. Distros that lack gstreamer-0.10+
+ will need to use command line sound output from now on.
+- Gadu Gadu is re-included in beta4 without requirement of external library
+
+* Mon Oct 23 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.16.beta4
+- 2.0.0 beta4
+- gaim-text ncurses interface!
+- gstreamer integration with FC5+
+
* Thu Oct 05 2006 Warren Togami <wtogami at redhat.com> - 2:2.0.0-0.15.beta3
- delete config.h correctly (rvokal)
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 27 Jun 2006 17:53:21 -0000 1.34
+++ sources 25 Oct 2006 20:40:39 -0000 1.35
@@ -1 +1 @@
-c077655e4dd251cf22c406777c985a74 gaim-2.0.0beta3.tar.bz2
+ddf49cb3f95febdd26bf2214875446e6 gaim-2.0.0beta4.tar.bz2
--- gaim-2.0.0-beta3-config.h.patch DELETED ---
--- gaim-2.0.0-beta3-silc-realname.patch DELETED ---
--- gaim-2.0.0-beta3-threadsafe-dbus.patch DELETED ---
--- gaim-2.0.0-beta3-transparent.patch DELETED ---
--- gaim-2.0.0-beta3-utf8-name-crash.patch DELETED ---
More information about the fedora-cvs-commits
mailing list