Fix duplicate documentation (#1001256) by not using %doc

- Turn on verbose build output via V=1 make
- Use %?_isa in -devel base package dep
This commit is contained in:
Michael Schwendt 2013-12-13 21:30:19 +01:00
parent 89eb085813
commit 19fddf751c

View File

@ -20,7 +20,7 @@ The X.Org X11 ICE (Inter-Client Exchange) runtime library.
%package devel %package devel
Summary: X.Org X11 ICE development package Summary: X.Org X11 ICE development package
Group: Development/Libraries Group: Development/Libraries
Requires: %{name} = %{version}-%{release} Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel %description devel
The X.Org X11 ICE (Inter-Client Exchange) development package. 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 %build
autoreconf -v --install --force autoreconf -v --install --force
%configure --disable-static %configure --disable-static
make %{?_smp_mflags} V=1 make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -41,6 +41,11 @@ make install DESTDIR=$RPM_BUILD_ROOT
# We intentionally don't ship *.la files # We intentionally don't ship *.la files
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la 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 %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -48,19 +53,26 @@ rm -rf $RPM_BUILD_ROOT
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog
%{_libdir}/libICE.so.6 %{_libdir}/libICE.so.6
%{_libdir}/libICE.so.6.3.0 %{_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 %files devel
%defattr(-,root,root,-) %{_docdir}/%{name}/*.xml
%{_docdir}/%{name}
%{_includedir}/X11/ICE %{_includedir}/X11/ICE
%{_libdir}/libICE.so %{_libdir}/libICE.so
%{_libdir}/pkgconfig/ice.pc %{_libdir}/pkgconfig/ice.pc
%changelog %changelog
* Fri Dec 13 2013 Michael Schwendt <mschwendt@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@lists.fedoraproject.org> - 1.0.8-6 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild