Author: jwrdegoede Update of /cvs/free/rpms/libmimic/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv24208 Modified Files: .cvsignore libmimic.spec sources Log Message: * Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.0.4-4 - Fix multilib conflict in -devel package (rf858) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/libmimic/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 11 Aug 2009 19:05:36 -0000 1.2 +++ .cvsignore 7 Nov 2009 14:58:28 -0000 1.3 @@ -1 +1,2 @@ +libmimic-1.0.4-pregenerated-docs.tar.gz libmimic-1.0.4.tar.gz Index: libmimic.spec =================================================================== RCS file: /cvs/free/rpms/libmimic/devel/libmimic.spec,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- libmimic.spec 11 Aug 2009 19:05:36 -0000 1.1 +++ libmimic.spec 7 Nov 2009 14:58:28 -0000 1.2 @@ -1,11 +1,16 @@ Name: libmimic Version: 1.0.4 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Encoding/decoding library for Mimic V2.x Group: System Environment/Libraries License: LGPLv2+ URL: http://farsight.sourceforge.net/ Source0: http://downloads.sourceforge.net/farsight/%{name}-%{version}.tar.gz +# To regenerate: +# make <arch> +# cd libmimic-%{version}/doc/api +# tar cvfz ../../../libmimic-%{version}-pregenerated-docs.tar.gz html +Source1: libmimic-%{version}-pregenerated-docs.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: doxygen glib2-devel @@ -26,7 +31,7 @@ %prep -%setup -q +%setup -q -a 1 %build @@ -56,13 +61,16 @@ %files devel %defattr(-,root,root,-) -%doc doc/api/html +%doc html %{_includedir}/* %{_libdir}/*.so %{_libdir}/pkgconfig/libmimic.pc %changelog +* Sat Nov 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.0.4-4 +- Fix multilib conflict in -devel package (rf858) + * Fri Aug 7 2009 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 1.0.4-3 - Actually link to glib-2.0 not the ancient glib (issue caused by the undefined-non-weak-symbol fix) (rf487) Index: sources =================================================================== RCS file: /cvs/free/rpms/libmimic/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 11 Aug 2009 19:05:36 -0000 1.2 +++ sources 7 Nov 2009 14:58:28 -0000 1.3 @@ -1 +1,2 @@ +88aa1e3d03b3b7dd847743bd8df4988b libmimic-1.0.4-pregenerated-docs.tar.gz 94f0dbb1d3c253201553a4069555fb84 libmimic-1.0.4.tar.gz