- version 2.7.1

Changed files:
    ORBit2.spec -> 1.47

diff --git a/ORBit2.spec b/ORBit2.spec
index 0100f8c6176c92fff8417703a394ce7a926c51c4..8c1f860f4d20516d46a37dd15dcab1309105448a 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -2,16 +2,15 @@ Summary:      High-performance CORBA Object Request Broker
 Summary(fr):   Requète d'Objects CORBA
 Summary(pl):   Wysoko wydajny CORBA Object Request Broker
 Name:          ORBit2
 Summary(fr):   Requète d'Objects CORBA
 Summary(pl):   Wysoko wydajny CORBA Object Request Broker
 Name:          ORBit2

-Version:       2.7.0
+Version:       2.7.1

 Release:       1
 Epoch:         1
 License:       GPL/LGPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2
 Release:       1
 Epoch:         1
 License:       GPL/LGPL
 Group:         Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/%{name}/2.7/%{name}-%{version}.tar.bz2

-Patch0:                %{name}-am15.patch
+Patch0:                %{name}-am.patch

 Patch1:                %{name}-ac_fix.patch
 Patch1:                %{name}-ac_fix.patch

-Patch2:                %{name}-am16.patch
-Patch3:                %{name}-pthread.patch
+Patch2:                %{name}-pthread.patch

 URL:           http://www.labs.redhat.com/orbit/
 BuildRequires: autoconf
 BuildRequires: automake
 URL:           http://www.labs.redhat.com/orbit/
 BuildRequires: autoconf
 BuildRequires: automake


@@ -20,7 +19,7 @@ BuildRequires:        glib2-devel >= 2.0.6
 BuildRequires: indent
 BuildRequires: libIDL-devel >= 0.8.0
 BuildRequires: libtool
 BuildRequires: indent
 BuildRequires: libIDL-devel >= 0.8.0
 BuildRequires: libtool

-BuildRequires: linc-devel >= 1.1.0
+BuildRequires: linc-devel >= 1.1.1

 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libORBit2_0
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     libORBit2_0


@@ -104,7 +103,6 @@ zlinkowanych statycznie u
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

-%patch3 -p1

 
 %build
 rm -f missing
 
 %build
 rm -f missing


@@ -119,9 +117,7 @@ rm -f missing
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \

-       DESTDIR=$RPM_BUILD_ROOT \
-       m4datadir=%{_aclocaldir} \
-       pkgconfigdir=%{_pkgconfigdir}
+       DESTDIR=$RPM_BUILD_ROOT 

 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT