[libprelude/f15] Fix gcc 4.6 C++ bug (#715983)
Steve Grubb
sgrubb at fedoraproject.org
Fri Jun 24 18:21:09 UTC 2011
commit 61d59337cb14d3efc8e1064804424a20505ed6ea
Author: Steve <sgrubb at redhat.com>
Date: Fri Jun 24 14:20:51 2011 -0400
Fix gcc 4.6 C++ bug (#715983)
libprelude-1.0.0-gcc46.patch | 12 ++++++++++++
libprelude.spec | 26 ++++++++++++++++++++------
2 files changed, 32 insertions(+), 6 deletions(-)
---
diff --git a/libprelude-1.0.0-gcc46.patch b/libprelude-1.0.0-gcc46.patch
new file mode 100644
index 0000000..58caadb
--- /dev/null
+++ b/libprelude-1.0.0-gcc46.patch
@@ -0,0 +1,12 @@
+diff -urp libprelude-1.0.0.orig/bindings/c++/include/prelude.hxx libprelude-1.0.0/bindings/c++/include/prelude.hxx
+--- libprelude-1.0.0.orig/bindings/c++/include/prelude.hxx 2011-06-24 12:58:29.000000000 -0400
++++ libprelude-1.0.0/bindings/c++/include/prelude.hxx 2011-06-24 12:59:01.000000000 -0400
+@@ -26,6 +26,8 @@
+ #ifndef _LIBPRELUDE_PRELUDE_HXX
+ #define _LIBPRELUDE_PRELUDE_HXX
+
++#include <stddef.h>
++
+ #include "prelude-client.hxx"
+ #include "prelude-client-easy.hxx"
+ #include "prelude-connection.hxx"
diff --git a/libprelude.spec b/libprelude.spec
index ea07c7a..9541fad 100644
--- a/libprelude.spec
+++ b/libprelude.spec
@@ -6,12 +6,13 @@
Name: libprelude
Epoch: 1
Version: 1.0.0
-Release: 6%{?dist}
+Release: 9%{?dist}
Summary: The prelude library
Group: System Environment/Libraries
License: GPLv2+
URL: http://prelude-ids.org/
Source0: http://www.prelude-ids.org/download/releases/%{name}/%{name}-%{version}.tar.gz
+Patch1: libprelude-1.0.0-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gnutls-devel, python-devel, ruby, ruby-devel, lua-devel
@@ -68,6 +69,7 @@ Ruby bindings for libprelude.
%prep
%setup -q
+%patch1 -p1
%build
%configure --disable-static \
@@ -97,6 +99,9 @@ rm -f %{buildroot}%{ruby_sitearch}/PreludeEasy.la
chmod +w %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
chrpath -d %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
chmod -w %{buildroot}%{perl_vendorarch}/auto/Prelude/Prelude.so
+chmod +w %{buildroot}%{perl_vendorarch}/auto/PreludeEasy/PreludeEasy.so
+chrpath -d %{buildroot}%{perl_vendorarch}/auto/PreludeEasy/PreludeEasy.so
+chmod -w %{buildroot}%{perl_vendorarch}/auto/PreludeEasy/PreludeEasy.so
# Fix time stamp for both 32 and 64 bit libraries
touch -r ./configure.in %{buildroot}%{_sysconfdir}/prelude/default/*
@@ -109,7 +114,7 @@ rm -rf %{buildroot}
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/prelude-admin
%{_bindir}/prelude-adduser
%{_libdir}/*.so.*
@@ -120,7 +125,7 @@ rm -rf %{buildroot}
%doc %{_defaultdocdir}/%{name}-%{version}/*
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_bindir}/libprelude-config
%{_libdir}/*.so
%{_libdir}/pkgconfig/libprelude.pc
@@ -129,19 +134,28 @@ rm -rf %{buildroot}
%{_datadir}/aclocal/libprelude.m4
%files python
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{python_sitearch}/*
%files perl
-%defattr(0755,root,root)
+%defattr(0755,root,root,-)
%attr(0644,root,root) %{perl_vendorarch}/Prelude*.pm
%{perl_vendorarch}/auto/Prelude*/
%files ruby
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{ruby_sitearch}/PreludeEasy.so
%changelog
+* Fri Jun 24 2011 Steve Grubb <sgrubb at redhat.com> - 1:1.0.0-9
+- Fix gcc 4.6 C++ bug (#715983)
+
+* Fri Jun 17 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:1.0.0-8
+- Perl mass rebuild
+
+* Thu Jun 09 2011 Marcela Mašláňová <mmaslano at redhat.com> - 1:1.0.0-7
+- Perl 5.14 mass rebuild
+
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
More information about the scm-commits
mailing list