[wxsqlite3] Update to 3.0.1-3

Martin Gansser martinkg at fedoraproject.org
Mon Dec 24 13:03:32 UTC 2012


commit 2d146adef3c28ddb534b52e6083219192d01eaea
Author: Martin Gansser <mgansser at alice.de>
Date:   Mon Dec 24 14:02:57 2012 +0100

    Update to 3.0.1-3

 .gitignore     |    1 +
 sources        |    1 +
 wxsqlite3.spec |   18 +++++++++++++++---
 3 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e804ce..dcac96b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /wxsqlite3-3.0.0.1.tar.gz
 /wxsqlite3-3.0.1.tar.gz
+/wxsqlite3.spec
diff --git a/sources b/sources
index 6ad7986..4544f66 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 218831eb475db1e7398a6c89533b2f1f  wxsqlite3-3.0.1.tar.gz
+1eaac5ca1379f8a0d509073081f6a053  wxsqlite3.spec
diff --git a/wxsqlite3.spec b/wxsqlite3.spec
index 8f57b00..a5132f8 100644
--- a/wxsqlite3.spec
+++ b/wxsqlite3.spec
@@ -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 at 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 at fedoraproject.org> 3.0.1-2
 - added wxsqlite3.pc patch for pkgconfig
 


More information about the scm-commits mailing list