- rel 7

- fixed searching for ruby headers

Changed files:
    freeradius-server-rubyhdrs.patch -> 1.1
    freeradius-server.spec -> 1.32

diff --git a/freeradius-server-rubyhdrs.patch b/freeradius-server-rubyhdrs.patch
new file mode 100644 (file)
index 0000000..1ee73c7
--- /dev/null
+++ b/freeradius-server-rubyhdrs.patch
@@ -0,0 +1,11 @@
+--- freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in~ 2009-09-14 16:43:29.000000000 +0200
++++ freeradius-server-2.1.7/src/modules/rlm_ruby/configure.in  2010-03-01 13:53:59.571124248 +0100
+@@ -57,7 +57,7 @@
+ #             RB_LIB_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('libdir')"`
+ #             RB_EXTRA_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBS')"`
+               RB_LIBS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('LIBRUBYARG_SHARED')"`
+-              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('includedir')"`
++              RB_INC_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('rubyhdrdir')"`
+               RB_CFLAGS=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('CFLAGS')"`
+               RB_ARCH_DIR=`${RUBYBIN} -e "require 'rbconfig'; puts Config::CONFIG.fetch('archdir')"`
+ 

diff --git a/freeradius-server.spec b/freeradius-server.spec
index d696a097a7b8ee3e488fba7edb02048f233c8250..f18ccc45889a5d128c9d4f980e11f963ba6df7e6 100644 (file)
--- a/freeradius-server.spec
+++ b/freeradius-server.spec
@@ -10,7 +10,7 @@ Summary:      High-performance and highly configurable RADIUS server
 Summary(pl.UTF-8):     Szybki i wysoce konfigurowalny serwer RADIUS
 Name:          freeradius-server
 Version:       2.1.7
-Release:       6
+Release:       7
 License:       GPL
 Group:         Networking/Daemons/Radius
 Source0:       ftp://ftp.freeradius.org/pub/radius/%{name}-%{version}.tar.bz2
@@ -23,6 +23,7 @@ Patch1:               %{name}-libdir.patch
 Patch2:                %{name}-makefile.patch
 Patch3:                %{name}-rundir.patch
 Patch4:                %{name}-heimdal.patch
+Patch5:                %{name}-rubyhdrs.patch
 URL:           http://www.freeradius.org/
 %{?with_firebird:BuildRequires:        Firebird-devel}
 BuildRequires: autoconf
@@ -210,17 +211,18 @@ Header files and libraries.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 # Keep it for future when ac/am regeneration will be ok
-#find -name 'configure.[ia][nc]' -type f | while read FILE; do
-#      cd $(dirname "$FILE")
-#      %{__libtoolize}
-#      %{__aclocal} -I $OLDPWD
-#      %{__autoconf}
-#      [ -f config.h.in ] && %{__autoheader}
-#      cd -
-#done
+find -name 'configure.[ia][nc]' -type f | while read FILE; do
+       cd $(dirname "$FILE")
+       %{__libtoolize}
+       %{__aclocal} -I $OLDPWD
+       %{__autoconf}
+       [ -f config.h.in ] && %{__autoheader}
+       cd -
+done
 
 %configure \
        --enable-strict-dependencies \