stevej pushed to opendbx (el6). "1.4.6"

[notifications at fedoraproject.org]

>From af6d0aada33b9ee8c60e051eee31056ee53a51b3 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson at gmail.com>
Date: Sat, 3 May 2014 14:38:37 +0100
Subject: 1.4.6


diff --git a/.gitignore b/.gitignore
index c29de5d..f2fba5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/opendbx-1.4.5.tar.gz
+/opendbx-1.*.tar.gz
diff --git a/opendbx-1.4.5-freetds-fix.patch b/opendbx-1.4.5-freetds-fix.patch
deleted file mode 100644
index 5e17461..0000000
--- a/opendbx-1.4.5-freetds-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- backends/mssql/mssql_basic.c.orig	2012-01-18 13:15:51.147655411 +0100
-+++ backends/mssql/mssql_basic.c	2012-01-18 13:16:23.450426435 +0100
-@@ -474,13 +474,8 @@
- 			case SYBDATETIMN:
- 				if( dbdatecrack( dbproc, &di, (DBDATETIME*) data ) != FAIL )
- 				{
--#ifdef HAVE_LIBSYBDB_MSLIB
- 					gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
- 						(long) di.year, (long) di.month+1, (long) di.day, (long) di.hour, (long) di.minute, (long) di.second );
--#else
--					gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
--						(long) di.dateyear, (long) di.datemonth+1, (long) di.datedmonth, (long) di.datehour, (long) di.dateminute, (long) di.datesecond );
--#endif
- 				}
- 				continue;
- 		}
diff --git a/opendbx-1.4.6-freetds-fix.patch b/opendbx-1.4.6-freetds-fix.patch
new file mode 100644
index 0000000..d06de37
--- /dev/null
+++ b/opendbx-1.4.6-freetds-fix.patch
@@ -0,0 +1,16 @@
+--- opendbx-1.4.6/backends/mssql/mssql_basic.c.orig	2012-05-06 15:59:01.000000000 +0100
++++ opendbx-1.4.6/backends/mssql/mssql_basic.c	2014-05-03 14:36:42.450491218 +0100
+@@ -479,13 +479,8 @@
+ 			case SYBDATETIMN:
+ 				if( dbdatecrack( dbproc, &di, (DBDATETIME*) data ) != FAIL )
+ 				{
+-#ifdef HAVE_LIBSYBDB_MSLIB
+ 					gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
+ 						(long) di.year, (long) di.month+1, (long) di.day, (long) di.hour, (long) di.minute, (long) di.second );
+-#else
+-					gres[i].length = snprintf( (char*) gres[i].value, gres[i].mlen, "%.4ld-%.2ld-%.2ld %.2ld:%.2ld:%.2ld",
+-						(long) di.dateyear, (long) di.datemonth+1, (long) di.datedmonth, (long) di.datehour, (long) di.dateminute, (long) di.datesecond );
+-#endif
+ 				}
+ 				continue;
+ 		}
diff --git a/opendbx.spec b/opendbx.spec
index 42d9354..9de8808 100644
--- a/opendbx.spec
+++ b/opendbx.spec
@@ -1,6 +1,6 @@
 Name:           opendbx
-Version:        1.4.5
-Release:        11%{?dist}
+Version:        1.4.6
+Release:        1%{?dist}
 Summary:        Lightweight but extensible database access library written in C
 
 #License:        LGPLv2+
@@ -9,7 +9,7 @@ Summary:        Lightweight but extensible database access library written in C
 License:        GPLv2+
 URL:            http://www.linuxnetworks.de/doc/index.php/OpenDBX
 Source0:        http://linuxnetworks.de/opendbx/download/%{name}-%{version}.tar.gz
-Patch0:		opendbx-1.4.5-freetds-fix.patch
+Patch0:		opendbx-1.4.6-freetds-fix.patch
 
 BuildRequires:  mysql-devel, postgresql-devel, sqlite2-devel, sqlite-devel, firebird-devel, readline-devel
 BuildRequires:  freetds-devel
@@ -95,7 +95,7 @@ The %{name}-utils package provides the odbx-sql tool.
 
 %prep
 %setup -q
-%patch0 -p0
+%patch0 -p1 -b .freetds
 
 %build
 %configure --with-backends="mysql pgsql sqlite sqlite3 firebird mssql sybase" CPPFLAGS="-I%{_includedir}/mysql" --disable-test --disable-static LDFLAGS="-L%{_libdir}/mysql"
@@ -160,6 +160,9 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %{_mandir}/man1/odbx-sql.1.gz
 
 %changelog
+* Sat May  3 2014 Peter Robinson <pbrobinson at fedoraproject.org> 1.4.6-1
+- Update to 1.4.6
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
@@ -178,7 +181,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
-
 * Wed Oct 19 2011 Martin Preisler <mpreisle at redhat.com> 1.4.5-5
 - also filter requires for the backend packages
 
@@ -196,4 +198,3 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 * Mon Sep 19 2011 Martin Preisler <mpreisle at redhat.com> 1.4.5-1
 - initial package
-
diff --git a/sources b/sources
index 55b4587..2227469 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8347e9583d83c5186dea14f992c19dec  opendbx-1.4.5.tar.gz
+3e89d7812ce4a28046bd60d5f969263d  opendbx-1.4.6.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/opendbx.git/commit/?h=el6&id=af6d0aada33b9ee8c60e051eee31056ee53a51b3