rpms/gtk2/devel gtk+-2.11.0-destdir.patch, NONE, 1.1 gtk2.spec, 1.227, 1.228

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/gtk2/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28938

Modified Files:
	gtk2.spec 
Added Files:
	gtk+-2.11.0-destdir.patch 
Log Message:
fix destdir support


gtk+-2.11.0-destdir.patch:

--- NEW FILE gtk+-2.11.0-destdir.patch ---
--- gtk+-2.11.0/modules/input/Makefile.am.destdir	2007-05-24 15:11:49.000000000 -0400
+++ gtk+-2.11.0/modules/input/Makefile.am	2007-05-24 15:12:17.000000000 -0400
@@ -91,7 +91,7 @@ if USE_WIN32
 IM_IME_MODULE=im-ime.la 
 endif
 
-multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(DESTDIR)$(sysconfdir)/gtk-2.0"\"
+multipress_defs = -DMULTIPRESS_LOCALEDIR=\""$(mplocaledir)"\" -DMULTIPRESS_CONFDIR=\""$(sysconfdir)/gtk-2.0"\"
 im_multipress_la_CPPFLAGS = $(multipress_defs)
 im_multipress_la_LDFLAGS = -rpath $(moduledir) -avoid-version -module $(no_undefined)
 im_multipress_la_SOURCES =	\
@@ -100,7 +100,7 @@ im_multipress_la_SOURCES =	\
 	immultipress.c
 im_multipress_la_LIBADD = $(LDADDS)
 
-imconffiledir = $(DESTDIR)$(sysconfdir)/gtk-2.0
+imconffiledir = $(sysconfdir)/gtk-2.0
 dist_imconffile_DATA = im-multipress.conf
 
 if CROSS_COMPILING


Index: gtk2.spec
===================================================================
RCS file: /cvs/extras/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -r1.227 -r1.228
--- gtk2.spec	24 May 2007 16:56:40 -0000	1.227
+++ gtk2.spec	24 May 2007 19:18:36 -0000	1.228
@@ -30,6 +30,8 @@
 # use fam for recent-files
 #Patch2: gtk+-2.10.3-fam.patch
 Patch3: gtk+-2.10.11-user-dirs.patch
+# destdir support is broken in input
+Patch4: gtk+-2.11.0-destdir.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -113,6 +115,7 @@
 %patch1 -p1 -b .set-invisible-char-to-bullet
 #%patch2 -p1 -b .fam
 %patch3 -p1 -b .user-dirs
+%patch4 -p1 -b .destdir
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .