rpms/gaim/devel .cvsignore, 1.34, 1.35 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

Mon Oct 23 17:13:06 UTC 2006

Author: wtogami

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

Modified Files:
	.cvsignore 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:
- 2.0.0 beta4
- gaim-text ncurses interface!
- gstreamer integration with FC5+



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/.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	23 Oct 2006 17:13:04 -0000	1.35
@@ -1 +1 @@
-gaim-2.0.0beta3.tar.bz2
+gaim-2.0.0beta4.tar.bz2


Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/devel/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	23 Oct 2006 17:13:04 -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
 
@@ -25,11 +27,11 @@
 %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.16.%{betaver}%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://gaim.sourceforge.net/
@@ -55,11 +57,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
@@ -81,6 +78,7 @@
 BuildRequires:  intltool
 BuildRequires:  desktop-file-utils
 BuildRequires:  libSM-devel
+BuildRequires:  ncurses-devel
 
 # krb5 needed for Zephyr (FC1+)
 %if %{krb_integration}
@@ -108,6 +106,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
@@ -161,16 +163,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 +206,12 @@
 %else
 	WITH_DBUS="--disable-dbus"
 %endif
+%if %{gstreamer_integration}
+	WITH_DBUS="--enable-gstreamer"
+%else
+	WITH_DBUS="--disable-gstreamer"
+%endif
+
 
 
 # FC5+ automatic -fstack-protector-all switch
@@ -285,10 +286,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 +302,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 +311,19 @@
 %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
+* 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/devel/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	23 Oct 2006 17:13:04 -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 ---


