rpms/metakit/devel metakit-2.4.9.3-64bit.patch, NONE, 1.1 metakit-2.4.9.3-nostrip.patch, NONE, 1.1 metakit.spec, 1.9, 1.10 metakit-64bit.patch, 1.1, NONE
Matthias Saou (thias)
fedora-extras-commits at redhat.com
Thu May 26 12:40:17 UTC 2005
Author: thias
Update of /cvs/extras/rpms/metakit/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14419
Modified Files:
metakit.spec
Added Files:
metakit-2.4.9.3-64bit.patch metakit-2.4.9.3-nostrip.patch
Removed Files:
metakit-64bit.patch
Log Message:
Python module, lib32 vs. lib64 and stripping fixes.
metakit-2.4.9.3-64bit.patch:
--- NEW FILE metakit-2.4.9.3-64bit.patch ---
--- metakit-2.4.9.3/python/PyRowRef.cpp.64bit 2004-01-20 20:46:06.000000000 -0500
+++ metakit-2.4.9.3/python/PyRowRef.cpp 2005-05-25 16:29:02.000000000 -0400
@@ -24,12 +24,12 @@
}
static int PyRowRef_print(PyRowRef *o, FILE *f, int) {
- fprintf(f, "<PyRowRef object at %x>", (int)o);
+ fprintf(f, "<PyRowRef object at %zx>", o);
return 0;
}
static int PyRORowRef_print(PyRowRef *o, FILE *f, int) {
- fprintf(f, "<PyRORowRef object at %x>", (int)o);
+ fprintf(f, "<PyRORowRef object at %zx>", o);
return 0;
}
--- metakit-2.4.9.3/python/PyView.cpp.64bit 2005-05-25 16:30:09.000000000 -0400
+++ metakit-2.4.9.3/python/PyView.cpp 2005-05-25 16:30:42.000000000 -0400
@@ -971,15 +971,15 @@
}
static int PyView_print(PyView *o, FILE *f, int) {
- fprintf(f, "<PyView object at %x>", (int)o);
+ fprintf(f, "<PyView object at %zx>", o);
return 0;
}
static int PyViewer_print(PyView *o, FILE *f, int) {
- fprintf(f, "<PyViewer object at %x>", (int)o);
+ fprintf(f, "<PyViewer object at %zx>", o);
return 0;
}
static int PyROViewer_print(PyView *o, FILE *f, int) {
- fprintf(f, "<PyROViewer object at %x>", (int)o);
+ fprintf(f, "<PyROViewer object at %zx>", o);
return 0;
}
metakit-2.4.9.3-nostrip.patch:
--- NEW FILE metakit-2.4.9.3-nostrip.patch ---
diff -Naupr metakit-2.4.9.3.orig/unix/Makefile.in metakit-2.4.9.3/unix/Makefile.in
--- metakit-2.4.9.3.orig/unix/Makefile.in 2004-01-26 10:54:45.000000000 +0100
+++ metakit-2.4.9.3/unix/Makefile.in 2005-05-26 14:34:38.000000000 +0200
@@ -151,7 +151,6 @@ libmk4.la: $(LOBJS) $(LINK_SPECIAL_FILES
Mk4tcl at SHLIB_SUFFIX@: libmk4tcl.la
cp .libs/libmk4tcl at SHLIB_SUFFIX@ $@
- -strip $(STRIP_FLAGS) $@ 2>/dev/null
libmk4tcl.la: mk4tcl.o mk4too.o $(LOBJS) $(LINK_SPECIAL_FILES)
$L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_SHLIB_FLAGS) \
@@ -160,7 +159,6 @@ libmk4tcl.la: mk4tcl.o mk4too.o $(LOBJS)
Mk4py at MODULE_SUFFIX@: libmk4py.la
cp .libs/libmk4py at MODULE_SUFFIX@ $@
- -strip $(STRIP_FLAGS) $@ 2>/dev/null
libmk4py.la: $(PYOBJS) $(LOBJS)
$L --mode=link $(CXX) -o $@ $(CXX_SWITCHES) $(LIBTOOL_MODULE_FLAGS) \
Index: metakit.spec
===================================================================
RCS file: /cvs/extras/rpms/metakit/devel/metakit.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metakit.spec 25 May 2005 20:33:22 -0000 1.9
+++ metakit.spec 26 May 2005 12:40:15 -0000 1.10
@@ -1,18 +1,15 @@
-# $Id$
-# 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: 7
+Release: 8
License: GPL
Group: System Environment/Libraries
URL: http://www.equi4.com/metakit/
Source: http://www.equi4.com/pub/mk/metakit-%{version}.tar.gz
-Patch0: metakit-64bit.patch
+Patch0: metakit-2.4.9.3-64bit.patch
+Patch1: metakit-2.4.9.3-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: tcl, python
BuildRequires: gcc-c++, tcl-devel, python-devel
@@ -38,12 +35,12 @@
%prep
%setup -q
%patch0 -p1 -b .64bit
+%patch1 -p1 -b .nostrip
%build
pushd unix
%configure \
- --libdir="%{_lib32dir}" \
--with-python="%{_includedir}/python%{python_version},%{_libdir}/python%{python_version}" \
--with-tcl
%{__make} %{?_smp_mflags}
@@ -52,39 +49,46 @@
%install
%{__rm} -rf %{buildroot}
-%{__install} -d -m0755 %{buildroot}%{_libdir}/python%{python_version}/site-packages/
+%{__mkdir_p} %{buildroot}%{_libdir}/python%{python_version}/site-packages/
%{__make} install -C unix DESTDIR=%{buildroot}
+# Put python module back into place
+%{__mv} %{buildroot}%{_libdir}/python%{python_version}/*.* \
+ %{buildroot}%{_libdir}/python%{python_version}/site-packages/
+
%clean
%{__rm} -rf %{buildroot}
-%post
-/sbin/ldconfig 2>/dev/null
+%post -p /sbin/ldconfig
-%postun
-/sbin/ldconfig 2>/dev/null
+%postun -p /sbin/ldconfig
%files
%defattr(-, root, root, 0755)
%doc README
-%{_lib32dir}/*.so
-%{_libdir}/python%{python_version}/Mk4py.so
-%{_libdir}/python%{python_version}/metakit.py
-%{_lib32dir}/tcl*/Mk4tcl/
+%{_libdir}/*.so
+%{_libdir}/python%{python_version}/site-packages/Mk4py.so
+%{_libdir}/python%{python_version}/site-packages/metakit.py
+%{_libdir}/tcl*/Mk4tcl/
%files devel
%defattr(-, root, root, 0755)
-%doc CHANGES WHATSNEW doc
+%doc CHANGES WHATSNEW doc/
%{_includedir}/*
-%exclude %{_lib32dir}/*.la
-%{_lib32dir}/*.a
+%exclude %{_libdir}/*.la
+%{_libdir}/*.a
%changelog
+* Thu May 26 2005 Matthias Saou <http://freshrpms.net/> 2.4.9.3-8
+- Move libraries back to _libdir (why lib32dir in the first place?) (#158586)
+- Move python module into site-packages/.
+- Disable stripping of the lib and the python module lib.
+
* Wed May 25 2005 Jeremy Katz <katzj at redhat.com> - 2.4.9.3-7
- fix for 64bit problems; initial patch from Ignacio, more from me (#159460)
--- metakit-64bit.patch DELETED ---
More information about the fedora-extras-commits
mailing list