rpms/gtk2/devel update-gdk-pixbuf-loaders, NONE, 1.1 update-gtk-immodules, NONE, 1.1 .cvsignore, 1.64, 1.65 gtk2.spec, 1.208, 1.209 sources, 1.70, 1.71 gtk+-2.10.0-search.patch, 1.4, NONE gtk+-2.10.1-fix-tree-crash.patch, 1.1, NONE gtk+-2.10.1-search.patch, 1.2, NONE gtk+-2.10.2-cursor-blink.patch, 1.1, NONE gtk+-2.10.2-im-reset.patch, 1.1, NONE gtk+-2.10.2-poll.patch, 1.1, NONE gtk+-2.10.2-printer-list.patch, 1.1, NONE gtk+-2.10.2-recent.patch, 1.1, NONE gtk+-2.10.2-values-and-names.patch, 1.1, NONE gtk+-2.10.3-auth-dialogs.patch, 1.1, NONE gtk+-2.10.3-desktop.patch, 1.1, NONE gtk+-2.10.3-gedit-color-picker.patch, 1.1, NONE gtk+-2.10.3-parent-walk.patch, 1.1, NONE gtk+-2.10.3-search.patch, 1.2, NONE gtk+-2.10.3-sylpheed-crash.patch, 1.1, NONE gtk+-2.10.4-close-loader.patch, 1.2, NONE gtk+-2.10.4-deadlock.patch, 1.1, NONE gtk+-2.10.4-icon-theme-crash.patch, 1.1, NONE gtk+-2.10.4-message-dialog-a11y.patch, 1.1, NONE gtk+-2.10.4-mnemonic-clipping.patch, 1.1, NONE gtk+-2.10.4-panel-crash.patch, 1.1, NONE gtk+-2.10.4-pat! h-check.patch, 1.1, NONE gtk+-2.10.4-printernames.patch, 1.2, NONE gtk+-2.10.4-search.patch, 1.4, NONE gtk+-2.10.4-strncpy.patch, 1.1, NONE gtk+-2.10.7-search.patch, 1.1, NONE gtk+-2.10.8-recent-menu-crash.patch, 1.1, NONE gtk+-2.7.0-themename.patch, 1.3, NONE gtk+-2.8.0-back-pixmap.patch, 1.1, NONE gtk+-2.8.10-abicheck.patch, 1.1, NONE gtk+-2.8.11-double-free.patch, 1.1, NONE gtk+-2.8.14-a11y-crash.patch, 1.1, NONE gtk+-2.8.4-size-overflow.patch, 1.1, NONE gtk+-2.8.6-inputmethod.patch, 1.2, NONE gtk+-2.8.6-mimecache.patch, 1.1, NONE gtk+-2.9.2.evo-crash.patch, 1.1, NONE render-avoid-repeat.patch, 1.3, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 22 19:23:48 UTC 2007


Author: mclasen

Update of /cvs/dist/rpms/gtk2/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv13603

Modified Files:
	.cvsignore gtk2.spec sources 
Added Files:
	update-gdk-pixbuf-loaders update-gtk-immodules 
Removed Files:
	gtk+-2.10.0-search.patch gtk+-2.10.1-fix-tree-crash.patch 
	gtk+-2.10.1-search.patch gtk+-2.10.2-cursor-blink.patch 
	gtk+-2.10.2-im-reset.patch gtk+-2.10.2-poll.patch 
	gtk+-2.10.2-printer-list.patch gtk+-2.10.2-recent.patch 
	gtk+-2.10.2-values-and-names.patch 
	gtk+-2.10.3-auth-dialogs.patch gtk+-2.10.3-desktop.patch 
	gtk+-2.10.3-gedit-color-picker.patch 
	gtk+-2.10.3-parent-walk.patch gtk+-2.10.3-search.patch 
	gtk+-2.10.3-sylpheed-crash.patch 
	gtk+-2.10.4-close-loader.patch gtk+-2.10.4-deadlock.patch 
	gtk+-2.10.4-icon-theme-crash.patch 
	gtk+-2.10.4-message-dialog-a11y.patch 
	gtk+-2.10.4-mnemonic-clipping.patch 
	gtk+-2.10.4-panel-crash.patch gtk+-2.10.4-path-check.patch 
	gtk+-2.10.4-printernames.patch gtk+-2.10.4-search.patch 
	gtk+-2.10.4-strncpy.patch gtk+-2.10.7-search.patch 
	gtk+-2.10.8-recent-menu-crash.patch gtk+-2.7.0-themename.patch 
	gtk+-2.8.0-back-pixmap.patch gtk+-2.8.10-abicheck.patch 
	gtk+-2.8.11-double-free.patch gtk+-2.8.14-a11y-crash.patch 
	gtk+-2.8.4-size-overflow.patch gtk+-2.8.6-inputmethod.patch 
	gtk+-2.8.6-mimecache.patch gtk+-2.9.2.evo-crash.patch 
	render-avoid-repeat.patch 
Log Message:

clean up patches in cvs



--- NEW FILE update-gdk-pixbuf-loaders ---
#! /bin/sh

if test $# != 1; then
  echo usage: update-gdk-pixbuf-loaders host_triplet 1>&2
  exit 1
fi

umask 022
# Deriving /etc/gtk-2.0/$host location
#
# autoconf changes linux to linux-gnu
case "$1" in
  *linux) host="$1-gnu"
  ;;
  *) host=$1
  ;;
esac

# autoconf uses powerpc not ppc
host=`echo $host | sed "s/^ppc/powerpc/"`

# We have had problems in the past with build systems
# changing host from i386 to i686 and appending/dropping
# the -gnu suffix, so try to match up the $host we got
# with whats actually there.
if [ ! -d /etc/gtk-2.0/$host ]; then 
   case "$host" in
     i?86*) 
         for d in $(ls -d /etc/gtk-2.0/i?86*); do
           host=$(basename $d)
           break
         done
     ;;
   esac
fi 

FILE=/etc/gtk-2.0/$host/gdk-pixbuf.loaders

case "$host" in
  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
   /usr/bin/gdk-pixbuf-query-loaders-64 > $FILE
   ;;
  *)
   /usr/bin/gdk-pixbuf-query-loaders-32 > $FILE
   ;;
esac


--- NEW FILE update-gtk-immodules ---
#! /bin/sh

if test $# != 1; then
  echo usage: update-gtk-immodules host_triplet 1>&2
  exit 1
fi
 
umask 022
# Deriving /etc/gtk-2.0/$host location
#
# autoconf changes linux to linux-gnu
case "$1" in
  *linux) host="$1-gnu"
  ;;
  *) host=$1
  ;;
esac

# autoconf uses powerpc not ppc
host=`echo $host | sed "s/^ppc/powerpc/"`

# We have had problems in the past with build systems
# changing host from i386 to i686 and appending/dropping
# the -gnu suffix, so try to match up the $host we got
# with whats actually there.
if [ ! -d /etc/gtk-2.0/$host ]; then
   case "$host" in
     i?86*)
         for d in $(ls -d /etc/gtk-2.0/i?86*); do
           host=$(basename $d)
           break
         done
     ;;
   esac
fi

FILE=/etc/gtk-2.0/$host/gtk.immodules

case "$host" in
  alpha*|ia64*|powerpc64*|s390x*|x86_64*)
   /usr/bin/gtk-query-immodules-2.0-64 > $FILE
   ;;
  *)
   /usr/bin/gtk-query-immodules-2.0-32 > $FILE
   ;;
esac


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	17 Jan 2007 06:06:39 -0000	1.64
+++ .cvsignore	22 Jan 2007 19:23:46 -0000	1.65
@@ -47,3 +47,4 @@
 gtk+-2.10.6.tar.bz2
 gtk+-2.10.7.tar.bz2
 gtk+-2.10.8.tar.bz2
+gtk+-2.10.9.tar.bz2


Index: gtk2.spec
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/gtk2.spec,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -r1.208 -r1.209
--- gtk2.spec	17 Jan 2007 13:30:17 -0000	1.208
+++ gtk2.spec	22 Jan 2007 19:23:46 -0000	1.209
@@ -10,7 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-%define base_version 2.10.8
+%define base_version 2.10.9
 %define bin_version 2.10.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X
@@ -20,7 +20,8 @@
 License: LGPL
 Group: System Environment/Libraries
 Source: http://ftp.gnome.org/pub/gnome/sources/gtk+/2.10/gtk+-%{version}.tar.bz2
-Source1: update-scripts.tar.gz
+Source1: update-gdk-pixbuf-loaders
+Source2: update-gtk-immodules 
 
 # Biarch changes
 Patch0: gtk+-2.4.1-lib64.patch
