rpms/libvorbis/devel libvorbis.spec,1.28,1.29
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Sun Oct 21 17:24:05 UTC 2007
Author: jwrdegoede
Update of /cvs/extras/rpms/libvorbis/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14331
Modified Files:
libvorbis.spec
Log Message:
* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:1.2.0-2
- Don't include Makefile's in %doc, avoiding a multilib conflict (bz 342481)
Index: libvorbis.spec
===================================================================
RCS file: /cvs/extras/rpms/libvorbis/devel/libvorbis.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- libvorbis.spec 15 Oct 2007 19:52:25 -0000 1.28
+++ libvorbis.spec 21 Oct 2007 17:23:31 -0000 1.29
@@ -1,7 +1,7 @@
Summary: The Vorbis General Audio Compression Codec.
Name: libvorbis
Version: 1.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Epoch: 1
Group: System Environment/Libraries
License: BSD
@@ -51,6 +51,9 @@
# remove unpackaged files from the buildroot
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+# create a cleaned up (Makefile free) copy of doc for -devel %doc
+cp -a doc _doc
+rm `find _doc -name 'Makefile*'`
%files
@@ -62,7 +65,7 @@
%files devel
%defattr(-,root,root)
-%doc doc/*
+%doc _doc/*
%{_includedir}/vorbis
%{_libdir}/libvorbis.so
%{_libdir}/libvorbisfile.so
@@ -78,6 +81,9 @@
%postun -p /sbin/ldconfig
%changelog
+* Sun Oct 21 2007 Hans de Goede <j.w.r.degoede at hhs.nl> - 1:1.2.0-2
+- Don't include Makefile's in %doc, avoiding a multilib conflict (bz 342481)
+
* Mon Oct 15 2007 Behdad Esfahbod <besfahbo at redhat.com> - 1:1.2.0-1
- Update to 1.2.0
- Resolves: #250115
More information about the fedora-extras-commits
mailing list