stevej pushed to opendbx (el6). "Update to 1.4.6-5"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 3 21:16:22 UTC 2015
>From 44037213113e32b33129b7ae2108767ef6ecf4b4 Mon Sep 17 00:00:00 2001
From: stevejenkins <steve at stevejenkins.com>
Date: Fri, 3 Apr 2015 14:13:09 -0700
Subject: Update to 1.4.6-5
diff --git a/.gitignore b/.gitignore
index f2fba5e..71ab9d1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
/opendbx-1.*.tar.gz
+/opendbx-1.4.6-doxyfile-fix.patch
+/opendbx-1.4.6-freetds-fix.patch
diff --git a/opendbx.spec b/opendbx.spec
index 2c245e6..6f3c65c 100644
--- a/opendbx.spec
+++ b/opendbx.spec
@@ -1,6 +1,6 @@
Name: opendbx
Version: 1.4.6
-Release: 4%{?dist}
+Release: 5%{?dist}
Group: Development/Libraries
Summary: Lightweight but extensible database access library written in C
@@ -11,6 +11,7 @@ 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.6-freetds-fix.patch
+Patch1: opendbx-1.4.6-doxyfile-fix.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -106,6 +107,10 @@ The %{name}-utils package provides the odbx-sql tool.
%prep
%setup -q
%patch0 -p1 -b .freetds
+%patch1 -p1 -b .doxyfile
+
+# To fix Doxygen parsing issue
+ln -s api lib/%{name}/api.dox
%build
%configure --with-backends="mysql pgsql sqlite sqlite3 firebird mssql sybase" CPPFLAGS="-I%{_includedir}/mysql" --disable-test --disable-static LDFLAGS="-L%{_libdir}/mysql"
@@ -113,7 +118,6 @@ sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
make %{?_smp_mflags}
-
%install
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
@@ -170,6 +174,10 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%{_mandir}/man1/odbx-sql.1.gz
%changelog
+* Fri Apr 03 2015 Steve Jenkins <steve at stevejenkins.com> - 1.4.6-5
+- Applied patch for Doxyfile.in issue (similar to Debian bug #759951)
+- Create symlink in %prep to work around doxygen issue (Bugzilla #1208902)
+
* Thu Apr 02 2015 Steve Jenkins <steve at stevejenkins.com> - 1.4.6-4
- Added Group: info for package and sub-packages (for EL5 and EL6)
- Added ncurses-devel to BuildRequires (for EL5)
diff --git a/sources b/sources
index 2227469..1709775 100644
--- a/sources
+++ b/sources
@@ -1 +1,3 @@
3e89d7812ce4a28046bd60d5f969263d opendbx-1.4.6.tar.gz
+fd4ffccff499d3d012db5ed4e716e181 opendbx-1.4.6-doxyfile-fix.patch
+394928da706be261fcdf3d821c5cc13e opendbx-1.4.6-freetds-fix.patch
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/opendbx.git/commit/?h=el6&id=44037213113e32b33129b7ae2108767ef6ecf4b4
More information about the scm-commits
mailing list