Attachment 1302 Details for Bug 8679 – metakit-2.4.9.3-alt2.src.rpm.diff

[patch] metakit-2.4.9.3-alt2.src.rpm.diff

metakit-2.4.9.3-alt2.src.rpm.diff (text/plain), 3.23 KB, created by Sergey Vlasov on 2005-12-18 22:10:45 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Vlasov

Created: 2005-12-18 22:10:45 MSK

Size: 3.23 KB

patch

obsolete

>--- metakit-2.4.9.3-alt1.1.1/metakit.spec	2005-01-18 00:55:37 +0000
>+++ metakit-2.4.9.3-alt2/metakit.spec	2005-12-18 18:58:52 +0000
>@@ -1,6 +1,8 @@
> Name: metakit
> Version: 2.4.9.3
>-Release: alt1.1.1
>+Release: alt2
>+
>+%define tclpkg Mk4tcl
> 
> Summary: Embeddable database
> License: X/MIT-like
>@@ -11,9 +13,10 @@ Packager: Michael Shigorin <mike@altlinu
> 
> Source: %name-%version.tar.gz
> Patch0: metakit-2.4.9.3-alt-libtool.patch.bz2
>+Patch1: metakit-2.4.9.3-alt-tcl.patch
> 
>-# Automatically added by buildreq on Wed Dec 11 2002
>-BuildRequires: gcc-c++ libstdc++-devel
>+# Automatically added by buildreq on Sun Jan 02 2005
>+BuildRequires: gcc-c++ libstdc++-devel tcl-devel
> 
> %def_disable static
> %{?_enable_static:BuildPreReq: glibc-devel-static}
>@@ -51,9 +54,19 @@ Requires: lib%name-devel = %version-%rel
> %description -n lib%name-devel-static
> This package contains static libraries for %name development.
> 
>+%package -n tcl-%name
>+Summary: Tcl bindings for the Metakit library
>+Group: Development/Tcl
>+Requires: lib%name = %version-%release
>+Requires: tcl >= 8.4.0-alt1
>+
>+%description -n tcl-%name
>+This package contains Tcl bindings for the Metakit library.
>+
> %prep
> %setup -q
> bzcat %PATCH0 | patch -p1 -F10 
>+%patch1 -p1
> 
> %build
> %__subst "s/^CXXFLAGS.*/CXXFLAGS = %optflags/" unix/Makefile.in
>@@ -62,18 +75,25 @@ autoconf
> cd ../builds
> 
> # whoever wants python should look at Conectiva package first;
>-# tcl -- don't know at all (tcl-devel wouldn't help)
>+# Tcl extension now builds with some hacks
> ../unix/configure \
>-	--disable-python --disable-tcl \
>+	--disable-python --with-tcl=/usr/include,%buildroot%_tcldatadir \
> 	--prefix=%prefix --mandir=%_mandir \
> 	--libdir=%_libdir --includedir=%_includedir \
> 	--infodir=%_infodir --bindir=%_bindir \
> 	--sbindir=%_sbindir --sysconfdir=%_sysconfdir \
> 	--enable-shared %{subst_enable static}
> 
>+# hack to avoid broken rpath (libtool sucks)
>+%__subst 's|^$hardcode_into_libs$=.*$|\1=no|' libtool
>+
> %make_build
> %make_build test
> 
>+pushd ../tcl/test
>+LD_LIBRARY_PATH=../../builds/.libs tclsh all.tcl
>+popd
>+
> %install
> %makeinstall -C builds
> 
>@@ -84,6 +104,12 @@ find . -type d -name CVS -print0 |
> find doc demos -type f -print0 |
> 	xargs -r0 chmod 644 --
> 
>+# move tcl extension library to proper place
>+%__mkdir_p %buildroot%_tcllibdir
>+%__mv %buildroot%_tcldatadir/%tclpkg/%tclpkg.so %buildroot%_tcllibdir/
>+%__subst 's|\$dir $%tclpkg\.so$|/usr/lib/tcl \1|' \
>+	%buildroot%_tcldatadir/%tclpkg/pkgIndex.tcl
>+
> %post -n lib%name -p %post_ldconfig
> %postun -n lib%name -p %postun_ldconfig
> 
>@@ -96,12 +122,24 @@ find doc demos -type f -print0 |
> %_libdir/*.so
> %_includedir/*
> 
>+%files -n tcl-%name
>+%doc doc/tcl.html doc/tcl.gif doc/e4s.gif
>+%_tcldatadir/%tclpkg
>+%_tcllibdir/%tclpkg.so
>+
> %if_enabled static
> %files -n lib%name-devel-static
> %_libdir/*.a
> %endif 
> 
> %changelog
>+* Sun Dec 18 2005 Sergey Vlasov <vsu@altlinux.ru> 2.4.9.3-alt2
>+- Enabled Tcl support.
>+- Added patch to fix Tcl extension build:
>+  + use shared metakit library instead of duplicating its code
>+  + do not export internal symbols
>+- Updated BuildRequires.
>+
> * Tue Jan 18 2005 ALT QA Team Robot <qa-robot@altlinux.org> 2.4.9.3-alt1.1.1
> - Rebuilt with libstdc++.so.6.
> 
>End of diff
>
>Files not compared in metakit-2.4.9.3-alt2:
>metakit-2.4.9.3-alt-tcl.patch
>

Actions: View | Diff

Attachments on bug 8679: 1302 | 1303