diff --git a/.gitignore b/.gitignore index cbbcec9..2bad74f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ /wxsqlite3-3.0.0.1.tar.gz +/wxsqlite3.spec +/wxsqlite3.pc +/wxsqlite3-3.0.1.tar.gz +/wxsqlite3-pc.patch +/wxsqlite3-3.0.1.pc.in +/wxsqlite3-3.0.2.tar.gz diff --git a/clog b/clog new file mode 100644 index 0000000..91adda8 --- /dev/null +++ b/clog @@ -0,0 +1,3 @@ +update to 3.0.2 + +- rebuild for new release diff --git a/sources b/sources index ef63ff8..77a9c32 100644 --- a/sources +++ b/sources @@ -1 +1,3 @@ -266ebbf14a66a8e38ba6abdfff68934f wxsqlite3-3.0.0.1.tar.gz +30dc3611ef2df375938a3cae26eb658e wxsqlite3-3.0.2.tar.gz +1d6bb74e56a8190706c6862ab9dd5004 wxsqlite3-3.0.1.pc.in +2209caba8fc40ecda08143ab66bef0e7 wxsqlite3.spec diff --git a/wxsqlite3.spec b/wxsqlite3.spec index 73e2b38..3c187e2 100644 --- a/wxsqlite3.spec +++ b/wxsqlite3.spec @@ -1,13 +1,19 @@ +%global wxversion %(wx-config --release) +%global wxincdir %{_includedir}/wx-%{wxversion} + Name: wxsqlite3 -Version: 3.0.0.1 -Release: 6%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: C++ wrapper around the SQLite 3.x database Group: System Environment/Libraries License: wxWidgets URL: http://wxcode.sourceforge.net/components/wxsqlite3/ Source0: http://downloads.sourceforge.net/wxcode/%{name}-%{version}.tar.gz -# don't build the included wxSQLite+ application +# https://sourceforge.net/p/wxcode/bugs/_discuss/thread/e8dd9e84/340f/attachment/wxsqlite3-3.0.1.pc.in +Source1: %{name}-3.0.1.pc.in + +# don't %%build the included wxSQLite+ application BuildRequires: wxGTK-devel BuildRequires: sqlite-devel @@ -36,7 +42,7 @@ added in version 1.9.8. Summary: Development files for %{name} Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: wxGTK-devel +Requires: wxGTK-devel%{?_isa} %description devel The %{name}-devel package contains libraries and header files for @@ -46,7 +52,6 @@ developing applications that use %{name}. Summary: Documentation files for %{name} Group: Documentation BuildArch: noarch -Requires: %{name} = %{version}-%{release} %description doc The %{name}-doc package contains html documentation @@ -54,17 +59,12 @@ that use %{name}. %prep -%setup -q -n %{name}-3.0.0 +%setup -q # delete bundled sqlite3 files find -name sqlite3 -type d | xargs rm -rfv -# fix permissions -# reported upstream ID: 3577572 -# https://sourceforge.net/tracker/?func=detail&aid=3577572&group_id=51305&atid=462816 -find -type f -exec chmod a-x {} \; - -# copy correct configure file an set premission +# copy correct configure file and set permission chmod a+x configure29 configure cp configure29 configure @@ -76,8 +76,20 @@ make %{?_smp_mflags} %install make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" + +# move headers from /usr/include/wx to /usr/include/wx-?.?/wx +mkdir ${RPM_BUILD_ROOT}%{wxincdir} +mv ${RPM_BUILD_ROOT}%{_includedir}/wx ${RPM_BUILD_ROOT}%{wxincdir} + 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!" \ + -e "s!@LIBDIR@!%{_lib}!" \ + -e "s!@WXVERSION@!%{wxversion}!g" \ + %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc + %post -p /sbin/ldconfig @@ -89,7 +101,8 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %{_libdir}/*.so.* %files devel -%{_includedir}/wx/ +%{wxincdir}/wx/* +%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc %{_libdir}/*.so %files doc @@ -97,6 +110,32 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' %changelog +* Sat Feb 16 2013 Martin Gansser 3.0.2-1 +- update to 3.0.2 +- rebuild for new release + +* Fri Feb 15 2013 Fedora Release Engineering - 3.0.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Dec 26 2012 Martin Gansser 3.0.1-4 +- added own Debian-compatible pkgconfig file +- specfile cleanup + +* Mon Dec 24 2012 Martin Gansser 3.0.1-3 +- added %%wx-config to determine wx version +- moved wx header files to corresponding wx-version +- removed requirement in doc section + +* Sun Dec 23 2012 Martin Gansser 3.0.1-2 +- added wxsqlite3.pc patch for pkgconfig + +* Sat Nov 24 2012 Martin Gansser 3.0.1-1 +- update to 3.0.1 +- specfile cleanup + +* Sat Oct 20 2012 Martin Gansser 3.0.0.1-7 +- added wxsqlite3.pc file + * Tue Oct 16 2012 Martin Gansser 3.0.0.1-6 - added chmod a-x for all files - added chmod a+x for configure29