rpms/metakit/devel metakit.spec,1.4,1.5

[Matthias Saou (thias)]

Changeset from: thias

Update of /cvs/extras/rpms/metakit/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv23844

Modified Files:
	metakit.spec 
Log Message:
Merge changes and bump release.



Index: metakit.spec
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- metakit.spec	9 Nov 2004 02:48:26 -0000	1.4
+++ metakit.spec	16 Nov 2004 17:59:41 -0000	1.5
@@ -1,17 +1,20 @@
 # $Id$
-# Authority: matthias
-# Upstream: <metakit at equi4.com>
+# Upstream: <metakit$equi4,com>
+
+%define _lib32dir %{_prefix}/lib
+%define python_version %(python -c 'import sys; print sys.version[:3]')
 
 Summary: Embeddable database
 Name: metakit
 Version: 2.4.9.3
-Release: 1.1.fc2.fr
+Release: 4
 License: GPL
 Group: System Environment/Libraries
 URL: http://www.equi4.com/metakit/
 Source: http://www.equi4.com/pub/mk/metakit-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++, tcl
+Requires: tcl, python
+BuildRequires: gcc-c++, tcl-devel, python-devel
 
 %description
 MetaKit is an embeddable database which runs on Unix, Windows,
@@ -36,15 +39,19 @@
 
 
 %build
-cd unix
-%configure
-%{__make} %{?_smp_mflags}
+pushd unix
+    %configure \
+        --libdir="%{_lib32dir}" \
+        --with-python="%{_includedir}/python%{python_version},%{_libdir}/python%{python_version}" \
+        --with-tcl
+    %{__make} %{?_smp_mflags}
+popd
 
 
 %install
 %{__rm} -rf %{buildroot}
-cd unix
-%{__make} install DESTDIR=%{buildroot}
+%{__install} -d -m0755 %{buildroot}%{_libdir}/python%{python_version}/site-packages/
+%{__make} install -C unix DESTDIR=%{buildroot}
 
 
 %clean
@@ -61,17 +68,31 @@
 %files
 %defattr(-, root, root, 0755)
 %doc README
-%{_libdir}/*.so
+%{_lib32dir}/*.so
+%{_libdir}/python%{python_version}/Mk4py.so
+%{_libdir}/python%{python_version}/metakit.py
+%{_lib32dir}/tcl*/Mk4tcl/
+
 
 %files devel
 %defattr(-, root, root, 0755)
 %doc CHANGES WHATSNEW doc
 %{_includedir}/*
-%exclude %{_libdir}/*.la
-%{_libdir}/*.a
+%exclude %{_lib32dir}/*.la
+%{_lib32dir}/*.a
 
 
 %changelog
+* Tue Nov 16 2004 Matthias Saou <http://freshrpms.net/> 2.4.9.3-4
+- Bump release to provide Extras upgrade path.
+
+* Tue Aug 24 2004 Matthias Saou <http://freshrpms.net/> 2.4.9.3-3
+- Add explicit dependency on tcl, as the bindings are in a directory created by
+  this package, whereas the tcl package creates symlinks instead (clash).
+
+* Mon Jul 18 2004 Dag Wieers <dag at wieers.com> - 2.4.9.3-2
+- Added tcl and python libraries.
+
 * Thu May 20 2004 Matthias Saou <http://freshrpms.net/> 2.4.9.3-2
 - Rebuild for Fedora Core 2.