From 2e19798320fd4a6533703752354cd19f9a5ee644 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Thu, 1 Dec 2011 15:19:10 -0500 Subject: [PATCH] Add patch to ignore --disable-silent-rules Package API docs into libtalloc-devel --- ...autoconf-disable-silent-rules-option.patch | 30 +++++++++++++++++++ libtalloc.spec | 24 +++++++++++++-- 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 0001-build-added-autoconf-disable-silent-rules-option.patch diff --git a/0001-build-added-autoconf-disable-silent-rules-option.patch b/0001-build-added-autoconf-disable-silent-rules-option.patch new file mode 100644 index 0000000..0fc3ad6 --- /dev/null +++ b/0001-build-added-autoconf-disable-silent-rules-option.patch @@ -0,0 +1,30 @@ +From 6af702bdc9ea36a1f33232a818a819afde9bc4d2 Mon Sep 17 00:00:00 2001 +From: Sumit Bose +Date: Thu, 6 Oct 2011 10:32:58 +0200 +Subject: [PATCH] build: added autoconf --disable-silent-rules option +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Günther Deschner +--- + buildtools/wafsamba/wscript | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript +index 1a7f3eb69974625e903f314c6c7b92547063e884..5c5e249758c36a64083499b9050c0c4e77c87b6d 100755 +--- a/buildtools/wafsamba/wscript ++++ b/buildtools/wafsamba/wscript +@@ -162,6 +162,9 @@ def set_options(opt): + opt.add_option('--disable-dependency-tracking', + help=SUPPRESS_HELP, + action='store_true', dest='AUTOCONF_DISABLE_DEPENDENCY_TRACKING', default=False) ++ opt.add_option('--disable-silent-rules', ++ help=SUPPRESS_HELP, ++ action='store_true', dest='AUTOCONF_DISABLE_SILENT_RULES', default=False) + + gr = opt.option_group('dist options') + gr.add_option('--sign-release', +-- +1.7.7.3 + diff --git a/libtalloc.spec b/libtalloc.spec index 333fe5a..2379e09 100644 --- a/libtalloc.spec +++ b/libtalloc.spec @@ -6,7 +6,7 @@ Name: libtalloc Version: 2.0.7 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Daemons Summary: The talloc library License: LGPLv3+ @@ -18,10 +18,13 @@ BuildRequires: autoconf BuildRequires: libxslt BuildRequires: docbook-style-xsl BuildRequires: python-devel +BuildRequires: doxygen Provides: bundled(libreplace) # Patches +Patch1001: 0001-build-added-autoconf-disable-silent-rules-option.patch + %description A library that implements a hierarchical allocator with destructors. @@ -54,9 +57,17 @@ Development libraries for pytalloc %prep %setup -q -n talloc-%{version} +%patch1001 -p1 + %build -%configure --disable-rpath --bundled-libraries=NONE --builtin-libraries=replace +%configure --disable-rpath \ + --disable-rpath-install \ + --bundled-libraries=NONE \ + --builtin-libraries=replace \ + --disable-silent-rules + make %{?_smp_mflags} V=1 +doxygen doxy.config %install rm -rf $RPM_BUILD_ROOT @@ -70,6 +81,9 @@ find $RPM_BUILD_ROOT -name "*.so*" -exec chmod -c +x {} \; rm -f $RPM_BUILD_ROOT%{_libdir}/libtalloc.a rm -f $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i +# Install API docs +cp -a doc/man/* $RPM_BUILD_ROOT/%{_mandir} + %clean rm -rf $RPM_BUILD_ROOT @@ -82,7 +96,7 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/talloc.h %{_libdir}/libtalloc.so %{_libdir}/pkgconfig/talloc.pc -%{_mandir}/man3/talloc.3.gz +%{_mandir}/man3/talloc*.3.gz %files -n pytalloc %defattr(-,root,root,-) @@ -103,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT %postun -n pytalloc -p /sbin/ldconfig %changelog +* Thu Dec 01 2011 Stephen Gallagher - 2.0.7-3 +- Add patch to ignore --disable-silent-rules +- Package API docs into libtalloc-devel + * Wed Nov 23 2011 Stephen Gallagher - 2.0.7-2 - Add explicit mention of the bundled libreplace - https://fedorahosted.org/fpc/ticket/120