@@ -36,7 +37,6 @@
 
 # fixed in upstream cvs
 Patch10: gtk+-2.10.4-im-reset.patch
-Patch11: gtk+-2.10.8-recent-menu-crash.patch
 
 BuildRequires: atk-devel >= %{atk_version}
 BuildRequires: pango-devel >= %{pango_version}
@@ -115,17 +115,13 @@
 %prep
 %setup -q -n gtk+-%{version}
 
-tar xzf %{SOURCE1}
-
 %patch0 -p1 -b .lib64
 %patch1 -p1 -b .set-invisible-char-to-bullet
 %patch2 -p1 -b .search
 %patch3 -p1 -b .fam
 
 %patch7 -p1 -b .cursor-blink
-
 %patch10 -p1 -b .im-reset
-%patch11 -p1 -b .recent-menu-crash
 
 for i in config.guess config.sub ; do
   test -f %{_datadir}/libtool/$i && cp %{_datadir}/libtool/$i .
@@ -230,8 +226,8 @@
 #
 # Install wrappers for the binaries
 #
-cp update-gtk-immodules $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
-cp update-gdk-pixbuf-loaders $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
+cp %{SOURCE1} $RPM_BUILD_ROOT%{_bindir}/update-gtk-immodules
+cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/update-gdk-pixbuf-loaders
 
 # Remove unpackaged files
 rm $RPM_BUILD_ROOT%{_libdir}/*.la


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/gtk2/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources	17 Jan 2007 06:06:39 -0000	1.70
+++ sources	22 Jan 2007 19:23:46 -0000	1.71
@@ -1,2 +1 @@
-25e73f5bdf6a1272799d0536a869f645  update-scripts.tar.gz
-46bfef60f02c39acdcdba2ac46825db4  gtk+-2.10.8.tar.bz2
+20d763198efb38263b22dee347f69da6  gtk+-2.10.9.tar.bz2


--- gtk+-2.10.0-search.patch DELETED ---


--- gtk+-2.10.1-fix-tree-crash.patch DELETED ---


--- gtk+-2.10.1-search.patch DELETED ---


--- gtk+-2.10.2-cursor-blink.patch DELETED ---


--- gtk+-2.10.2-im-reset.patch DELETED ---


--- gtk+-2.10.2-poll.patch DELETED ---


--- gtk+-2.10.2-printer-list.patch DELETED ---


--- gtk+-2.10.2-recent.patch DELETED ---


--- gtk+-2.10.2-values-and-names.patch DELETED ---


--- gtk+-2.10.3-auth-dialogs.patch DELETED ---


--- gtk+-2.10.3-desktop.patch DELETED ---


--- gtk+-2.10.3-gedit-color-picker.patch DELETED ---


--- gtk+-2.10.3-parent-walk.patch DELETED ---


--- gtk+-2.10.3-search.patch DELETED ---


--- gtk+-2.10.3-sylpheed-crash.patch DELETED ---


--- gtk+-2.10.4-close-loader.patch DELETED ---


--- gtk+-2.10.4-deadlock.patch DELETED ---


--- gtk+-2.10.4-icon-theme-crash.patch DELETED ---


--- gtk+-2.10.4-message-dialog-a11y.patch DELETED ---


--- gtk+-2.10.4-mnemonic-clipping.patch DELETED ---


--- gtk+-2.10.4-panel-crash.patch DELETED ---


--- gtk+-2.10.4-path-check.patch DELETED ---


--- gtk+-2.10.4-printernames.patch DELETED ---


--- gtk+-2.10.4-search.patch DELETED ---


--- gtk+-2.10.4-strncpy.patch DELETED ---


--- gtk+-2.10.7-search.patch DELETED ---


--- gtk+-2.10.8-recent-menu-crash.patch DELETED ---


--- gtk+-2.7.0-themename.patch DELETED ---


--- gtk+-2.8.0-back-pixmap.patch DELETED ---


--- gtk+-2.8.10-abicheck.patch DELETED ---


--- gtk+-2.8.11-double-free.patch DELETED ---


--- gtk+-2.8.14-a11y-crash.patch DELETED ---


--- gtk+-2.8.4-size-overflow.patch DELETED ---


--- gtk+-2.8.6-inputmethod.patch DELETED ---


--- gtk+-2.8.6-mimecache.patch DELETED ---


--- gtk+-2.9.2.evo-crash.patch DELETED ---


--- render-avoid-repeat.patch DELETED ---




More information about the fedora-cvs-commits mailing list