- added popt patch (don't link libs with -lpopt)

- fixed build with current pkgconfig

Changed files:
    ORBit2.spec -> 1.79

diff --git a/ORBit2.spec b/ORBit2.spec
index 61202c09049e3129c1990e8f94893e8913836e4f..fdcf910c3dab0106ccac138cf49c559284b56f45 100644 (file)
--- a/ORBit2.spec
+++ b/ORBit2.spec
@@ -10,8 +10,9 @@ Group:                Libraries
 Source0:       http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.12/%{name}-%{version}.tar.bz2
 # Source0-md5: 7f963dcd0d84e6854460449383cc8c70
 Patch0:                %{name}-pthread.patch
+Patch1:                %{name}-popt.patch
 URL:           http://www.labs.redhat.com/orbit/
-BuildRequires: autoconf
+BuildRequires: autoconf >= 2.12
 BuildRequires: automake
 BuildRequires: flex
 BuildRequires: glib2-devel >= 1:2.6.3
@@ -20,8 +21,11 @@ BuildRequires:       indent
 BuildRequires: libIDL-devel >= 0.8.5
 BuildRequires: libtool
 BuildRequires: pkgconfig >= 1:0.14.0
-BuildRequires: popt-devel
+BuildRequires: popt-devel >= 1.5
 BuildRequires: rpmbuild(macros) >= 1.197
+Requires:      glib2 >= 1:2.6.3
+Requires:      libIDL >= 0.8.5
+Requires:      popt >= 1.5
 Provides:      linc = 1.1.1
 Obsoletes:     libORBit2_0
 Obsoletes:     linc
@@ -56,7 +60,6 @@ Requires:     %{name} = %{epoch}:%{version}-%{release}
 Requires:      glib2-devel >= 1:2.6.3
 Requires:      indent
 Requires:      libIDL-devel >= 0.8.5
-Requires:      popt-devel
 Provides:      linc-devel = 1.1.1
 Obsoletes:     libORBit2_0-devel
 Obsoletes:     linc-devel
@@ -108,6 +111,10 @@ skonsolidowanych statycznie u
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+
+# workaround for variable name
+echo 'm4_pattern_allow(PKG_CONFIG_MIN_VERSION)' >> acinclude.m4
 
 %build
 %{__gtkdocize}