Update to version 2.3.1

This commit is contained in:
Tom Lane 2012-01-10 14:26:52 -05:00
parent 438d640551
commit 0c3e54b7f5
13 changed files with 144 additions and 2157 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
unixODBC-2.2.14.tar.gz
/unixODBC-2.3.1.tar.gz

33
README.fedora Normal file
View File

@ -0,0 +1,33 @@
About unixODBC in Fedora
------------------------
In addition to the unixODBC package itself, you will want to install some
or all of these related packages:
mysql-connector-odbc MySQL driver, needed to connect to MySQL databases
postgresql-odbc PostgreSQL driver, needed to connect to PostgreSQL
unixODBC-gui-qt Optional configuration management and test programs
The recommended driver definition for MySQL is:
[MySQL]
Description = ODBC for MySQL
Driver = /usr/lib/libmyodbc5.so
Setup = /usr/lib/libodbcmyS.so
Driver64 = /usr/lib64/libmyodbc5.so
Setup64 = /usr/lib64/libodbcmyS.so
FileUsage = 1
You can adjust the name (in square brackets) and the description, but
the other items should usually be used verbatim.
The recommended driver definition for PostgreSQL is:
[PostgreSQL]
Description = ODBC for PostgreSQL
Driver = /usr/lib/psqlodbcw.so
Setup = /usr/lib/libodbcpsqlS.so
Driver64 = /usr/lib64/psqlodbcw.so
Setup64 = /usr/lib64/libodbcpsqlS.so
FileUsage = 1

View File

@ -12,6 +12,8 @@
*/
#if defined(__x86_64__)
#include "CONFFILE_x86_64.h"
#elif defined(__ia64__)
#include "CONFFILE_ia64.h"
#elif defined(__i386__)
#include "CONFFILE_i386.h"
#elif defined(__ppc64__) || defined(__powerpc64__)

View File

@ -1,52 +0,0 @@
Allow drivers to be selected in ODBCConfig, per bug 544852.
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDataSourceNameList.cpp 2008-09-04 10:55:54.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDataSourceNameList.cpp 2009-12-19 18:31:39.000000000 -0500
@@ -346,15 +346,15 @@
setRowCount( nElement + 1 );
ptablewidgetitem = new QTableWidgetItem( szSectionName );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 0, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDescription );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 1, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDriver );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nElement, 2, ptablewidgetitem );
}
SQLSetConfigMode( ODBC_BOTH_DSN );
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp
--- unixODBC-2.2.14.orig/odbcinstQ4/CDriverList.cpp 2008-09-04 11:57:53.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ4/CDriverList.cpp 2009-12-19 18:31:29.000000000 -0500
@@ -852,19 +852,19 @@
setRowCount( nRow + 1 );
ptablewidgetitem = new QTableWidgetItem( szDriverName );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 0, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDescription );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 1, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szDriver );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 2, ptablewidgetitem );
ptablewidgetitem = new QTableWidgetItem( szSetup );
- ptablewidgetitem->setFlags( Qt::ItemIsSelectable );
+ ptablewidgetitem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
setItem( nRow, 3, ptablewidgetitem );
nRow++;

View File

@ -1,70 +0,0 @@
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 */

View File

