From 986308e8482e058b0266728f4fd8dd5e692682dc Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Nov 12 2012 20:38:54 +0000 Subject: Move examples to the -devel subpackage (#831434) --- diff --git a/pygobject3.spec b/pygobject3.spec index 475fed3..201ffeb 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -189,6 +189,13 @@ find $RPM_BUILD_ROOT -name '*.a' -delete chrpath --delete $RPM_BUILD_ROOT%{python_sitearch}/gi/{*.so,*/*.so} +# Don't include makefiles in the installed docs, in order to avoid creating +# multilib conflicts +rm -rf _docs +mkdir _docs +cp -a examples _docs +rm _docs/examples/Makefile* + %check %if %{with_check} @@ -220,8 +227,6 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %files %defattr(644, root, root, 755) %doc AUTHORS NEWS README COPYING -%doc examples - %{_libdir}/libpyglib-gi-2.0-python.so* %dir %{python_sitearch}/gi %{python_sitearch}/gi/* @@ -229,6 +234,7 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %files devel %defattr(644, root, root, 755) +%doc _docs/* %dir %{_includedir}/pygobject-3.0/ %{_includedir}/pygobject-3.0/pygobject.h %{_libdir}/pkgconfig/pygobject-3.0.pc @@ -237,8 +243,6 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %files -n python3-gobject %defattr(644, root, root, 755) %doc AUTHORS NEWS README COPYING -%doc examples - %{_libdir}/libpyglib-gi-2.0-python3.so* %dir %{python3_sitearch}/gi %{python3_sitearch}/gi/* @@ -249,6 +253,8 @@ xvfb-run make DESTDIR=$RPM_BUILD_ROOT check %{verbosity} %changelog * Mon Nov 12 2012 Kalev Lember - 3.4.2-2 - Remove lib64 rpaths (#817701) +- Move code examples to the -devel subpackage and fix the multilib + conflict (#831434) * Mon Nov 12 2012 Kalev Lember - 3.4.2-1 - Update to 3.4.2