Update to 3.0.1-3

This commit is contained in:
Martin Gansser 2012-12-24 14:57:05 +01:00
commit 8ff815bf2d
2 changed files with 16 additions and 3 deletions

View file

@ -5,3 +5,4 @@ ca8906dade022b6e3ab9da436ea6fc1f wxsqlite3.spec
218831eb475db1e7398a6c89533b2f1f wxsqlite3-3.0.1.tar.gz
33d42b44ad0bc7e3897c744aedc8e01b wxsqlite3.spec
eaae4fcb03bd6d166e3beca1a821ce2c wxsqlite3-pc.patch
1eaac5ca1379f8a0d509073081f6a053 wxsqlite3.spec

View file

@ -1,6 +1,9 @@
%global wxversion %(wx-config --release)
%global wxincdir %{_includedir}/wx-%{wxversion}
Name: wxsqlite3
Version: 3.0.1
Release: 2%{?dist}
Release: 3%{?dist}
Summary: C++ wrapper around the SQLite 3.x database
Group: System Environment/Libraries
@ -48,7 +51,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
@ -74,6 +76,11 @@ 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 -Dpm 644 %{name}.pc \
$RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}.pc
@ -89,7 +96,7 @@ install -Dpm 644 %{name}.pc \
%{_libdir}/*.so.*
%files devel
%{_includedir}/wx/
%{wxincdir}/wx/*
%{_libdir}/pkgconfig/%{name}.pc
%{_libdir}/*.so
@ -98,6 +105,11 @@ install -Dpm 644 %{name}.pc \
%changelog
* Mon Dec 24 2012 Martin Gansser <martinkg@fedoraproject.org> 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 <martinkg@fedoraproject.org> 3.0.1-2
- added wxsqlite3.pc patch for pkgconfig