@ -1,55 +0,0 @@
unixODBC doesn't actually succeed if you try to build with the system libltdl.
Take out code that expects libltdl to exist locally.
diff -Naur unixODBC-2.2.14.orig/Makefile.am unixODBC-2.2.14/Makefile.am
--- unixODBC-2.2.14.orig/Makefile.am 2008-09-02 08:29:31.000000000 -0400
+++ unixODBC-2.2.14/Makefile.am 2009-02-15 22:27:55.000000000 -0500
@@ -3,7 +3,6 @@
log \
lst \
ini \
- libltdl \
odbcinst \
DriverManager \
odbcinstQ \
diff -Naur unixODBC-2.2.14.orig/configure.in unixODBC-2.2.14/configure.in
--- unixODBC-2.2.14.orig/configure.in 2008-11-19 11:08:40.000000000 -0500
+++ unixODBC-2.2.14/configure.in 2009-02-16 00:45:22.000000000 -0500
@@ -165,27 +165,12 @@
INCLTDL=""
LIBLTDL=""
-AC_MSG_CHECKING( Have we enabled using RTLD_GROUP )
-if test "x$rtldgroup" = "xtrue"; then
-AC_MSG_RESULT( yes )
-AC_LIBLTDL_CONVENIENCE
-else
-AC_MSG_RESULT( no );
-AC_LIBLTDL_CONVENIENCE_G
-fi
-
dnl Check for dlopen support
AC_LIBTOOL_DLOPEN
-dnl for cygwin support
-AC_LIBTOOL_WIN32_DLL
-
dnl Configure libtool
AM_PROG_LIBTOOL
-dnl Configure libltdl
-AC_CONFIG_SUBDIRS(libltdl)
-
use_builtin_libtool="no"
dnl override the libtool lines if we use the system libs
@@ -517,7 +502,7 @@
AM_CONDITIONAL(DRIVERS, test "x$drivers" = "xtrue" )
AM_CONDITIONAL(FDB, test "x$fdb" = "xtrue" )
AM_CONDITIONAL(QNX, test "x$qnx" = "xtrue" )
-AM_CONDITIONAL(WITHLT, test "x$use_builtin_libtool" = "xyes" )
+AM_CONDITIONAL(WITHLT, test "x$use_builtin_libtool" = "xno" )
AM_CONDITIONAL(ODBCTRACE, test "x$odbctrace" = "xtrue" )
dnl This blows up due to what I think is a bug in automake 1.6.3

View File

@ -1,50 +0,0 @@
unixODBC's configure tends to pick the wrong libraries on a multilib
machine. Force it to use the location reported by /etc/profile.d/qt.sh
which we invoke in the specfile (yeah, a crude hack...)
diff -Naur unixODBC-2.2.14.orig/qt.m4 unixODBC-2.2.14/qt.m4
--- unixODBC-2.2.14.orig/qt.m4 2008-06-30 11:13:44.000000000 -0400
+++ unixODBC-2.2.14/qt.m4 2008-11-25 12:01:47.000000000 -0500
@@ -230,40 +230,7 @@
# Ensure we have the lib dir...
if test "x$qt_libraries" = "x" ; then
- # see if it is relative to the includes
- qt_tree="$qt_includes"
-
- #
- # the cygwin dirhame only strips up to the first /
- #
-
- case $host_os in
- cygwin*) empty_dir="x/" ;;
- *) empty_dir="x" ;;
- esac
-
- while test "x$qt_tree" != $empty_dir ; do
- # first go around will fail...
- if expr "$QTVERSION" '>=' "040000" > /dev/null ; then
- if ls $qt_tree/lib/libQt* > /dev/null 2> /dev/null ; then
- qt_libraries=$qt_tree/lib
- break
- else
- # lop off tail of path
- dnl not as portable as it should be...
- qt_tree="`dirname $qt_tree`"
- fi
- else
- if ls $qt_tree/lib/libqt* > /dev/null 2> /dev/null ; then
- qt_libraries=$qt_tree/lib
- break
- else
- # lop off tail of path
- dnl not as portable as it should be...
- qt_tree="`dirname $qt_tree`"
- fi
- fi
- done
+ qt_libraries="$QTLIB"
fi
# Use QTVERSION and gotthread to set libs we need...

View File

@ -4,9 +4,9 @@
# Setup from the unixODBC package
[PostgreSQL]
Description = ODBC for PostgreSQL
Driver = /usr/lib/psqlodbc.so
Driver = /usr/lib/psqlodbcw.so
Setup = /usr/lib/libodbcpsqlS.so
Driver64 = /usr/lib64/psqlodbc.so
Driver64 = /usr/lib64/psqlodbcw.so
Setup64 = /usr/lib64/libodbcpsqlS.so
FileUsage = 1

View File

