Stefan van der Eijk wrote:
Götz Waschk wrote:
[.......]
BTW ORBit2 should be fixed with the attached patch.

I'm not sure. I was expecting the .so.0.0.0 files to go and that the .so file would remain. This is not the case:

Did you run automake after applying the patch from Götz?

Btw, the patch is just applied to ORBit2 CVS, and the versioned files would not be there in next release.

In case you're not sure how to handle the patch, I've attached another patch against ORBit2.spec.

Abel


$ ls -l

total 36

-rwxr-xr-x 1 stefan stefan 963 May 31 10:19 Everything_module.la*

lrwxrwxrwx 1 stefan stefan 26 May 31 10:19 Everything_module.so -> Everything_module.so.0.0.0*

lrwxrwxrwx 1 stefan stefan 26 May 31 10:19 Everything_module.so.0 -> Everything_module.so.0.0.0*

-rwxr-xr-x 1 stefan stefan 29652 May 31 10:19 Everything_module.so.0.0.0*


------------------------------------------------------------------------

--- test/everything/Makefile.am~    2003-04-23 13:09:01.000000000 +0200
+++ test/everything/Makefile.am    2003-05-26 12:48:54.000000000 +0200
@@ -55,7 +55,7 @@
orbittypelib_LTLIBRARIES = Everything_module.la

Everything_module_la_LDFLAGS = \
- -export-dynamic -module -no-undefined
+ -export-dynamic -module -no-undefined -avoid-version
Everything_module_la_SOURCES = \
everything-imodule.c
Everything_module_la_LIBADD = \





--
Abel Cheung
Linux counter #256983   | http://counter.li.org
GPG Key: (0xC67186FF)   | http://deaddog.org/gpg.asc
Key fingerprint: 671C C7AE EFB5 110C D6D1  41EE 4152 E1F1 C671 86FF
--- ORBit2.spec.bak     2003-05-24 20:05:10.000000000 +0800
+++ ORBit2.spec 2003-05-31 18:20:26.000000000 +0800
@@ -8,17 +8,19 @@
 
 Name:          ORBit2
 Version:       2.7.1
-Release:       2mdk
+Release:       3mdk
 Summary:       High-performance CORBA Object Request Broker.
 License:       LGPL
 Group:         Graphical desktop/GNOME
 URL:           http://orbit-resource.sf.net/
 Buildroot:     %{_tmppath}/%{name}-%{version}-buildroot
 
-Source0:       
ftp://ftp.gnome.org/pub/GNOME/pre-gnome2/sources/%{name}/%{name}-%{version}.tar.bz2
+Source0:       
ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
 Source1:       orbit-faq2-0.2.html.bz2
 # (fc) 2.4.1-2mdk fix crash when /tmp is not readable
 Patch0:                ORBit2-2.7.1-tmpdir.patch.bz2
+# (goetz) 2.7.1-3mdk Don't compile Everything_module as a versioned library
+Patch1:                ORBit2-2.7.1-everything-module.patch.bz2
 
 BuildConflicts:        ORBit-devel < 0.5.10
 BuildRequires: indent bison flex popt-devel >= 1.5
@@ -87,6 +89,10 @@
 %prep
 %setup -q
 %patch0 -p1 -b .tmpdir
+%patch1 -p0 -b .libtoolflag
+
+# needed by patch1
+automake-1.4
 
 bzcat %{SOURCE1} > orbit-faq2-0.2.html
 
@@ -123,7 +129,7 @@
 %{_bindir}/typelib-dump
 %{_datadir}/idl/orbit-%{api_version}
 %dir %{_libdir}/orbit-%{api_version}
-%{_libdir}/orbit-%{api_version}/*.so.*
+%{_libdir}/orbit-%{api_version}/*.so*
 
 %files -n %{lib_name}
 %defattr(-,root,root,755)
@@ -142,9 +148,13 @@
 %{_libdir}/lib*.la
 %{_libdir}/pkgconfig/*.pc
 %{_libdir}/orbit-%{api_version}/*.la
-%{_libdir}/orbit-%{api_version}/*.so
 
 %changelog
+* Sat May 31 2003 Abel Cheung <[EMAIL PROTECTED]> - 2.7.1-3mdk
+- Patch1(CVS): Fix everything_module libtool flag (thanks Goetz)
+- move Everything_module.so back to main package
+- fix source URL
+
 * Sat Jun 24 2003 Stefan van der Eijk <[EMAIL PROTECTED]> - 2.7.1-2mdk
 - split off \.so$ to -devel files
 - remove redundant BuildRequires: pkgconfig

Attachment: pgp00000.pgp
Description: PGP signature



Reply via email to