[libprelude] Add provides bundled gnulib

Steve Grubb sgrubb at fedoraproject.org
Thu Sep 6 13:22:27 UTC 2012


commit 9cdeabb222972227838b14b5a3f47b784c6c64f5
Author: Steve <sgrubb at redhat.com>
Date:   Thu Sep 6 09:22:24 2012 -0400

    Add provides bundled gnulib

 libprelude.spec |   26 +++++++++-----------------
 1 files changed, 9 insertions(+), 17 deletions(-)
---
diff --git a/libprelude.spec b/libprelude.spec
index ff55135..e3d360e 100644
--- a/libprelude.spec
+++ b/libprelude.spec
@@ -1,27 +1,30 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
-#%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')}
 
 
 Name:		libprelude
 Epoch:		1
 Version:	1.0.0
-Release:	15%{?dist}
+Release:	16%{?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
+# This patch is required to get it to build on newer compilers
 Patch1:		libprelude-1.0.0-gcc46.patch
 # Adjust bundled gnulib to pass compilation with glibc-2.16.6, bug #839602
 Patch2:		libprelude-1.0.0-Fix-building-with-glibc-2.16.6.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gnutls-devel, python-devel, lua-devel
-#BuildRequires: ruby, ruby-devel
 BuildRequires:	swig chrpath
 # For libprelude-1.0.0-Fix-building-with-glibc-2.16.6.patch:
 BuildRequires:  autoconf, automake
+# This package uses gnulib. It was granted an exception
+# https://fedorahosted.org/fpc/ticket/174
+Provides: bundled(gnulib)
+
 
 %description
 Libprelude is a library that guarantees secure connections between
@@ -63,15 +66,6 @@ Requires:	perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 %description perl
 Perl bindings for libprelude.
 
-#%package ruby
-#Summary:	Ruby bindings for libprelude
-#Group:		System Environment/Libraries
-#Requires:	libprelude = %{epoch}:%{version}-%{release}
-#Requires:	ruby(abi) = 1.9
-#
-#%description ruby
-#Ruby bindings for libprelude.
-
 %prep
 %setup -q
 %patch1 -p1
@@ -104,7 +98,6 @@ chmod 755 %{buildroot}%{python_sitearch}/_prelude.so
 find %{buildroot} -type f \( -name .packlist -o -name perllocal.pod \) -exec rm -f {} ';'
 find %{buildroot} -type f -name '*.bs' -a -size 0 -exec rm -f {} ';'
 rm -f %{buildroot}%{_libdir}/*.la
-#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
@@ -151,11 +144,10 @@ rm -rf %{buildroot}
 %attr(0644,root,root) %{perl_vendorarch}/Prelude*.pm
 %{perl_vendorarch}/auto/Prelude*/
 
-#%files ruby
-#%defattr(-,root,root,-)
-#%{ruby_sitearch}/PreludeEasy.so
-
 %changelog
+* Thu Sep 06 2012 Steve Grubb <sgrubb at redhat.com> - 1:1.0.0-16
+- Add provides bundled gnulib
+
 * Wed Aug 08 2012 Petr Pisar <ppisar at redhat.com> - 1:1.0.0-15
 - Fix building with glibc-2.16.6 (bug #839602)
 


More information about the scm-commits mailing list