@ -1,26 +0,0 @@
Fix output of odbc_config --header, per bug #518623.
This error results in SQLBIGINT and SQLUBIGINT being misdefined as
int, where they need to be [unsigned] long or long long.
diff -Naur unixODBC-2.2.14.orig/exe/odbc-config.c unixODBC-2.2.14/exe/odbc-config.c
--- unixODBC-2.2.14.orig/exe/odbc-config.c 2008-05-20 08:58:17.000000000 -0400
+++ unixODBC-2.2.14/exe/odbc-config.c 2009-08-21 14:15:35.000000000 -0400
@@ -66,12 +66,15 @@
printf( "#ifndef HAVE_LONG_LONG\n #define HAVE_LONG_LONG\n#endif\n" );
#endif
+#define xstr(s) str(s)
+#define str(s) #s
+
#ifdef ODBCINT64
- printf( "#ifndef ODBCINT64\n #define ODBCINT64\n#endif\n" );
+ printf( "#ifndef ODBCINT64\n #define ODBCINT64 %s\n#endif\n", xstr(ODBCINT64) );
#endif
#ifdef UODBCINT64
- printf( "#ifndef UODBCINT64\n #define UODBCINT64\n#endif\n" );
+ printf( "#ifndef UODBCINT64\n #define UODBCINT64 %s\n#endif\n", xstr(UODBCINT64) );
#endif
#ifdef DISABLE_INI_CACHING

View File

