rpms/gtk+extra/EL-6 gtk+extra-2.1.2-gtk2.21.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 gtk+extra.spec, 1.16, 1.17 sources, 1.3, 1.4 gtk+extra-2.1.1-deleterow.patch, 1.1, NONE gtk+extra-2.1.1-gtk2.18.patch, 1.1, NONE gtk+extra-2.1.1-item.patch, 1.1, NONE gtk+extra-2.1.1.g_free.diff, 1.2, NONE

[Roy Rankin]

Author: rrankin

Update of /cvs/pkgs/rpms/gtk+extra/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4302

Modified Files:
	.cvsignore gtk+extra.spec sources 
Added Files:
	gtk+extra-2.1.2-gtk2.21.patch 
Removed Files:
	gtk+extra-2.1.1-deleterow.patch gtk+extra-2.1.1-gtk2.18.patch 
	gtk+extra-2.1.1-item.patch gtk+extra-2.1.1.g_free.diff 
Log Message:
Bugfix upstream release


gtk+extra-2.1.2-gtk2.21.patch:
 gtkitementry.c |    4 ++++
 1 file changed, 4 insertions(+)

--- NEW FILE gtk+extra-2.1.2-gtk2.21.patch ---
diff -c -r1.7 gtkitementry.c
*** gtkextra/gtkitementry.c	13 Mar 2010 09:45:54 -0000	1.7
--- gtkextra/gtkitementry.c	11 Jun 2010 23:33:41 -0000
***************
*** 131,137 ****
--- 131,139 ----
  static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
                                                          gboolean        include_preedit);
  static void         gtk_entry_queue_draw               (GtkEntry       *entry);
+ #if GTK_CHECK_VERSION(2,21,0) == 0
  static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
+ #endif 
  static void         gtk_entry_recompute                (GtkEntry       *entry);
  static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
  							CursorType      type,
***************
*** 1754,1759 ****
--- 1756,1762 ----
      gdk_window_invalidate_rect (entry->text_area, NULL, FALSE);
  }
  
+ #if GTK_CHECK_VERSION(2,21,0) == 0
  static void
  gtk_entry_reset_im_context (GtkEntry *entry)
  {
***************
*** 1763,1768 ****
--- 1766,1772 ----
        gtk_im_context_reset (entry->im_context);
      }
  }
+ #endif // GTK_CHECK_VERSION(2,21,0) == 0
  
  static void
  gtk_entry_get_cursor_locations (GtkEntry   *entry,



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/EL-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	5 Oct 2005 12:48:40 -0000	1.3
+++ .cvsignore	2 Jul 2010 16:34:09 -0000	1.4
@@ -1 +1 @@
-gtk+extra-2.1.1.tar.gz
+gtk+extra-2.1.2.tar.gz


Index: gtk+extra.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/EL-6/gtk+extra.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- gtk+extra.spec	20 Dec 2009 06:39:50 -0000	1.16
+++ gtk+extra.spec	2 Jul 2010 16:34:10 -0000	1.17
@@ -1,17 +1,14 @@
 Name:		gtk+extra
-Version:	2.1.1
-Release:	13%{?dist}
+Version:	2.1.2
+Release:	2%{?dist}
 Summary:	A library of gtk+ widgets
 Summary(fr):	Une bibliothèque de widgets gtk+
 
 Group:		System Environment/Libraries
-License:	GPLv2+
+License:	LGPLv2+
 URL:		http://gtkextra.sourceforge.net/
-Source:		http://dl.sf.net/scigraphica/gtk+extra-%{version}.tar.gz
-Patch:		%{name}-%{version}.g_free.diff
-Patch1:		%{name}-%{version}-deleterow.patch
-Patch2:		%{name}-%{version}-item.patch
-Patch3:		%{name}-%{version}-gtk2.18.patch
+Source:		http://downloads.sourceforge.net/gtkextra/gtk+extra-%{version}.tar.gz
+Patch:		%{name}-%{version}-gtk2.21.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
@@ -48,13 +45,11 @@ qui utilisent les widgets gtk+extra.
 %{__sed} -i 's/\r//' docs/tutorial/{*.html,gtksheet/*.{c,html}}
 
 %patch -p0
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
+
 
 %build
 %configure
-make %{?_smp_mflags}
+make  %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -77,14 +72,30 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc docs/{gtk*.ChangeLog,COPYING,HELP,README,TODO,VERSION}
 %doc docs/reference/ docs/tutorial/
+%dir %{_datadir}/gtk-doc/html/gtkextra/
+%{_datadir}/gtk-doc/html/gtkextra/
 %{_libdir}/*.a
 %exclude %{_libdir}/*.la
+%exclude %{_libdir}/*.a
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
 
 %changelog
+* Sat Jun 12 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-2
+- Patch to compile with gtk2-2.21
+
+* Tue Mar 23 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.2-1
+- Upstream bugfix release 2.1.2 
+
+* Fri Feb 12 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-15
+- Patch for implicit DSO linking
+
+* Sat Jan 30 2010 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-14
+- Exclude *.a files BZ 556054
+  License in specfile wrong BZ 559985
+
 * Sun Dec 20 2009 Roy Rankin <rrankin[AT]ihug[DOT]com[DOT]au> - 2.1.1-13
 - Fix crash issue with gtk2-2.18 BZ 546648
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gtk+extra/EL-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	5 Oct 2005 12:48:40 -0000	1.3
+++ sources	2 Jul 2010 16:34:10 -0000	1.4
@@ -1 +1 @@
-1a933ca1286829383a0554cc2deb9e04  gtk+extra-2.1.1.tar.gz
+10779394f39d39115fa3fd0f3dea4436  gtk+extra-2.1.2.tar.gz


--- gtk+extra-2.1.1-deleterow.patch DELETED ---


--- gtk+extra-2.1.1-gtk2.18.patch DELETED ---


--- gtk+extra-2.1.1-item.patch DELETED ---


--- gtk+extra-2.1.1.g_free.diff DELETED ---