rpms/sqlite/devel sqlite.spec,1.43,1.44
Panu Matilainen
pmatilai at fedoraproject.org
Tue Dec 2 14:45:06 UTC 2008
- Previous message (by thread): rpms/rubygem-facets/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-facets.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/txt2tags/F-8 txt2tags.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: pmatilai
Update of /cvs/pkgs/rpms/sqlite/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv26598
Modified Files:
sqlite.spec
Log Message:
- require tcl(abi) in sqlite-tcl subpackage (#474034)
- move tcl extensions to arch-specific location
- enable dependency extraction on the tcl dso
- require pkgconfig in sqlite-devel
Index: sqlite.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sqlite/devel/sqlite.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- sqlite.spec 29 Nov 2008 18:09:06 -0000 1.43
+++ sqlite.spec 2 Dec 2008 14:44:36 -0000 1.44
@@ -6,7 +6,7 @@
Summary: Library that implements an embeddable SQL database engine
Name: sqlite
Version: 3.6.6.2
-Release: 1%{?dist}
+Release: 2%{?dist}
License: Public Domain
Group: Applications/Databases
URL: http://www.sqlite.org/
@@ -18,6 +18,8 @@
BuildRequires: /usr/bin/tclsh
%if %{with tcl}
BuildRequires: tcl-devel
+%{!?tcl_version: %global tcl_version %(echo 'puts $tcl_version' | tclsh)}
+%{!?tcl_sitearch: %global tcl_sitearch %{_libdir}/tcl%{tcl_version}}
%endif
BuildRoot: %{_tmppath}/%{name}-root
@@ -34,6 +36,7 @@
Summary: Development tools for the sqlite3 embeddable SQL database engine.
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
%description devel
This package contains the header files and development documentation
@@ -45,6 +48,7 @@
Summary: Tcl module for the sqlite3 embeddable SQL database engine.
Group: Development/Languages
Requires: %{name} = %{version}-%{release}
+Requires: tcl(abi) = %{tcl_version}
%description tcl
This package contains the tcl modules for %{name}.
@@ -67,10 +71,15 @@
%install
rm -rf $RPM_BUILD_ROOT
-make DESTDIR=${RPM_BUILD_ROOT} install
+make DESTDIR=${RPM_BUILD_ROOT} %{?with_tcl:TCLLIBDIR=%{tcl_sitearch}} install
%{__install} -D -m0644 sqlite3.1 %{buildroot}%{_mandir}/man1/sqlite3.1
+%if %{with tcl}
+# fix up permissions to enable dep extraction
+chmod 0755 ${RPM_BUILD_ROOT}/%{tcl_sitearch}/sqlite3/*.so
+%endif
+
%if ! %{with static}
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.{la,a}
%endif
@@ -103,13 +112,20 @@
%{_libdir}/*.a
%exclude %{_libdir}/*.la
%endif
+
%if %{with tcl}
%files tcl
%defattr(-, root, root)
-%{_datadir}/tcl*/sqlite3
+%{tcl_sitearch}/sqlite3
%endif
%changelog
+* Tue Dec 02 2008 Panu Matilainen <pmatilai at redhat.com> - 3.6.6.2-2
+- require tcl(abi) in sqlite-tcl subpackage (#474034)
+- move tcl extensions to arch-specific location
+- enable dependency extraction on the tcl dso
+- require pkgconfig in sqlite-devel
+
* Sat Nov 29 2008 Panu Matilainen <pmatilai at redhat.com> - 3.6.6.2-1
- update to 3.6.6.2
- Previous message (by thread): rpms/rubygem-facets/devel .cvsignore, 1.2, 1.3 import.log, 1.1, 1.2 rubygem-facets.spec, 1.1, 1.2 sources, 1.2, 1.3
- Next message (by thread): rpms/txt2tags/F-8 txt2tags.spec,1.1,1.2
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list