diff --git a/.cvsignore b/.cvsignore index c88f425..6537fb4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -ORBit2-2.3.100.90.tar.gz +ORBit2-2.4.0.tar.bz2 diff --git a/ORBit2.spec b/ORBit2.spec index e873779..44d940a 100644 --- a/ORBit2.spec +++ b/ORBit2.spec @@ -1,13 +1,12 @@ -%define linc_version 0.1.12.90 -%define libidl_version 0.7.1.91 -%define glib2_base_version 1.3.12 -%define glib2_version %{glib2_base_version}.90-1 +%define linc_version 0.5.0 +%define libidl_version 0.8.0 +%define glib2_version 2.0.1 Summary: A high-performance CORBA Object Request Broker. Name: ORBit2 -Version: 2.3.100.90 -Release: 2 -Source: %{name}-%{version}.tar.gz +Version: 2.4.0 +Release: 1 +Source: %{name}-%{version}.tar.bz2 Group: System Environment/Daemons License: LGPL/GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -51,11 +50,11 @@ write such programs, you'll also need to install the ORBIT package. %prep %setup -q - -if ! pkg-config --atleast-version=%{glib2_base_version} glib-2.0; then - echo "glib-2.0 version is `pkg-config --modversion glib-2.0` which is wrong, build system is confused again" - exit 1 -fi +# crack rock test for glib2 shouldn't be required now +#if ! pkg-config --atleast-version=%{glib2_base_version} glib-2.0; then +# echo "glib-2.0 version is `pkg-config --modversion glib-2.0` which is wrong, build system is confused again" +# exit 1 +#fi echo "glib-2.0 version is `pkg-config --modversion glib-2.0`" @@ -72,26 +71,20 @@ rm -rf %{buildroot} %postun -p /sbin/ldconfig -%post devel - -%preun devel - %clean rm -rf %{buildroot} %files %defattr(-,root,root) - %doc AUTHORS COPYING ChangeLog NEWS README TODO - -%{_libdir}/lib*.so.* +%{_libdir}/*.so.* %{_bindir}/orbit-name-server-2 %{_bindir}/name-client-2 %files devel %defattr(-,root,root) -%{_libdir}/lib*.a -%{_libdir}/lib*.so +%{_libdir}/*.a +%{_libdir}/*.so %{_libdir}/pkgconfig/* %{_bindir}/orbit-idl-2 %{_bindir}/typelib-dump @@ -100,7 +93,36 @@ rm -rf %{buildroot} %{_includedir}/* %{_datadir}/aclocal/* + %changelog +* Tue Jun 4 2002 Havoc Pennington +- 2.4.0 + +* Sun May 26 2002 Tim Powers +- automated rebuild + +* Fri May 17 2002 Havoc Pennington +- rebuild in different environment + +* Fri May 17 2002 Havoc Pennington +- 2.3.109 + +* Thu May 2 2002 Havoc Pennington +- 2.3.108 + +* Thu Apr 4 2002 Jeremy Katz +- 2.3.107 + +* Thu Feb 14 2002 Havoc Pennington +- 2.3.105 + +* Wed Jan 30 2002 Owen Taylor +- Version 2.3.103 +- Rebuild for dependencies + +* Wed Jan 09 2002 Tim Powers +- automated rebuild + * Wed Jan 2 2002 Havoc Pennington - build system somehow built against libglib-1.3.so.11 even though pkg-config found 1.3.12? wtf? diff --git a/sources b/sources index dabb729..039811d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe3b1f6a1c2646050fd790a57f1c246e ORBit2-2.3.100.90.tar.gz +25eb93f5dae655db2806e6462a52a8ee ORBit2-2.4.0.tar.bz2