rpms/compiz/devel .cvsignore, 1.3, 1.4 compiz.spec, 1.14, 1.15 sources, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: sandmann

Update of /cvs/dist/rpms/compiz/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5832

Modified Files:
	.cvsignore compiz.spec sources 
Log Message:

* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
- Add 'desktop effects' dialog box.




Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	21 Jul 2006 18:59:46 -0000	1.3
+++ .cvsignore	3 Aug 2006 00:10:39 -0000	1.4
@@ -1 +1,2 @@
 compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
+desktop-effects-0.6.tar.gz


Index: compiz.spec
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/compiz.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- compiz.spec	31 Jul 2006 15:48:57 -0000	1.14
+++ compiz.spec	3 Aug 2006 00:10:39 -0000	1.15
@@ -8,7 +8,7 @@
 License:        X11/MIT/GPL
 Group:          User Interface/Desktops
 Version:        0.0.13
-Release:        0.12.%{snapshot}git.fc5.aiglx
+Release:        0.13.%{snapshot}git.fc5.aiglx
 
 Summary:        OpenGL window and compositing manager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -29,6 +29,7 @@
 BuildRequires:  gettext
 
 Source0:        %{name}-%{sha1}.tar.bz2
+Source1:	desktop-effects-0.6.tar.gz
 
 Patch100: gl-include-inferiors.patch
 Patch101: aiglx-defaults.patch
@@ -61,6 +62,7 @@
 windows and compositing manager.
 
 %prep
+%setup -q -T -b1 -n desktop-effects-0.6
 %setup -q -n %{name}-%{sha1}
 
 %patch100 -p1 -b .gl-include-inferiors
@@ -76,11 +78,22 @@
 
 make %{?_smp_mflags} 
 
+# desktop-effects
+cd ../desktop-effects-0.6
+%configure 
+make
+
+
 %install
 rm -rf $RPM_BUILD_ROOT
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install || exit 1
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+
+echo INSTALLING DESKTOP EFFECTS
+cd ../desktop-effects-0.6
+make DESTDIR=$RPM_BUILD_ROOT install || exit 1
+
 find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
 
@@ -110,6 +123,9 @@
 %{_datadir}/compiz/*.png
 %{_datadir}/gnome/wm-properties/compiz.desktop
 %{_datadir}/locale/*/LC_MESSAGES/compiz.mo
+%{_bindir}/desktop-effects
+%{_datadir}/compiz/desktop-effects.glade
+%{_datadir}/applications/desktop-effects.desktop
 
 %files devel
 %defattr(-, root, root)
@@ -117,6 +133,9 @@
 %{_includedir}/compiz
 
 %changelog
+* Wed Aug  2 2006 Soren Sandmann <sandmann at redhat.com> 0.0.13-0.13.20060721git.fc5.aiglx
+- Add 'desktop effects' dialog box.
+
 * Mon Jul 31 2006 Kristian Høgsberg <krh at redhat.com> 0.0.13-0.12.20060721git.fc5.aiglx
 - Add libwnck requires.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/compiz/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	21 Jul 2006 18:59:46 -0000	1.3
+++ sources	3 Aug 2006 00:10:39 -0000	1.4
@@ -1 +1,2 @@
 16382b2db6ffc65161a6edc70559ee67  compiz-fc6b7773fc52f6104b66a9f86c18395f8a958848.tar.bz2
+101df08c0adb11640e512db33165acf4  desktop-effects-0.6.tar.gz