packages: gtk+3/gtk+3.spec - move demo to -examples, package more demos as ...

[glen]

Author: glen                         Date: Thu Mar 24 20:26:36 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move demo to -examples, package more demos as well

---- Files affected:
packages/gtk+3:
   gtk+3.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: packages/gtk+3/gtk+3.spec
diff -u packages/gtk+3/gtk+3.spec:1.31 packages/gtk+3/gtk+3.spec:1.32
--- packages/gtk+3/gtk+3.spec:1.31	Thu Mar 24 00:12:28 2011
+++ packages/gtk+3/gtk+3.spec	Thu Mar 24 21:26:31 2011
@@ -221,6 +221,12 @@
 %prep
 %setup -q -n gtk+-%{version}
 
+# for packaging clean examples
+# TODO: add am patch to do it like demos/gtk-demo via some configurable dir
+# NOTE: make install so far installs only demos/gtk-demo
+install -d _examples
+cp -a demos examples _examples
+
 %build
 %{__rm} m4/introspection.m4
 %{?with_apidocs:%{__gtkdocize}}
@@ -241,20 +247,22 @@
 	--enable-xinput \
 	--enable-xkb \
 	--enable-xinerama
-%{__make}
+%{__make} \
+	democodedir=%{_examplesdir}/%{name}-%{version}/demos/gtk-demo
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 install -d $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/engines
 install -d $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/theming-engines
 
 %{__make} install \
+	democodedir=%{_examplesdir}/%{name}-%{version}/demos/gtk-demo \
 	DESTDIR=$RPM_BUILD_ROOT
 
 touch $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{abivers}/gtk.immodules
 
-cp -r examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
+cp -a _examples/* $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 # shut up check-files (static modules and *.la for modules)
 %{__rm} -r $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/modules/*.la \
@@ -301,7 +309,6 @@
 %defattr(644,root,root,755)
 %doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/gtk-query-immodules-3.0%{pqext}
-%attr(755,root,root) %{_bindir}/gtk3-demo
 %attr(755,root,root) %{_libdir}/libgailutil-3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgailutil-3.so.0
 %attr(755,root,root) %{_libdir}/libgdk-3.so.*.*.*
@@ -337,9 +344,6 @@
 %{_libdir}/girepository-1.0/GdkX11-3.0.typelib
 %{_libdir}/girepository-1.0/Gtk-3.0.typelib
 
-## XXX: just demo data - move to examples?
-%{_datadir}/gtk-3.0
-
 %dir %{_sysconfdir}/gtk-3.0
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/gtk-3.0/im-multipress.conf
 %{_datadir}/glib-2.0/schemas/org.gtk.Settings.FileChooser.gschema.xml
@@ -395,6 +399,7 @@
 
 %files examples
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gtk3-demo
 %{_examplesdir}/%{name}-%{version}
 
 %if %{with cups}
@@ -409,6 +414,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2011/03/24 20:26:31  glen
+- move demo to -examples, package more demos as well
+
 Revision 1.31  2011/03/23 23:12:28  megabajt
 - updated to 3.0.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gtk+3/gtk+3.spec?r1=1.31&r2=1.32&f=u