rpms/gtk2
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update patches

Browse Source
This commit is contained in:
Matthias Clasen 2007-06-04 18:47:56 +00:00
parent e328659369
commit c9942a05e8
2 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gtk+-2.11.0-destdir.patch
View File

@ -1,20 +0,0 @@
--- 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

4
gtk2.spec
View File

@ -30,8 +30,6 @@ Patch1: gtk+-2.11.1-set-invisible-char-to-bullet.patch
# use fam for recent-files # use fam for recent-files
#Patch2: gtk+-2.10.3-fam.patch #Patch2: gtk+-2.10.3-fam.patch
Patch3: gtk+-2.10.11-user-dirs.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: atk-devel >= %{atk_version}
BuildRequires: pango-devel >= %{pango_version} BuildRequires: pango-devel >= %{pango_version}
@ -115,7 +113,6 @@ docs for the GTK+ widget toolkit.
%patch1 -p1 -b .set-invisible-char-to-bullet %patch1 -p1 -b .set-invisible-char-to-bullet
#%patch2 -p1 -b .fam #%patch2 -p1 -b .fam
%patch3 -p1 -b .user-dirs %patch3 -p1 -b .user-dirs
%patch4 -p1 -b .destdir
for i in config.guess config.sub ; do for i in config.guess config.sub ; do
test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i . test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@ -285,6 +282,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 1.11.1-1 * Mon Jun 4 2007 Matthias Clasen <mclasen@redhat.com> - 1.11.1-1
- Update to 2.11.1 - Update to 2.11.1
- Update patches
* Thu May 24 2007 Matthias Clasen <mclasen@redhat.com> - 1.11.0-1 * Thu May 24 2007 Matthias Clasen <mclasen@redhat.com> - 1.11.0-1
- Update to 2.11.0 - Update to 2.11.0