Compare commits

...
Sign in to create a new pull request.

2 commits

Author SHA1 Message Date
Martin Gansser
530e9c11e7 switched to github
- added BR doxygen
- spec file cleanup
2016-05-21 14:47:25 +02:00
Martin Gansser
d539848240 Update to 3.3.0 2016-05-21 14:46:18 +02:00
3 changed files with 59 additions and 31 deletions

1
.gitignore vendored
View file

@ -13,3 +13,4 @@
/wxsqlite3-3.2.0.tar.gz
/wxsqlite3-3.2.1.tar.gz
/wxsqlite3-3.3.0.tar.gz
/wxsqlite3-b05867d.tar.gz

View file

@ -1,2 +1 @@
a718a8ec885aa82ee3192b2765214fef wxsqlite3-3.3.0.tar.gz
1d6bb74e56a8190706c6862ab9dd5004 wxsqlite3-3.0.3.pc.in
e513c8bd9a670bf304b0e247a3988725 wxsqlite3-b05867d.tar.gz

View file

@ -1,22 +1,25 @@
%global wxversion %(wx-config --release)
# https://github.com/utelle/wxsqlite3/commit/b05867d44d8c7bf84fb2034a35075778fdcf55d2
%global commit0 b05867d44d8c7bf84fb2034a35075778fdcf55d2
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global wxversion %(wx-config-3.0 --release)
%global wxincdir %{_includedir}/wx-%{wxversion}
Name: wxsqlite3
Version: 3.3.0
Release: 1%{?dist}
Version: 3.3.2
Release: 0.1git%{shortcommit0}%{?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
# https://sourceforge.net/p/wxcode/bugs/_discuss/thread/d8bda5df/e523/attachment/wxsqlite3-3.0.3.pc.in
Source1: %{name}-3.0.3.pc.in
URL: https://github.com/utelle/wxsqlite3
# wget https://github.com/utelle/wxsqlite3/archive/b05867d44d8c7bf84fb2034a35075778fdcf55d2/wxsqlite3-b05867d.tar.gz
Source0: https://github.com/utelle/wxsqlite3/archive/%{commit0}/%{name}-%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
# don't %%build the included wxSQLite+ application
BuildRequires: wxGTK-devel
BuildRequires: wxGTK3-devel
BuildRequires: sqlite-devel
BuildRequires: doxygen
BuildRequires: dos2unix
%description
@ -42,7 +45,7 @@ added in version 1.9.8.
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: wxGTK-devel%{?_isa}
Requires: wxGTK3-devel%{?_isa}
%description devel
The %{name}-devel package contains libraries and header files for
@ -59,40 +62,49 @@ that use %{name}.
%prep
%setup -q -n %{name}-%{version}
%setup -qn %{name}-%{commit0}
# delete bundled sqlite3 files
find -name sqlite3 -type d | xargs rm -rfv
# copy correct configure file and set permission
chmod a+x configure30 configure
cp configure30 configure
cp %{SOURCE1} %{name}.pc.in
# set correct permission
chmod a+x configure
# use correct wx-config file
sed -i -e 's|WX_CONFIG_NAME=wx-config|WX_CONFIG_NAME=wx-config-3.0|g' configure
# fixex E: wrong-script-end-of-line-encoding
dos2unix readme.md
# fixes W: spurious-executable-perm
find docs -type f -exec chmod a-x {} \;
chmod a-x include/wx/wxsqlite3.h src/wxsqlite3.cpp
# fixes E: script-without-shebang
chmod -x LICENCE.txt readme.md
%build
%configure
make %{?_smp_mflags}
# build docs
pushd docs
doxygen
popd
%install
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
make install DESTDIR=%{buildroot} 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}
mkdir %{buildroot}%{wxincdir}
mv %{buildroot}%{_includedir}/wx %{buildroot}%{wxincdir}
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# install own Debian-compatible pkgconfig file
mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
sed -e "s!@VERSION@!3.3.0!" \
-e "s!@LIBDIR@!%{_lib}!" \
-e "s!@WXVERSION@!%{wxversion}!g" \
%{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
# install pkgconfig file
mkdir -p %{buildroot}%{_libdir}/pkgconfig
mv %{name}.pc %{buildroot}%{_libdir}/pkgconfig/%{name}.pc
# libname has changed
sed -i 's|wxcode_gtk2_wxsqlite3|wxcode_gtk2u_wxsqlite3|g' $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
%post -p /sbin/ldconfig
@ -106,7 +118,7 @@ sed -i 's|wxcode_gtk2_wxsqlite3|wxcode_gtk2u_wxsqlite3|g' $RPM_BUILD_ROOT%{_libd
%files devel
%{wxincdir}/wx/*
%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/*.so
%files doc
@ -114,6 +126,22 @@ sed -i 's|wxcode_gtk2_wxsqlite3|wxcode_gtk2u_wxsqlite3|g' $RPM_BUILD_ROOT%{_libd
%changelog
* Sun Apr 24 2016 Martin Gansser <martinkg@fedoraproject.org> 3.3.2-0.1gitb05867d
- switched to github
- added BR doxygen
- spec file cleanup
* Sun Apr 10 2016 Martin Gansser <martinkg@fedoraproject.org> 3.3.1-1
- Update to 3.3.1
- Replaced BR wxGTK-devel by wxGTK3-devel
* Sat Feb 06 2016 Martin Gansser <martinkg@fedoraproject.org> 3.3.0-3
- Added BR dos2unix
- fixe rpmlint warnings
* Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Fri Dec 18 2015 Martin Gansser <martinkg@fedoraproject.org> 3.3.0-1
- Update to 3.3.0