|
|
Author: wtogami
Update of /cvs/dist/rpms/gaim/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv13467
Modified Files:
gaim.spec
Log Message:
- buildreq NetworkManager-glib-devel FC5+ (katzj)
- #213800 debug window freeze fix
- #212818 IRC SIGPIPE crash fix
Index: gaim.spec
===================================================================
RCS file: /cvs/dist/rpms/gaim/FC-6/gaim.spec,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- gaim.spec 25 Oct 2006 20:40:39 -0000 1.144
+++ gaim.spec 8 Nov 2006 23:19:48 -0000 1.145
@@ -14,6 +14,8 @@
%define dbus_integration 1
# OPTION: gstreamer integration (FC5+)
%define gstreamer_integration 1
+# OPTION: NetworkManager integration (FC5+)
+%define nm_integration 1
# OPTION: dbus-glib split (FC6+)
%define dbus_glib_splt 1
@@ -29,7 +31,7 @@
Name: gaim
Version: 2.0.0
-Release: 0.17.%{betaver}%{?dist}
+Release: 0.19.%{betaver}%{?dist}
License: GPL
Group: Applications/Internet
URL: http://gaim.sourceforge.net/
@@ -55,6 +57,8 @@
Patch5: gaim2-PIE.patch
## Patches 100+: To be Included in Future Upstream
+Patch100: gaim-2.0.0beta4-dbus-exit.patch
+Patch101: gaim-2.0.0beta4-debug-window-freeze.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
Summary: A Gtk+ based multiprotocol instant messaging client
@@ -109,6 +113,10 @@
%if %{gstreamer_integration}
BuildRequires: gstreamer-devel >= 0.10
%endif
+# NetworkManager integration (FC5+)
+%if %{nm_integration}
+BuildRequires: NetworkManager-glib-devel
+%endif
# DBus GLIB Split (FC6+)
%if %{dbus_glib_splt}
BuildRequires: dbus-glib-devel >= 0.70
@@ -160,6 +168,8 @@
# PIE patch is broken, hoping for a better future proofed upstream solution
#%patch5 -p1
## Patches 100+: To be Included in Future Upstream
+%patch100 -p1
+%patch101 -p1
# Relabel internal version for support purposes
sed -i "s/%{version}%{betaver}/%{version}-%{release}/g" configure
@@ -315,6 +325,11 @@
%{_libdir}/pkgconfig/gnt.pc
%changelog
+* Wed Nov 8 2006 Warren Togami <wtogami@xxxxxxxxxx> - 2:2.0.0-0.19.beta4
+- buildreq NetworkManager-glib-devel FC5+ (katzj)
+- #213800 debug window freeze fix
+- #212818 IRC SIGPIPE crash fix
+
* Wed Oct 25 2006 Warren Togami <wtogami@xxxxxxxxxx> - 2:2.0.0-0.17.beta4
- temporary workaround for gstreamer build bug in beta4
--enable-gstreamer prevented it from working =)
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|