diff --git a/.gitignore b/.gitignore index c585387..cd5c4cb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /wxsqlite3.spec /wxsqlite3-3.0.2.tar.gz +/wxsqlite3-3.0.3.tar.gz diff --git a/clog b/clog index 91adda8..0b62be8 100644 --- a/clog +++ b/clog @@ -1,3 +1,4 @@ -update to 3.0.2 +update to 3.0.3 - rebuild for new release +- update wxsqlite3-3.0.1.pc.in to wxsqlite3-3.0.3.pc.in due lib name change diff --git a/sources b/sources index 213a5bf..803bdc2 100644 --- a/sources +++ b/sources @@ -1,2 +1,6 @@ +<<<<<<< HEAD 30dc3611ef2df375938a3cae26eb658e wxsqlite3-3.0.2.tar.gz 2209caba8fc40ecda08143ab66bef0e7 wxsqlite3.spec +======= +39e9a12dc7fdcd7241004af26287d3cf wxsqlite3-3.0.3.tar.gz +>>>>>>> master diff --git a/wxsqlite3-3.0.3.pc.in b/wxsqlite3-3.0.3.pc.in new file mode 100644 index 0000000..112fa14 --- /dev/null +++ b/wxsqlite3-3.0.3.pc.in @@ -0,0 +1,14 @@ +# Package Information for pkg-config + +prefix=/usr +wxver=@WXVERSION@ +includedir=${prefix}/include/wx-${wxver}/ +libdir=${prefix}/@LIBDIR@ + +Name: wxsqlite3-@WXVERSION@ +Description: SQLite3 C++ wrapper for use in programs based on the wxWidgets +Version: @VERSION@ +#Requires: sqlite3 +Libs: -L${libdir} -lwxcode_gtk2_wxsqlite3-@WXVERSION@ +Libs.private: -lpthread +Cflags: -I${includedir} diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 3c187e2..2a7c6fc 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -2,7 +2,7 @@ %global wxincdir %{_includedir}/wx-%{wxversion} Name: wxsqlite3 -Version: 3.0.2 +Version: 3.0.3 Release: 1%{?dist} Summary: C++ wrapper around the SQLite 3.x database @@ -10,8 +10,8 @@ Group: System Environment/Libraries License: wxWidgets URL: http://wxcode.sourceforge.net/components/wxsqlite3/ Source0: http://downloads.sourceforge.net/wxcode/%{name}-%{version}.tar.gz -# https://sourceforge.net/p/wxcode/bugs/_discuss/thread/e8dd9e84/340f/attachment/wxsqlite3-3.0.1.pc.in -Source1: %{name}-3.0.1.pc.in +# https://sourceforge.net/p/wxcode/bugs/_discuss/thread/d8bda5df/e523/attachment/wxsqlite3-3.0.3.pc.in +Source1: %{name}-3.0.3.pc.in # don't %%build the included wxSQLite+ application @@ -67,6 +67,7 @@ find -name sqlite3 -type d | xargs rm -rfv # copy correct configure file and set permission chmod a+x configure29 configure cp configure29 configure +cp %{SOURCE1} %{name}.pc.in %build @@ -85,7 +86,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' # install own Debian-compatible pkgconfig file mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig -sed -e "s!@VERSION@!3.0.2!" \ +sed -e "s!@VERSION@!3.0.3!" \ -e "s!@LIBDIR@!%{_lib}!" \ -e "s!@WXVERSION@!%{wxversion}!g" \ %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc @@ -110,6 +111,11 @@ sed -e "s!@VERSION@!3.0.2!" \ %changelog +* Sun May 5 2013 Martin Gansser 3.0.3-1 +- update to 3.0.3 +- rebuild for new release +- update wxsqlite3-3.0.1.pc.in to wxsqlite3-3.0.3.pc.in due lib name change + * Sat Feb 16 2013 Martin Gansser 3.0.2-1 - update to 3.0.2 - rebuild for new release