rpms/xulrunner/devel mozilla-libnotify.patch,1.1,1.2

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11019

Modified Files:
	mozilla-libnotify.patch 
Log Message:
Fix conflicting patches

mozilla-libnotify.patch:
 config/autoconf.mk.in                             |    4 
 config/system-headers                             |    1 
 configure.in                                      |   34 ++
 js/src/config/system-headers                      |    1 
 toolkit/components/alerts/src/Makefile.in         |    2 
 toolkit/components/alerts/src/nsAlertsService.cpp |   12 
 toolkit/components/build/nsToolkitCompsCID.h      |   11 
 toolkit/system/gnome/Makefile.in                  |   18 +
 toolkit/system/gnome/nsAlertsIconListener.cpp     |  326 ++++++++++++++++++++++
 toolkit/system/gnome/nsAlertsIconListener.h       |   85 +++++
 toolkit/system/gnome/nsAlertsService.cpp          |   73 ++++
 toolkit/system/gnome/nsAlertsService.h            |   59 +++
 toolkit/system/gnome/nsGnomeModule.cpp            |   17 +
 13 files changed, 641 insertions(+), 2 deletions(-)

Index: mozilla-libnotify.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-libnotify.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- mozilla-libnotify.patch	21 Aug 2009 13:40:34 -0000	1.1
+++ mozilla-libnotify.patch	21 Aug 2009 13:45:13 -0000	1.2
@@ -1,24 +1,6 @@
 diff -up mozilla-1.9.1/config/autoconf.mk.in.libnotify mozilla-1.9.1/config/autoconf.mk.in
 --- mozilla-1.9.1/config/autoconf.mk.in.libnotify	2009-07-30 17:30:11.000000000 +0200
 +++ mozilla-1.9.1/config/autoconf.mk.in	2009-08-21 15:31:20.000000000 +0200
-@@ -57,14 +57,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
- prefix		= @prefix@
- exec_prefix	= @exec_prefix@
- bindir		= @bindir@
--includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- libdir		= @libdir@
- datadir		= @datadir@
- mandir		= @mandir@
--idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- 
- installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
- 
- DIST		= $(DEPTH)/dist
- LIBXUL_SDK      = @LIBXUL_SDK@
 @@ -528,6 +528,10 @@ MOZ_PANGO_LIBS          = @MOZ_PANGO_LIB
  MOZ_XIE_LIBS		= @MOZ_XIE_LIBS@
  XT_LIBS			= @XT_LIBS@