[libICE] Fix duplicate documentation (#1001256) by not using %doc
Michael Schwendt
mschwendt at fedoraproject.org
Fri Dec 13 20:30:15 UTC 2013
commit 19fddf751c2c7f57e18f370b3bd36783374c378d
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Fri Dec 13 21:30:19 2013 +0100
Fix duplicate documentation (#1001256) by not using %doc
- Turn on verbose build output via V=1 make
- Use %?_isa in -devel base package dep
libICE.spec | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/libICE.spec b/libICE.spec
index bb19824..789c109 100644
--- a/libICE.spec
+++ b/libICE.spec
@@ -20,7 +20,7 @@ The X.Org X11 ICE (Inter-Client Exchange) runtime library.
%package devel
Summary: X.Org X11 ICE development package
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The X.Org X11 ICE (Inter-Client Exchange) development package.
@@ -31,7 +31,7 @@ The X.Org X11 ICE (Inter-Client Exchange) development package.
%build
autoreconf -v --install --force
%configure --disable-static
-make %{?_smp_mflags}
+V=1 make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
@@ -41,6 +41,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# adding to installed docs in order to avoid using %%doc magic
+for f in AUTHORS ChangeLog COPYING ; do
+ cp -p $f ${RPM_BUILD_ROOT}%{_docdir}/%{name}/${f}
+done
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -48,19 +53,26 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig
%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
%{_libdir}/libICE.so.6
%{_libdir}/libICE.so.6.3.0
+# not using %%doc because of side-effect (#1001256)
+%dir %{_docdir}/%{name}
+%{_docdir}/%{name}/AUTHORS
+%{_docdir}/%{name}/ChangeLog
+%{_docdir}/%{name}/COPYING
%files devel
-%defattr(-,root,root,-)
-%{_docdir}/%{name}
+%{_docdir}/%{name}/*.xml
%{_includedir}/X11/ICE
%{_libdir}/libICE.so
%{_libdir}/pkgconfig/ice.pc
%changelog
+* Fri Dec 13 2013 Michael Schwendt <mschwendt at fedoraproject.org> - 1.0.8-6
+- Fix duplicate documentation (#1001256) by not using %%doc
+- Turn on verbose build output via V=1 make
+- Use %%?_isa in -devel base package dep
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
More information about the scm-commits
mailing list