@ -2,21 +2,9 @@ Set the major .so version to 2 for all unixODBC shared libraries, to reflect
the incompatible ABI changes in 2.2.14.
diff -Naur unixODBC-2.2.14.orig/configure.in unixODBC-2.2.14/configure.in
--- unixODBC-2.2.14.orig/configure.in 2008-11-19 11:08:40.000000000 -0500
+++ unixODBC-2.2.14/configure.in 2009-02-16 11:56:53.000000000 -0500
@@ -546,7 +546,7 @@
dnl This is the unixODBC source tree
AC_DEFINE(UNIXODBC_SOURCE)
-LIB_VERSION="1:0:0"
+LIB_VERSION="2:0:0"
AC_SUBST(LIB_VERSION)
AC_OUTPUT( Makefile \
diff -Naur unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.2.14/DRVConfig/Mimer/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am 2008-06-17 06:14:07.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/Mimer/Makefile.am 2009-02-16 11:59:31.000000000 -0500
diff -Naur unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/Mimer/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/Mimer/Makefile.am 2011-12-02 14:01:00.153970964 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -24,11 +12,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/Mimer/Makefile.am unixODBC-2.2.14/DRVC
-libmimerS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libmimerS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.2.14/DRVConfig/MiniSQL/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am 2008-06-17 06:14:17.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/MiniSQL/Makefile.am 2009-02-16 11:59:27.000000000 -0500
libmimerS_la_SOURCES = mimerS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/MiniSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/MiniSQL/Makefile.am 2011-12-02 14:00:40.257679498 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -36,11 +24,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/MiniSQL/Makefile.am unixODBC-2.2.14/DR
-libodbcminiS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcminiS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.2.14/DRVConfig/MySQL/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am 2008-06-17 06:14:23.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/MySQL/Makefile.am 2009-02-16 11:59:50.000000000 -0500
libodbcminiS_la_SOURCES = odbcminiS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/MySQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/MySQL/Makefile.am 2011-12-02 14:00:46.656773720 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -48,11 +36,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/MySQL/Makefile.am unixODBC-2.2.14/DRVC
-libodbcmyS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcmyS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.2.14/DRVConfig/Oracle/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am 2008-06-17 06:14:29.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/Oracle/Makefile.am 2009-02-16 11:59:07.000000000 -0500
libodbcmyS_la_SOURCES = odbcmyS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/Oracle/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/Oracle/Makefile.am 2011-12-02 14:00:49.946821471 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -60,11 +48,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/Oracle/Makefile.am unixODBC-2.2.14/DRV
-liboraodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+liboraodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.2.14/DRVConfig/PostgreSQL/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am 2008-06-17 06:14:35.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/PostgreSQL/Makefile.am 2009-02-16 11:59:01.000000000 -0500
liboraodbcS_la_SOURCES = oraodbcS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/PostgreSQL/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/PostgreSQL/Makefile.am 2011-12-02 14:00:29.193516374 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -72,11 +60,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/PostgreSQL/Makefile.am unixODBC-2.2.14
-libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcpsqlS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.2.14/DRVConfig/drvcfg1/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am 2008-06-17 06:14:40.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/drvcfg1/Makefile.am 2009-02-16 12:00:00.000000000 -0500
libodbcpsqlS_la_SOURCES = odbcpsqlS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/drvcfg1/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/drvcfg1/Makefile.am 2011-12-02 14:00:53.361871162 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -84,11 +72,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg1/Makefile.am unixODBC-2.2.14/DR
-libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcdrvcfg1S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.2.14/DRVConfig/drvcfg2/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am 2008-06-17 06:14:45.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/drvcfg2/Makefile.am 2009-02-16 11:58:39.000000000 -0500
libodbcdrvcfg1S_la_SOURCES = drvcfg1.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/drvcfg2/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/drvcfg2/Makefile.am 2011-12-02 14:00:25.249459261 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -96,11 +84,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/drvcfg2/Makefile.am unixODBC-2.2.14/DR
-libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcdrvcfg2S_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am unixODBC-2.2.14/DRVConfig/esoob/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am 2008-06-17 06:14:50.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/esoob/Makefile.am 2009-02-16 11:59:41.000000000 -0500
libodbcdrvcfg2S_la_SOURCES = drvcfg2.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am unixODBC-2.3.1/DRVConfig/esoob/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/esoob/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/esoob/Makefile.am 2011-12-02 14:00:36.802629045 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -108,11 +96,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/esoob/Makefile.am unixODBC-2.2.14/DRVC
-libesoobS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libesoobS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am unixODBC-2.2.14/DRVConfig/nn/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am 2008-06-17 06:14:56.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/nn/Makefile.am 2009-02-16 11:59:18.000000000 -0500
libesoobS_la_SOURCES = esoobS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am unixODBC-2.3.1/DRVConfig/nn/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/nn/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/nn/Makefile.am 2011-12-02 14:00:16.113323779 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -120,11 +108,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/nn/Makefile.am unixODBC-2.2.14/DRVConf
-libodbcnnS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbcnnS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.2.14/DRVConfig/oplodbc/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am 2008-06-17 06:15:01.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/oplodbc/Makefile.am 2009-02-16 11:58:56.000000000 -0500
libodbcnnS_la_SOURCES = drvcfg.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/oplodbc/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/oplodbc/Makefile.am 2011-12-02 14:00:20.992397039 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -132,11 +120,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/oplodbc/Makefile.am unixODBC-2.2.14/DR
-liboplodbcS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+liboplodbcS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.2.14/DRVConfig/sapdb/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am 2008-06-17 06:15:07.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/sapdb/Makefile.am 2009-02-16 11:59:12.000000000 -0500
liboplodbcS_la_SOURCES = oplodbc.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/sapdb/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/sapdb/Makefile.am 2011-12-02 14:00:43.360724987 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -144,11 +132,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/sapdb/Makefile.am unixODBC-2.2.14/DRVC
-libsapdbS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libsapdbS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
libsapdbS_la_SOURCES = sapdb.c
diff -Naur unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am unixODBC-2.2.14/DRVConfig/tds/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am 2008-06-17 06:15:20.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/tds/Makefile.am 2009-02-16 11:59:36.000000000 -0500
diff -Naur unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am unixODBC-2.3.1/DRVConfig/tds/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/tds/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/tds/Makefile.am 2011-12-02 14:00:56.753921152 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -156,11 +144,11 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/tds/Makefile.am unixODBC-2.2.14/DRVCon
-libtdsS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libtdsS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am unixODBC-2.2.14/DRVConfig/txt/Makefile.am
--- unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am 2008-06-17 06:15:31.000000000 -0400
+++ unixODBC-2.2.14/DRVConfig/txt/Makefile.am 2009-02-16 11:59:55.000000000 -0500
libtdsS_la_SOURCES = tdsS.c
diff -Naur unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am unixODBC-2.3.1/DRVConfig/txt/Makefile.am
--- unixODBC-2.3.1.orig/DRVConfig/txt/Makefile.am 2009-12-11 11:54:07.000000000 -0500
+++ unixODBC-2.3.1/DRVConfig/txt/Makefile.am 2011-12-02 14:00:32.929572613 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
@ -168,12 +156,12 @@ diff -Naur unixODBC-2.2.14.orig/DRVConfig/txt/Makefile.am unixODBC-2.2.14/DRVCon
-libodbctxtS_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libodbctxtS_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
diff -Naur unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.2.14/Drivers/MiniSQL/Makefile.am
--- unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am 2008-06-17 06:16:11.000000000 -0400
+++ unixODBC-2.2.14/Drivers/MiniSQL/Makefile.am 2009-02-16 12:00:22.000000000 -0500
@@ -196,6 +196,6 @@
libodbctxtS_la_SOURCES = drvcfg.c
diff -Naur unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am
--- unixODBC-2.3.1.orig/Drivers/MiniSQL/Makefile.am 2009-12-11 11:54:09.000000000 -0500
+++ unixODBC-2.3.1/Drivers/MiniSQL/Makefile.am 2011-12-02 14:01:30.797419661 -0500
@@ -193,6 +193,6 @@
sqlFreeEnv.c \
sqlFreeStmt.c
@ -181,11 +169,11 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/MiniSQL/Makefile.am unixODBC-2.2.14/Driv
+libodbcmini_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) \
-L@msql_libraries@ -lmsql -module
diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.2.14/Drivers/Postgre7.1/Makefile.am
--- unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am 2008-06-17 12:09:03.000000000 -0400
+++ unixODBC-2.2.14/Drivers/Postgre7.1/Makefile.am 2009-02-16 12:02:30.000000000 -0500
diff -Naur unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am
--- unixODBC-2.3.1.orig/Drivers/Postgre7.1/Makefile.am 2009-12-11 11:54:08.000000000 -0500
+++ unixODBC-2.3.1/Drivers/Postgre7.1/Makefile.am 2011-12-02 14:01:24.860333250 -0500
@@ -3,7 +3,7 @@
INCLUDES = -I@top_srcdir@/include
INCLUDES = -I@top_srcdir@/include $(LTDLINCL)
libodbcpsql_la_LDFLAGS = \
- -version-info 2:0:0 \
@ -193,21 +181,9 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/Postgre7.1/Makefile.am unixODBC-2.2.14/D
-no-undefined \
$(LIBSOCKET) $(LIBNSL) \
-export-dynamic \
diff -Naur unixODBC-2.2.14.orig/Drivers/PostgreSQL/Makefile.am unixODBC-2.2.14/Drivers/PostgreSQL/Makefile.am
--- unixODBC-2.2.14.orig/Drivers/PostgreSQL/Makefile.am 2008-06-17 06:16:48.000000000 -0400
+++ unixODBC-2.2.14/Drivers/PostgreSQL/Makefile.am 2009-02-16 12:00:05.000000000 -0500
@@ -4,7 +4,7 @@
libodbcpsql_la_LDFLAGS = \
-no-undefined \
- -version-info 1:0:0 \
+ -version-info $(LIB_VERSION) \
$(LIBSOCKET) $(LIBNSL) \
-module
diff -Naur unixODBC-2.2.14.orig/Drivers/nn/Makefile.am unixODBC-2.2.14/Drivers/nn/Makefile.am
--- unixODBC-2.2.14.orig/Drivers/nn/Makefile.am 2008-06-17 06:16:54.000000000 -0400
+++ unixODBC-2.2.14/Drivers/nn/Makefile.am 2009-02-16 12:00:16.000000000 -0500
diff -Naur unixODBC-2.3.1.orig/Drivers/nn/Makefile.am unixODBC-2.3.1/Drivers/nn/Makefile.am
--- unixODBC-2.3.1.orig/Drivers/nn/Makefile.am 2009-12-11 11:54:09.000000000 -0500
+++ unixODBC-2.3.1/Drivers/nn/Makefile.am 2011-12-02 14:01:07.828083493 -0500
@@ -2,7 +2,7 @@
INCLUDES = -I@top_srcdir@/include -I.
@ -215,39 +191,17 @@ diff -Naur unixODBC-2.2.14.orig/Drivers/nn/Makefile.am unixODBC-2.2.14/Drivers/n
-libnn_la_LDFLAGS = -no-undefined -version-info 1:0:0 -module
+libnn_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION) -module
DEFS = -DUNIXODBC @DEFS@
EXTRA_DIST = \
nnconfig.h \
diff -Naur unixODBC-2.3.1.orig/Drivers/template/Makefile.am unixODBC-2.3.1/Drivers/template/Makefile.am
--- unixODBC-2.3.1.orig/Drivers/template/Makefile.am 2009-12-11 11:54:09.000000000 -0500
+++ unixODBC-2.3.1/Drivers/template/Makefile.am 2011-12-02 14:01:12.828156445 -0500
@@ -2,7 +2,7 @@
diff -Naur unixODBC-2.2.14.orig/Drivers/template/Makefile.am unixODBC-2.2.14/Drivers/template/Makefile.am
--- unixODBC-2.2.14.orig/Drivers/template/Makefile.am 2008-06-17 06:17:03.000000000 -0400
+++ unixODBC-2.2.14/Drivers/template/Makefile.am 2009-02-16 12:00:11.000000000 -0500
@@ -4,7 +4,7 @@
DEFS = -DUNIXODBC @DEFS@
INCLUDES = -I@top_srcdir@/include -I. $(LTDLINCL)
-libtemplate_la_LDFLAGS = -no-undefined -version-info 1:0:0
+libtemplate_la_LDFLAGS = -no-undefined -version-info $(LIB_VERSION)
EXTRA_DIST = \
driver.h \
diff -Naur unixODBC-2.2.14.orig/odbcinstQ/Makefile.am unixODBC-2.2.14/odbcinstQ/Makefile.am
--- unixODBC-2.2.14.orig/odbcinstQ/Makefile.am 2008-06-30 09:21:04.000000000 -0400
+++ unixODBC-2.2.14/odbcinstQ/Makefile.am 2009-02-16 12:00:29.000000000 -0500
@@ -1,6 +1,6 @@
libodbcinstQ_la_LDFLAGS = \
-no-undefined \
- -version-info 1:0:0 \
+ -version-info $(LIB_VERSION) \
-export-dynamic \
-export-symbols @srcdir@/odbcinstQ.exp \
-module
diff -Naur unixODBC-2.2.14.orig/odbcinstQ4/Makefile.am unixODBC-2.2.14/odbcinstQ4/Makefile.am
--- unixODBC-2.2.14.orig/odbcinstQ4/Makefile.am 2008-11-18 08:32:58.000000000 -0500
+++ unixODBC-2.2.14/odbcinstQ4/Makefile.am 2009-02-16 12:00:36.000000000 -0500
@@ -1,6 +1,6 @@
libodbcinstQ4_la_LDFLAGS = \
-no-undefined \
- -version-info 1:0:0 \
+ -version-info $(LIB_VERSION) \
-export-dynamic \
-export-symbols @srcdir@/odbcinstQ4.exp \
-module

