[gedit-vala] - Update to 0.9.3. - Add devel subpackage. - Add BR on gtksourceview2-devel.
by Brian Pepple
commit 83aa057a5afea3d932d0ec6d5a54435c6180fc1c
Author: Brian Pepple <bpepple(a)fedoraproject.org>
Date: Tue Aug 31 17:59:26 2010 -0400
- Update to 0.9.3.
- Add devel subpackage.
- Add BR on gtksourceview2-devel.
.gitignore | 1 +
gedit-vala.spec | 41 ++++++++++++++++++++++++++++++++++++-----
sources | 2 +-
3 files changed, 38 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 813fd28..c0bc796 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vtg-0.6.1.tar.bz2
+/vtg-0.9.3.tar.bz2
diff --git a/gedit-vala.spec b/gedit-vala.spec
index 22f72cc..5ecab22 100644
--- a/gedit-vala.spec
+++ b/gedit-vala.spec
@@ -1,7 +1,7 @@
%global upstream_name vtg
Name: gedit-vala
-Version: 0.6.1
+Version: 0.9.3
Release: 1%{?dist}
Summary: Vala Toys for gEdit
@@ -11,11 +11,12 @@ URL: http://code.google.com/p/vtg/
Source0: http://vtg.googlecode.com/files/vtg-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: gedit-devel vala-devel GConf2-devel
+BuildRequires: gedit-devel GConf2-devel
+BuildRequires: vala-devel >= 0.9.5
# GConf2-devel ought to depend on dbus-devel:
# https://bugzilla.redhat.com/show_bug.cgi?id=485667
BuildRequires: dbus-devel
-BuildRequires: gtksourcecompletion-devel >= 0.7.0
+BuildRequires: gtksourceview2-devel >= 2.10.3
BuildRequires: intltool perl(XML::Parser)
BuildRequires: readline-devel
Requires: gedit vala
@@ -39,13 +40,25 @@ with four modules:
* Project Manager - based on the gnome build framework library
* Project builder / executer
+%package devel
+Summary: Development files for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: glib2-devel
+
+
+
+%description devel
+The %{name}-devel package contains libraries and header files for
+developing applications that use %{name}.
+
%prep
%setup -q -n %{upstream_name}-%{version}
%build
-%configure
+%configure --enable-static=no
# this switch is ignored right now
# --docdir=%{_docdir}/%{name}-%{version}
make %{?_smp_mflags}
@@ -54,6 +67,7 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT vtgdocdir=%{_docdir}/%{name}-%{version}
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%find_lang %{upstream_name}
@@ -61,17 +75,34 @@ make install DESTDIR=$RPM_BUILD_ROOT vtgdocdir=%{_docdir}/%{name}-%{version}
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+
+
+%postun -p /sbin/ldconfig
+
+
%files -f %{upstream_name}.lang
%defattr(-,root,root,-)
%doc %{_docdir}/%{name}-%{version}
%{_bindir}/*
-%exclude %{_libdir}/gedit-2/plugins/*.la
%{_libdir}/gedit-2/plugins/*
+%{_libdir}/libafrodite*.so.*
%{_datadir}/vtg
%{_mandir}/man1/*
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/libafrodite.so
+%{_includedir}/afrodite-1.0/
+%{_includedir}/gen-project-1.0/
+
%changelog
+* Tue Aug 31 2010 Brian Pepple <bpepple(a)fedoraproject.org> - 0.9.3-1
+- Update to 0.9.3.
+- Add devel subpackage.
+- Add BR on gtksourceview2-devel.
+
* Tue Dec 8 2009 Michel Salim <salimma(a)fedoraproject.org> - 0.6.1-1
- Update to 0.6.1
diff --git a/sources b/sources
index 21c25cc..240dde0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-066cb84ebcb5ba5508286473d6a91e28 vtg-0.6.1.tar.bz2
+c29c7f8da62a27f94e023abdb3f5de93 vtg-0.9.3.tar.bz2
11Â years, 8Â months
[gthumb/f13/master] - Update to 2.11.91 (#628892) - Drop upstreamed patch
by Christian Krause
commit 25dde25b98bcce9d4bb7ff732482df41eba814be
Author: Christian Krause <chkr(a)fedoraproject.org>
Date: Tue Aug 31 22:20:47 2010 +0200
- Update to 2.11.91 (#628892)
- Drop upstreamed patch
.gitignore | 1 +
gthumb.spec | 8 ++++++--
sources | 2 +-
3 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5afb3ed..a1c3374 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
gthumb-2.11.5.tar.bz2
gthumb-2.11.6.tar.bz2
/gthumb-2.11.90.tar.bz2
+/gthumb-2.11.91.tar.bz2
diff --git a/gthumb.spec b/gthumb.spec
index 606eebf..cc0beeb 100644
--- a/gthumb.spec
+++ b/gthumb.spec
@@ -10,8 +10,8 @@
Summary: Image viewer, editor, organizer
Name: gthumb
-Version: 2.11.90
-Release: 3%{?dist}
+Version: 2.11.91
+Release: 1%{?dist}
URL: http://gthumb.sourceforge.net
Source0: http://download.gnome.org/sources/gthumb/2.11/%{name}-%{version}.tar.bz2
@@ -139,6 +139,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
%{_libdir}/pkgconfig/gthumb-2.12.pc
%changelog
+* Tue Aug 31 2010 Christian Krause <chkr(a)fedoraproject.org> - 2.11.91-1
+- Update to 2.11.91 (#628892)
+- Drop upstreamed patch
+
* Sun Aug 22 2010 Christian Krause <chkr(a)fedoraproject.org> - 2.11.90-3
- Fix compilation against new libbrasero-burn
diff --git a/sources b/sources
index f77f435..3c0552d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f41b39eecce41df0c082847ac210b9f gthumb-2.11.90.tar.bz2
+c986a210bdc4127c97b36fa2b4f20efd gthumb-2.11.91.tar.bz2
11Â years, 8Â months
[unixODBC/f12/master] Fix isql crash at EOF with -b option.
by Tom Lane
commit 0c81379bfad8b0a087f8f70bf26dd5a39ecfa258
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Aug 31 17:45:21 2010 -0400
Fix isql crash at EOF with -b option.
isql-fixes.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
unixODBC.spec | 8 +++++-
2 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/isql-fixes.patch b/isql-fixes.patch
new file mode 100644
index 0000000..f7026c9
--- /dev/null
+++ b/isql-fixes.patch
@@ -0,0 +1,70 @@
+Back-patch assorted fixes in isql.c from 2.3.0; notably, remove duplicate
+variable declarations that caused bug #628909, and fix some potential
+64-bit portability problems.
+
+
+diff -Naur unixODBC-2.2.14.orig/exe/isql.c unixODBC-2.2.14/exe/isql.c
+--- unixODBC-2.2.14.orig/exe/isql.c 2008-06-16 07:03:43.000000000 -0400
++++ unixODBC-2.2.14/exe/isql.c 2010-08-31 14:30:26.912367399 -0400
+@@ -243,9 +243,6 @@
+ }
+ else
+ {
+- char *line;
+- int malloced;
+-
+ line = fgets( line_buffer, line_buffer_size, stdin );
+ if ( !line ) /* EOF - ctrl D */
+ {
+@@ -300,7 +297,7 @@
+ exec_now = 1;
+ len --;
+ }
+- else if ( len == 2 && memcmp( line, "go", 2 ) == 0 )
++ else if ( len == 3 && memcmp( line, "go", 2 ) == 0 )
+ {
+ exec_now = 1;
+ dont_copy = 1;
+@@ -867,7 +864,7 @@
+ }
+ }
+
+- if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, SQL_NTS ) != SQL_SUCCESS )
++ if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, strlen( szSQL )) != SQL_SUCCESS )
+ {
+ if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
+ fprintf( stderr, "[ISQL]ERROR: Could not SQLPrepare\n" );
+@@ -1364,10 +1361,10 @@
+
+ /* HDR */
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnName );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnName );
+ if (sret < 0)
+ sprintf((char *)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**");
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**");
+ strcat( (char*)szHdrLine,(char*) szColumn );
+ }
+ strcat((char*) szSepLine, "+\n" );
+@@ -1413,9 +1410,9 @@
+ if ( nReturn == SQL_SUCCESS && nIndicator != SQL_NULL_DATA )
+ {
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnValue );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnValue );
+ if (sret < 0) sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**" );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**" );
+
+ }
+ else if ( nReturn == SQL_ERROR )
+@@ -1424,7 +1421,7 @@
+ }
+ else
+ {
+- sprintf( (char*)szColumn, "| %-*s", nOptimalDisplayWidth, "" );
++ sprintf( (char*)szColumn, "| %-*s", (int)nOptimalDisplayWidth, "" );
+ }
+ fputs( (char*)szColumn, stdout );
+ } /* for columns */
diff --git a/unixODBC.spec b/unixODBC.spec
index 2601b67..bcd3c0d 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.2.14
-Release: 11%{?dist}
+Release: 12%{?dist}
Group: System Environment/Libraries
URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -21,6 +21,7 @@ Patch8: so-version-bump.patch
Patch9: keep-typedefs.patch
Patch10: odbcint64-config.patch
Patch11: enable-items.patch
+Patch12: isql-fixes.patch
Conflicts: iodbc
BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -64,6 +65,7 @@ This package contains components for the ODBCConfig
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c
@@ -189,6 +191,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%changelog
+* Tue Aug 31 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-12
+- Fix isql crash at EOF with -b option
+Resolves: #628909
+
* Mon May 3 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-11
- Re-add accidentally-removed desktop icon for ODBCConfig
Related: #587933
11Â years, 8Â months
[eclipse/f12/master] - Rebuild for latest xulrunner.
by Alexander Kurtakov
commit 927ae6fa1083bf5d1bf7e1eb8a828859b09d5bd8
Author: Alexander Kurtakov <akurtako(a)redhat.com>
Date: Wed Sep 1 00:39:51 2010 +0300
- Rebuild for latest xulrunner.
eclipse.spec | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 15353cb..278a460 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -27,7 +27,7 @@ Epoch: 1
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_majmin}.%{eclipse_micro}
-Release: 22%{?dist}
+Release: 23%{?dist}
License: EPL
Group: Text Editors/Integrated Development Environments (IDE)
URL: http://www.eclipse.org/
@@ -1109,6 +1109,9 @@ fi
#%{_libdir}/%{name}/configuration/org.eclipse.equinox.source
%changelog
+* Wed Sep 1 2010 Alexander Kurtakov <akurtako(a)redhat.com> 1:3.5.1-23
+- Rebuild for latest xulrunner.
+
* Mon Jan 4 2010 Andrew Overholt <overholt(a)redhat.com> 1:3.5.1-22
- Back-port patch for e.o#291128.
11Â years, 8Â months
[unixODBC/f13/master] Fix isql crash at EOF with -b option.
by Tom Lane
commit ce458bfb7922f5378d592e49b7f7462818a0c82c
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Aug 31 17:34:34 2010 -0400
Fix isql crash at EOF with -b option.
isql-fixes.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
unixODBC.spec | 8 +++++-
2 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/isql-fixes.patch b/isql-fixes.patch
new file mode 100644
index 0000000..f7026c9
--- /dev/null
+++ b/isql-fixes.patch
@@ -0,0 +1,70 @@
+Back-patch assorted fixes in isql.c from 2.3.0; notably, remove duplicate
+variable declarations that caused bug #628909, and fix some potential
+64-bit portability problems.
+
+
+diff -Naur unixODBC-2.2.14.orig/exe/isql.c unixODBC-2.2.14/exe/isql.c
+--- unixODBC-2.2.14.orig/exe/isql.c 2008-06-16 07:03:43.000000000 -0400
++++ unixODBC-2.2.14/exe/isql.c 2010-08-31 14:30:26.912367399 -0400
+@@ -243,9 +243,6 @@
+ }
+ else
+ {
+- char *line;
+- int malloced;
+-
+ line = fgets( line_buffer, line_buffer_size, stdin );
+ if ( !line ) /* EOF - ctrl D */
+ {
+@@ -300,7 +297,7 @@
+ exec_now = 1;
+ len --;
+ }
+- else if ( len == 2 && memcmp( line, "go", 2 ) == 0 )
++ else if ( len == 3 && memcmp( line, "go", 2 ) == 0 )
+ {
+ exec_now = 1;
+ dont_copy = 1;
+@@ -867,7 +864,7 @@
+ }
+ }
+
+- if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, SQL_NTS ) != SQL_SUCCESS )
++ if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, strlen( szSQL )) != SQL_SUCCESS )
+ {
+ if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
+ fprintf( stderr, "[ISQL]ERROR: Could not SQLPrepare\n" );
+@@ -1364,10 +1361,10 @@
+
+ /* HDR */
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnName );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnName );
+ if (sret < 0)
+ sprintf((char *)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**");
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**");
+ strcat( (char*)szHdrLine,(char*) szColumn );
+ }
+ strcat((char*) szSepLine, "+\n" );
+@@ -1413,9 +1410,9 @@
+ if ( nReturn == SQL_SUCCESS && nIndicator != SQL_NULL_DATA )
+ {
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnValue );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnValue );
+ if (sret < 0) sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**" );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**" );
+
+ }
+ else if ( nReturn == SQL_ERROR )
+@@ -1424,7 +1421,7 @@
+ }
+ else
+ {
+- sprintf( (char*)szColumn, "| %-*s", nOptimalDisplayWidth, "" );
++ sprintf( (char*)szColumn, "| %-*s", (int)nOptimalDisplayWidth, "" );
+ }
+ fputs( (char*)szColumn, stdout );
+ } /* for columns */
diff --git a/unixODBC.spec b/unixODBC.spec
index 373f9a2..12a40ee 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.2.14
-Release: 11%{?dist}
+Release: 12%{?dist}
Group: System Environment/Libraries
URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -21,6 +21,7 @@ Patch8: so-version-bump.patch
Patch9: keep-typedefs.patch
Patch10: odbcint64-config.patch
Patch11: enable-items.patch
+Patch12: isql-fixes.patch
Conflicts: iodbc
BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -64,6 +65,7 @@ This package contains components for the ODBCConfig
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c
@@ -189,6 +191,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%changelog
+* Tue Aug 31 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-12
+- Fix isql crash at EOF with -b option
+Resolves: #628909
+
* Mon May 3 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-11
- Re-add accidentally-removed desktop icon for ODBCConfig
Related: #587933
11Â years, 8Â months
[kernel/f14/master] add in patch from lmacken to support more mac models with efifb
by Kyle McMartin
commit 3c5d4de07ca16d799f1ca63454b56a03456191fe
Author: Kyle McMartin <kyle(a)dreadnought.i.jkkm.org>
Date: Tue Aug 31 17:23:33 2010 -0400
add in patch from lmacken to support more mac models with efifb
efifb-add-more-models.patch | 59 +++++++++++++++++++++++++++++++++++++++++++
kernel.spec | 10 ++++++-
2 files changed, 68 insertions(+), 1 deletions(-)
---
diff --git a/efifb-add-more-models.patch b/efifb-add-more-models.patch
new file mode 100644
index 0000000..3351970
--- /dev/null
+++ b/efifb-add-more-models.patch
@@ -0,0 +1,59 @@
+--- vanilla-2.6.35.3.orig/drivers/video/efifb.c
++++ vanilla-2.6.35.3/drivers/video/efifb.c
+@@ -39,7 +39,11 @@ enum {
+ M_I20, /* 20-Inch iMac */
+ M_I20_SR, /* 20-Inch iMac (Santa Rosa) */
+ M_I24, /* 24-Inch iMac */
++ M_I24_8_1, /* 24-Inch iMac, 8,1th gen */
++ M_I24_10_1, /* 24-Inch iMac, 10,1th gen */
+ M_MINI, /* Mac Mini */
++ M_MINI_3_1, /* Mac Mini, 3,1th gen */
++ M_MINI_4_1, /* Mac Mini, 4,1th gen */
+ M_MB, /* MacBook */
+ M_MB_2, /* MacBook, 2nd rev. */
+ M_MB_3, /* MacBook, 3rd rev. */
+@@ -47,6 +51,7 @@ enum {
+ M_MBA, /* MacBook Air */
+ M_MBP, /* MacBook Pro */
+ M_MBP_2, /* MacBook Pro 2nd gen */
++ M_MBP_2_2, /* MacBook Pro 2,2nd gen */
+ M_MBP_SR, /* MacBook Pro (Santa Rosa) */
+ M_MBP_4, /* MacBook Pro, 4th gen */
+ M_MBP_5_1, /* MacBook Pro, 5,1th gen */
+@@ -64,11 +69,16 @@ static struct efifb_dmi_info {
+ [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050 }, /* guess */
+ [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050 },
+ [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200 }, /* guess */
++ [M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200 },
++ [M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080 },
+ [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768 },
++ [M_MINI_3_1]= { "mini31", 0x40010000, 1024 * 4, 1024, 768 },
++ [M_MINI_4_1]= { "mini41", 0xc0010000, 2048 * 4, 1920, 1200 },
+ [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800 },
+ [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800 },
+ [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900 },
+ [M_MBP_2] = { "mbp2", 0, 0, 0, 0 }, /* placeholder */
++ [M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900 },
+ [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900 },
+ [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200 },
+ [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900 },
+@@ -92,7 +102,11 @@ static struct dmi_system_id __initdata d
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
++ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac8,1", M_I24_8_1),
++ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac10,1", M_I24_10_1),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
++ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini3,1", M_MINI_3_1),
++ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini4,1", M_MINI_4_1),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+ /* At least one of these two will be right; maybe both? */
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
+@@ -104,6 +118,7 @@ static struct dmi_system_id __initdata d
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
++ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+ EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+ EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
diff --git a/kernel.spec b/kernel.spec
index d5c3638..77630ec 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -48,7 +48,7 @@ Summary: The Linux kernel
# reset this by hand to 1 (or to 0 and then use rpmdev-bumpspec).
# scripts/rebase.sh should be made to do that for you, actually.
#
-%global baserelease 13
+%global baserelease 14
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -663,6 +663,8 @@ Patch1824: drm-intel-next.patch
Patch1825: drm-intel-make-lvds-work.patch
Patch1900: linux-2.6-intel-iommu-igfx.patch
+Patch2000: efifb-add-more-models.patch
+
# linux1394 git patches
Patch2200: linux-2.6-firewire-git-update.patch
Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1262,6 +1264,8 @@ ApplyOptionalPatch drm-intel-next.patch
ApplyPatch drm-intel-make-lvds-work.patch
ApplyPatch linux-2.6-intel-iommu-igfx.patch
+ApplyPatch efifb-add-more-models.patch
+
# linux1394 git patches
#ApplyPatch linux-2.6-firewire-git-update.patch
#ApplyOptionalPatch linux-2.6-firewire-git-pending.patch
@@ -1892,6 +1896,10 @@ fi
# and build.
%changelog
+* Tue Aug 31 2010 Kyle McMartin <kyle(a)redhat.com> 2.6.35.4-14
+- efifb-add-more-models.patch: Add patch from Luke Macken to
+ support more Mac models (rhbz#528232)
+
* Tue Aug 31 2010 Dave Jones <davej(a)redhat.com> 2.6.35.4-13
- Fix incorrect DMA size freeing error in via-velocity.
11Â years, 8Â months
[gnome-keyring] 2.31.91
by Matthias Clasen
commit 10af894a41ddc915bdc855806f08d13a2be6cabc
Author: Matthias Clasen <mclasen(a)redhat.com>
Date: Tue Aug 31 17:08:16 2010 -0400
2.31.91
gnome-keyring.spec | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/gnome-keyring.spec b/gnome-keyring.spec
index 2ad4d85..c732c22 100644
--- a/gnome-keyring.spec
+++ b/gnome-keyring.spec
@@ -16,16 +16,6 @@ Source: http://download.gnome.org/sources/gnome-keyring/2.31/gnome-keyring-%{ver
URL: http://www.gnome.org
-# http://bugzilla.redhat.com/529709
-# http://bugs.gnome.org/598494
-Patch3: gnome-keyring-2.28.1-nopass.patch
-
-
-# Bug 611642 - gnome-keyring isn't staying unlocked
-# https://bugzilla.redhat.com/show_bug.cgi?id=611642
-Patch4: gnome-keyring-2.31.5-ssh-agent-unlock.patch
-
-
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: gtk2-devel >= %{gtk2_version}
BuildRequires: GConf2-devel
@@ -77,8 +67,6 @@ automatically unlock the "login" keyring when the user logs in.
%prep
%setup -q -n gnome-keyring-%{version}
-%patch3 -p1 -b .no-pass
-%patch4 -p1 -b .ssh-unlock
# Enable daemon autostart in XFCE
for i in daemon/*.desktop.in.in; do
11Â years, 8Â months
[unixODBC/f14/master] Fix isql crash at EOF with -b option.
by Tom Lane
commit 11a15c2e59525b33c1f3957af470a0a5d69cbd7a
Author: Tom Lane <tgl(a)redhat.com>
Date: Tue Aug 31 17:15:39 2010 -0400
Fix isql crash at EOF with -b option.
isql-fixes.patch | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
unixODBC.spec | 8 +++++-
2 files changed, 77 insertions(+), 1 deletions(-)
---
diff --git a/isql-fixes.patch b/isql-fixes.patch
new file mode 100644
index 0000000..f7026c9
--- /dev/null
+++ b/isql-fixes.patch
@@ -0,0 +1,70 @@
+Back-patch assorted fixes in isql.c from 2.3.0; notably, remove duplicate
+variable declarations that caused bug #628909, and fix some potential
+64-bit portability problems.
+
+
+diff -Naur unixODBC-2.2.14.orig/exe/isql.c unixODBC-2.2.14/exe/isql.c
+--- unixODBC-2.2.14.orig/exe/isql.c 2008-06-16 07:03:43.000000000 -0400
++++ unixODBC-2.2.14/exe/isql.c 2010-08-31 14:30:26.912367399 -0400
+@@ -243,9 +243,6 @@
+ }
+ else
+ {
+- char *line;
+- int malloced;
+-
+ line = fgets( line_buffer, line_buffer_size, stdin );
+ if ( !line ) /* EOF - ctrl D */
+ {
+@@ -300,7 +297,7 @@
+ exec_now = 1;
+ len --;
+ }
+- else if ( len == 2 && memcmp( line, "go", 2 ) == 0 )
++ else if ( len == 3 && memcmp( line, "go", 2 ) == 0 )
+ {
+ exec_now = 1;
+ dont_copy = 1;
+@@ -867,7 +864,7 @@
+ }
+ }
+
+- if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, SQL_NTS ) != SQL_SUCCESS )
++ if ( SQLPrepare( hStmt, (SQLCHAR*)szSQL, strlen( szSQL )) != SQL_SUCCESS )
+ {
+ if ( bVerbose ) DumpODBCLog( hEnv, hDbc, hStmt );
+ fprintf( stderr, "[ISQL]ERROR: Could not SQLPrepare\n" );
+@@ -1364,10 +1361,10 @@
+
+ /* HDR */
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnName );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnName );
+ if (sret < 0)
+ sprintf((char *)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**");
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**");
+ strcat( (char*)szHdrLine,(char*) szColumn );
+ }
+ strcat((char*) szSepLine, "+\n" );
+@@ -1413,9 +1410,9 @@
+ if ( nReturn == SQL_SUCCESS && nIndicator != SQL_NULL_DATA )
+ {
+ sret = sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, szColumnValue );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, szColumnValue );
+ if (sret < 0) sprintf( (char*)szColumn, "| %-*.*s",
+- nOptimalDisplayWidth, nOptimalDisplayWidth, "**ERROR**" );
++ (int)nOptimalDisplayWidth, (int)nOptimalDisplayWidth, "**ERROR**" );
+
+ }
+ else if ( nReturn == SQL_ERROR )
+@@ -1424,7 +1421,7 @@
+ }
+ else
+ {
+- sprintf( (char*)szColumn, "| %-*s", nOptimalDisplayWidth, "" );
++ sprintf( (char*)szColumn, "| %-*s", (int)nOptimalDisplayWidth, "" );
+ }
+ fputs( (char*)szColumn, stdout );
+ } /* for columns */
diff --git a/unixODBC.spec b/unixODBC.spec
index d9d6947..112cf1b 100644
--- a/unixODBC.spec
+++ b/unixODBC.spec
@@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.2.14
-Release: 11%{?dist}
+Release: 12%{?dist}
Group: System Environment/Libraries
URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
@@ -21,6 +21,7 @@ Patch8: so-version-bump.patch
Patch9: keep-typedefs.patch
Patch10: odbcint64-config.patch
Patch11: enable-items.patch
+Patch12: isql-fixes.patch
Conflicts: iodbc
BuildRequires: libX11-devel libXt-devel libXext-devel
@@ -64,6 +65,7 @@ This package contains components for the ODBCConfig
%patch9 -p1
%patch10 -p1
%patch11 -p1
+%patch12 -p1
chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c
@@ -189,6 +191,10 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%changelog
+* Tue Aug 31 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-12
+- Fix isql crash at EOF with -b option
+Resolves: #628909
+
* Mon May 3 2010 Tom Lane <tgl(a)redhat.com> 2.2.14-11
- Re-add accidentally-removed desktop icon for ODBCConfig
Related: #587933
11Â years, 8Â months