- fix building perl bindings with recent perl

[packages/libprelude.git] / libprelude.spec

diff --git a/libprelude.spec b/libprelude.spec
index b725dcac2b6922a542c80c6ed599c7bf95bb845f..7e2eb0c80bb8bd821c1db7bebaae1a3a585d909b 100644 (file)
--- a/libprelude.spec
+++ b/libprelude.spec
@@ -10,7 +10,7 @@ Summary:      The Prelude library
 Summary(pl.UTF-8):     Biblioteka Prelude
 Name:          libprelude
 Version:       1.0.1
-Release:       1
+Release:       6
 License:       GPL v2 or commercial
 Group:         Libraries
 # https://www.prelude-ids.org/projects/prelude/files
@@ -21,6 +21,7 @@ Patch1:               %{name}-ruby.patch
 Patch2:                %{name}-gnutls.patch
 Patch3:                %{name}-gets.patch
 Patch4:                %{name}-python.patch
+Patch5:                format-security.patch
 URL:           http://www.prelude-ids.com/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -229,10 +230,15 @@ PreludeEasy - dowiązania języka Ruby do libprelude.
 %{__rm} bindings/ruby/PreludeEasy.cxx
 %patch1 -p1
 %endif
+%if %{with perl}
+# regenerate with fresh swig for perl 5.20
+%{__rm} bindings/low-level/perl/Prelude.c
+%endif
 
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 sed -i -e 's/lua >= 5.1/lua51 >= 5.1/' configure.in
 
@@ -243,6 +249,7 @@ sed -i -e 's/lua >= 5.1/lua51 >= 5.1/' configure.in
 %{__autoheader}
 %{__automake}
 %configure \
+       am_cv_ruby_rbexecdir=%{ruby_vendorarchdir} \
        --enable-gtk-doc \
        --enable-static \
        --with%{!?with_lua:out}-lua \
@@ -253,17 +260,21 @@ sed -i -e 's/lua >= 5.1/lua51 >= 5.1/' configure.in
 
 %{__make}
 
+cd bindings/perl
+%{__make} clean
+%{__perl} Makefile.PL \
+        INSTALLDIRS=vendor \
+%{__make}
+
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%if %{with perl}
-# missing from make install
-[ ! -f $RPM_BUILD_ROOT%{perl_vendorarch}/PreludeEasy.pm ] || exit 1
-cp -p bindings/perl/PreludeEasy.pm $RPM_BUILD_ROOT%{perl_vendorarch}
-%endif
+%{__make} -C bindings/perl install \
+       DESTDIR=$RPM_BUILD_ROOT
+
 %if %{with lua}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/PreludeEasy.{la,a}
 %endif
@@ -273,7 +284,7 @@ cp -p bindings/perl/PreludeEasy.pm $RPM_BUILD_ROOT%{perl_vendorarch}
 %py_postclean
 %endif
 %if %{with ruby}
-%{__rm} $RPM_BUILD_ROOT%{ruby_sitearchdir}/PreludeEasy.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{ruby_vendorarchdir}/PreludeEasy.{la,a}
 %endif
 
 %clean
@@ -346,14 +357,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{perl_vendorarch}/Prelude.pm
 %dir %{perl_vendorarch}/auto/Prelude
-%{perl_vendorarch}/auto/Prelude/Prelude.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/Prelude/Prelude.so
 
 %files -n perl-PreludeEasy
 %defattr(644,root,root,755)
 %{perl_vendorarch}/PreludeEasy.pm
 %dir %{perl_vendorarch}/auto/PreludeEasy
-%{perl_vendorarch}/auto/PreludeEasy/PreludeEasy.bs
 %attr(755,root,root) %{perl_vendorarch}/auto/PreludeEasy/PreludeEasy.so
 %endif
 
@@ -374,5 +383,5 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with ruby}
 %files -n ruby-prelude
 %defattr(644,root,root,755)
-%attr(755,root,root) %{ruby_sitearchdir}/PreludeEasy.so
+%attr(755,root,root) %{ruby_vendorarchdir}/PreludeEasy.so
 %endif