[wxsqlite3] Update to 3.0.1-4
Martin Gansser
martinkg at fedoraproject.org
Wed Dec 26 01:11:17 UTC 2012
commit b6440d197a7720453798be9531b3f9b44539b7a5
Author: Martin Gansser <mgansser at alice.de>
Date: Wed Dec 26 02:10:51 2012 +0100
Update to 3.0.1-4
.gitignore | 1 +
sources | 2 ++
wxsqlite3.spec | 27 ++++++++++++++++++---------
3 files changed, 21 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dcac96b..bfefdb9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/wxsqlite3-3.0.0.1.tar.gz
/wxsqlite3-3.0.1.tar.gz
/wxsqlite3.spec
+/wxsqlite3-3.0.1.pc.in
diff --git a/sources b/sources
index 4544f66..ca1ca3f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,4 @@
218831eb475db1e7398a6c89533b2f1f wxsqlite3-3.0.1.tar.gz
1eaac5ca1379f8a0d509073081f6a053 wxsqlite3.spec
+bb773f6231aa1e674c603c6a6bd40654 wxsqlite3.spec
+1d6bb74e56a8190706c6862ab9dd5004 wxsqlite3-3.0.1.pc.in
diff --git a/wxsqlite3.spec b/wxsqlite3.spec
index a5132f8..0dfe8e0 100644
--- a/wxsqlite3.spec
+++ b/wxsqlite3.spec
@@ -3,15 +3,16 @@
Name: wxsqlite3
Version: 3.0.1
-Release: 3%{?dist}
+Release: 4%{?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/tracker/?func=detail&aid=3578735&group_id=51305&atid=462816
-Patch0: %{name}-pc.patch
+# 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
@@ -41,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
@@ -58,8 +59,7 @@ that use %{name}.
%prep
-%setup -q -n %{name}-3.0.1
-%patch0 -p1
+%setup -q
# delete bundled sqlite3 files
find -name sqlite3 -type d | xargs rm -rfv
@@ -82,8 +82,13 @@ 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
+
+# install own Debian-compatible pkgconfig file
+mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
+sed -e "s!@VERSION@!3.0.1!" \
+ -e "s!@LIBDIR@!%{_lib}!" \
+ -e "s!@WXVERSION@!%{wxversion}!g" \
+ %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
%post -p /sbin/ldconfig
@@ -97,7 +102,7 @@ install -Dpm 644 %{name}.pc \
%files devel
%{wxincdir}/wx/*
-%{_libdir}/pkgconfig/%{name}.pc
+%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
%{_libdir}/*.so
%files doc
@@ -105,6 +110,10 @@ install -Dpm 644 %{name}.pc \
%changelog
+* Wed Dec 26 2012 Martin Gansser <martinkg at fedoraproject.org> 3.0.1-4
+- added own Debian-compatible pkgconfig file
+- specfile cleanup
+
* 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
More information about the scm-commits
mailing list