View File

@ -1 +1 @@
f47c2efb28618ecf5f33319140a7acd0 unixODBC-2.2.14.tar.gz
86788d4006620fa1f171c13d07fdcaab unixODBC-2.3.1.tar.gz

View File

@ -1,7 +1,7 @@
Summary: A complete ODBC driver manager for Linux
Name: unixODBC
Version: 2.2.14
Release: 13%{?dist}
Version: 2.3.1
Release: 1%{?dist}
Group: System Environment/Libraries
URL: http://www.unixODBC.org/
# Programs are GPL, libraries are LGPL, except News Server library is GPL.
@ -9,25 +9,19 @@ License: GPLv2+ and LGPLv2+
Source: http://www.unixODBC.org/%{name}-%{version}.tar.gz
Source1: odbcinst.ini
Source2: ODBCConfig.desktop
Source4: conffile.h
Source5: README.fedora
Patch1: depcomp.patch
Patch2: multilib-config.patch
Patch3: warning-cleanup.patch
Patch6: export-symbols.patch
Patch7: libtool-config.patch
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
BuildRequires: qt4-devel qt-assistant-adp-devel readline-devel
BuildRequires: automake autoconf libtool libtool-ltdl-devel bison flex
BuildRequires: desktop-file-utils
BuildRequires: readline-devel
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
%description
@ -38,34 +32,19 @@ a MySQL database, and/or the postgresql-odbc package for PostgreSQL.
%package devel
Summary: Development files for programs which will use the unixODBC library
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The unixODBC package can be used to access databases through ODBC
drivers. If you want to develop programs that will access data through
ODBC, you need to install this package.
%package kde
Summary: KDE driver manager components for ODBC
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release}
%description kde
This package contains components for the ODBCConfig
(KDE) component of unixODBC.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -p1
%patch10 -p1
%patch11 -p1
%patch12 -p1
chmod 0644 Drivers/MiniSQL/*.c
chmod 0644 Drivers/nn/*.c
@ -81,10 +60,6 @@ rm -rf config.guess config.sub install-sh ltmain.sh libltdl
libtoolize --install || libtoolize
%build
# pick up qt path
export PATH="%{_qt4_bindir}:$PATH"
# clean up old moc files
(cd odbcinstQ4 && rm -f mC*.cpp)
aclocal
automake --add-missing
@ -95,30 +70,20 @@ CFLAGS="%{optflags} -fno-strict-aliasing"
CXXFLAGS="$CFLAGS"
export CFLAGS CXXFLAGS
%configure --with-gnu-ld=yes --enable-threads=yes --enable-gui=yes --enable-drivers --enable-ltdllib --with-qt-programs="%{_qt4_bindir}" --with-qt-libraries="%{_qt4_libdir}"
%configure --with-gnu-ld=yes --enable-threads=yes \
--enable-drivers=yes --enable-driverc=yes --enable-ltdllib
make all
%install
# pick up qt path
export PATH="%{_qt4_bindir}:$PATH"
rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
make DESTDIR=$RPM_BUILD_ROOT install
install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}
# install *.desktop files
desktop-file-install --dir=$RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
# package doesn't supply an icon for ODBCConfig, so use the one for DataManager
cp DataManager/LinuxODBC.xpm $RPM_BUILD_ROOT%{_datadir}/pixmaps
# multilib header hacks
# we only apply this to known Red Hat multilib arches, per bug #181335
case `uname -i` in
i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
i386 | x86_64 | ia64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
mv $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf.h $RPM_BUILD_ROOT%{_includedir}/unixodbc_conf_`uname -i`.h
rm -f unixodbc_conf.h
sed s/CONFFILE/unixodbc_conf/ %{SOURCE4} >unixodbc_conf.h
@ -128,6 +93,9 @@ case `uname -i` in
;;
esac
# add some explanatory documentation
cp %{SOURCE5} README.fedora
# remove obsolete Postgres drivers from the package (but not the setup code)
rm -f $RPM_BUILD_ROOT%{_libdir}/libodbcpsql.so*
@ -147,9 +115,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/libltdl.*
rm -rf $RPM_BUILD_ROOT%{_datadir}/libtool
# initialize lists of .so files; note that libodbcinstQ* go into kde subpkg
find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > base-so-list
find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" | grep -v /libodbcinstQ > devel-so-list
# initialize lists of .so files
find $RPM_BUILD_ROOT%{_libdir} -name "*.so.*" | sed "s|^$RPM_BUILD_ROOT||" > base-so-list
find $RPM_BUILD_ROOT%{_libdir} -name "*.so" | sed "s|^$RPM_BUILD_ROOT||" > devel-so-list
# move these to main package, they're often dlopened...
for lib in libodbc.so libodbcinst.so libodbcpsqlS.so libodbcmyS.so
@ -165,6 +133,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f base-so-list
%defattr(-,root,root)
%doc README COPYING AUTHORS ChangeLog NEWS doc
%doc README.fedora
%config(noreplace) %{_sysconfdir}/odbc*
%{_bindir}/odbcinst
%{_bindir}/isql
@ -176,21 +145,16 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%{_includedir}/*
%files kde
%defattr(-,root,root)
%{_bindir}/ODBCConfig
%{_datadir}/applications/ODBCConfig.desktop
%{_datadir}/pixmaps/LinuxODBC.xpm
%{_libdir}/libodbcinstQ*so
%{_libdir}/libodbcinstQ*so.*
%post kde -p /sbin/ldconfig
%postun kde -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%changelog
* Tue Jan 10 2012 Tom Lane <tgl@redhat.com> 2.3.1-1
- Update to version 2.3.1. The main externally-visible change is that the
GUI programs are not part of the unixODBC tarball anymore, so they are no
longer in this package, and the unixODBC-kde sub-RPM has disappeared.
There is a separate package unixODBC-gui-qt that now provides those programs.
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.14-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

File diff suppressed because it is too large Load Diff