X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=compiz.spec;h=f327c73db3a81735cbcacdf5bc2de4c5b4d1fbd3;hb=a4b9b1ee1c9673c80880f219edd283532a5b28e6;hp=4c1b22518b157de43fa214e0fdeab20545b969bc;hpb=28b885b7ec3d5f3cf615ae9f578c098580981a8c;p=packages%2Fcompiz.git

diff --git a/compiz.spec b/compiz.spec
index 4c1b225..f327c73 100644
--- a/compiz.spec
+++ b/compiz.spec
@@ -4,27 +4,31 @@
 %bcond_without	gtk		# gtk window decorator
 %bcond_without	gnome		# gnome settings module
 %bcond_without	metacity	# metacity theme support
-%bcond_without	kde		# kde-window-decorator
+%bcond_with	kde		# kde-window-decorator and kconfig
+%bcond_without	kde4		# kde4-window-decorator
 #
 Summary:	OpenGL window and compositing manager
 Summary(pl.UTF-8):	OpenGL-owy zarządca okien i składania
 Name:		compiz
-Version:	0.5.4
+# note that even versions are STABLE
+Version:	0.8.4
 Release:	2
 License:	GPL or MIT
 Group:		X11/Applications
-Source0:	http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.gz
-# Source0-md5:	04f88b85c15e02b4bd11cb9c2706707f
-Patch0:		%{name}-DESTDIR.patch
-URL:		http://xorg.freedesktop.org/
+Source0:	http://releases.compiz.org/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	03fa78ce0c464f3a413b2a3b74f09559
+Patch0:		%{name}-kde4.patch
+URL:		http://www.compiz.org/
 %if %{with gconf} || %{with gtk}
 BuildRequires:	GConf2-devel >= 2.0
 %endif
-BuildRequires:	Mesa-libGL-devel >= 6.5-1.20060411.2
+BuildRequires:	OpenGL-GLU-devel
+BuildRequires:	OpenGL-devel >= 2.1
 BuildRequires:	autoconf >= 2.57
-BuildRequires:	automake
+BuildRequires:	automake >= 1:1.7
 BuildRequires:	cairo-devel >= 1.0
-BuildRequires:	dbus-devel >= 0.35
+BuildRequires:	dbus-glib-devel
+BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 2.0
 # <sys/inotify.h>
 BuildRequires:	glibc-devel >= 6:2.4
@@ -34,6 +38,9 @@ BuildRequires:	libpng-devel
 BuildRequires:	librsvg-devel >= 1:2.14.0
 BuildRequires:	libtool
 BuildRequires:	libxcb-devel
+BuildRequires:	libxml2-devel
+BuildRequires:	libxslt-devel
+BuildRequires:	libxslt-progs
 BuildRequires:	pkgconfig
 BuildRequires:	startup-notification-devel >= 0.7
 BuildRequires:	xorg-lib-libSM-devel
@@ -41,48 +48,56 @@ BuildRequires:	xorg-lib-libXcomposite-devel
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXinerama-devel
 BuildRequires:	xorg-lib-libXrandr-devel
+BuildRequires:	xorg-lib-libXrender-devel >= 0.9.3
 BuildRequires:	xorg-lib-libXres-devel
 %if %{with gtk}
 BuildRequires:	gtk+2-devel >= 2:2.8.0
-BuildRequires:	libwnck-devel >= 2.18.1
-BuildRequires:	pango-devel >= 1.10.0
-BuildRequires:	xorg-lib-libXrender-devel >= 0.9.3
+BuildRequires:	libwnck-devel >= 2.20.0
 %if %{with gnome}
-BuildRequires:	control-center-devel >= 2.0
+BuildRequires:	gnome-control-center-devel >= 2.0
 BuildRequires:	gnome-desktop-devel >= 2.0
 BuildRequires:	gnome-menus-devel
 %endif
 %if %{with metacity}
-BuildRequires:	metacity-devel >= 2.17.0
+BuildRequires:	metacity-devel >= 2.24.0
 %endif
 %endif
 %if %{with kde}
 BuildRequires:	dbus-qt-devel
-BuildRequires:	kdelibs-devel
 BuildRequires:	kdebase-devel
+BuildRequires:	kdelibs-devel
 BuildRequires:	qt-devel >= 1:3.0
 %endif
+%if %{with kde4}
+BuildRequires:	kde4-kdebase-workspace-devel
+BuildRequires:	kde4-kdelibs-devel
+BuildRequires:	qt4-build
+%endif
 Requires:	%{name}-libs = %{version}-%{release}
-Obsoletes:	beryl-core
 Obsoletes:	compiz-opacity
+Conflicts:	filesystem < 3.0-20
 Conflicts:	xorg-xserver-xgl < 0.0.20060505
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+# for gconf subpackage
+%define	plugins annotate blur clone core cube dbus decoration fade fs gconf glib gnomecompat ini inotify minimize move obs place png regex resize rotate scale screenshot svg switcher video water wobbly zoom
+
 %description
 Compiz is a compositing window manager that uses 3D graphics
-acceleration via OpenGL. It provides various new graphical effects
-and features on any desktop environment, including Gnome and KDE.
+acceleration via OpenGL. It provides various new graphical effects and
+features on any desktop environment, including Gnome and KDE.
 
 %description -l pl.UTF-8
 Compiz jest menedżerem okien obsługującym składanie, który używa
 akceleracji grafiki 3D przez OpenGL-a. Umożliwia on uzyskanie nowych
-efektów graficznych i możliwości w dowolnym środowisku, nie
-wyłączając Gnome i KDE.
+efektów graficznych i możliwości w dowolnym środowisku, nie wyłączając
+Gnome i KDE.
 
 %package libs
 Summary:	Compiz libraries
 Summary(pl.UTF-8):	Biblioteki compiza
 Group:		X11/Applications
+Obsoletes:	beryl-core
 Conflicts:	compiz < 0.5.2-2
 
 %description libs
@@ -99,6 +114,7 @@ Requires:	%{name}-libs = %{version}-%{release}
 # (by compiz.pc; header requires only: OpenGL-devel, startup-notification-devel, damageproto, xextproto, libX11-devel)
 Requires:	OpenGL-devel
 Requires:	libpng-devel
+Requires:	libxslt-devel
 Requires:	startup-notification-devel >= 0.7
 Requires:	xorg-lib-libSM-devel
 Requires:	xorg-lib-libXcomposite-devel
@@ -140,16 +156,28 @@ GConf plugin for Compiz (GConf control backend).
 Wtyczka GConf dla Compiza (backend sterujący oparty na GConfie).
 
 %package kconfig
-Summary:	Kconfig plugin for Compiz
-Summary(pl.UTF-8):	Wtyczka Kconfig dla Compiza
+Summary:	kconfig plugin for Compiz
+Summary(pl.UTF-8):	Wtyczka kconfig dla Compiza
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
 
 %description kconfig
-Kconfig plugin for Compiz (Kconfig control backend).
+kconfig plugin for Compiz (KDE control backend).
 
 %description kconfig -l pl.UTF-8
-Wtyczka Kconfig dla Compiza (backend sterujący oparty na Kconfigu).
+Wtyczka kconfig dla Compiza (backend sterujący oparty na KDE).
+
+%package svg
+Summary:	SVG plugin for Compiz
+Summary(pl.UTF-8):	Wtyczka SVG dla Compiza
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+
+%description svg
+SVG image loader plugin for Compiz.
+
+%description svg -l pl.UTF-8
+Wtyczka wczytująca obrazy SVG dla Compiza.
 
 %package gnome-settings
 Summary:	Compiz settings for GNOME control panel
@@ -172,6 +200,7 @@ Requires(post,preun):	GConf2
 %endif
 Requires:	%{name} = %{version}-%{release}
 Obsoletes:	compiz-gnome-decorator
+Obsoletes:	heliodor
 
 %description gtk-decorator
 Window decorator for GTK+.
@@ -184,6 +213,7 @@ Summary:	Window decorator for KDE
 Summary(pl.UTF-8):	Dekorator okien dla KDE
 Group:		X11/Applications
 Requires:	%{name} = %{version}-%{release}
+Obsoletes:	aquamarine
 
 %description kde-decorator
 Window decorator for KDE.
@@ -191,9 +221,22 @@ Window decorator for KDE.
 %description kde-decorator -l pl.UTF-8
 Dekorator okien dla KDE.
 
+%package kde4-decorator
+Summary:	Window decorator for KDE 4
+Summary(pl.UTF-8):	Dekorator okien dla KDE 4
+Group:		X11/Applications
+Requires:	%{name} = %{version}-%{release}
+Obsoletes:	aquamarine
+
+%description kde4-decorator
+Window decorator for KDE 4.
+
+%description kde4-decorator -l pl.UTF-8
+Dekorator okien dla KDE 4.
+
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p0
 
 %build
 %{__intltoolize}
@@ -203,6 +246,7 @@ Dekorator okien dla KDE.
 %{__autoheader}
 %{__automake}
 QTLIB=%{_libdir}; export QTLIB
+QTDIR=%{_prefix}; export QTDIR
 %configure \
 	--disable-static \
 	--enable-librsvg \
@@ -210,6 +254,7 @@ QTLIB=%{_libdir}; export QTLIB
 	%{!?with_gnome:--disable-gnome} \
 	%{!?with_gtk:--disable-gtk} \
 	%{!?with_kde:--disable-kde} \
+	%{!?with_kde4:--disable-kde4} \
 	%{!?with_metacity:--disable-metacity}
 
 %{__make}
@@ -218,7 +263,6 @@ QTLIB=%{_libdir}; export QTLIB
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
-	desktopfilesdir=%{_datadir}/wm-properties \
 	DESTDIR=$RPM_BUILD_ROOT
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/compiz/*.la
@@ -235,10 +279,14 @@ rm -rf $RPM_BUILD_ROOT
 %postun	libs -p /sbin/ldconfig
 
 %post gconf
-%gconf_schema_install
+for p in %{plugins}; do
+	%gconf_schema_install compiz-$p.schemas
+done
 
 %preun gconf
-%gconf_schema_uninstall
+for p in %{plugins}; do
+	%gconf_schema_uninstall compiz-$p.schemas
+done
 
 %if %{with gconf}
 %post gtk-decorator
@@ -254,17 +302,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/compiz
 %attr(755,root,root) %{_libdir}/compiz/*.so
 %exclude %{_libdir}/compiz/libfs.so
-%{?with_gconf:%exclude %{_libdir}/compiz/libgconf.so}
 %{?with_kde:%exclude %{_libdir}/compiz/libkconfig.so}
-%{_datadir}/compiz
+%{?with_gconf:%exclude %{_libdir}/compiz/libgconf.so}
+%exclude %{_libdir}/compiz/libsvg.so
+%{_datadir}/compiz/*.xml
+%{_datadir}/compiz/*.png
+%{_datadir}/compiz/schemas.xslt
 %exclude %{_datadir}/compiz/fs.xml
 %exclude %{_datadir}/compiz/gconf.xml
-%exclude %{_datadir}/compiz/kconfig.xml
+%exclude %{_datadir}/compiz/svg.xml
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libdecoration.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdecoration.so.0
 %dir %{_libdir}/compiz
+%dir %{_datadir}/compiz
 
 %files devel
 %defattr(644,root,root,755)
@@ -273,8 +326,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/compiz
 %{_pkgconfigdir}/compiz.pc
 %{_pkgconfigdir}/libdecoration.pc
-# what is the purpose of these files? development or runtime?
+%{?with_kde:%{_pkgconfigdir}/compiz-kconfig.pc}
+# checked by compiz-fusion-plugins-extra
 %{_pkgconfigdir}/compiz-cube.pc
+# checked by compiz-fusion-plugins-main
 %{_pkgconfigdir}/compiz-scale.pc
 
 %files fuse
@@ -288,7 +343,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/compiz/libgconf.so
 %{_sysconfdir}/gconf/schemas/compiz-*.schemas
 %{_datadir}/compiz/gconf.xml
-# what for?
+# checked by compiz-fusion-plugins-* (with non-default --enable-schemas only)
 %{_pkgconfigdir}/compiz-gconf.pc
 %endif
 
@@ -296,18 +351,25 @@ rm -rf $RPM_BUILD_ROOT
 %files kconfig
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/compiz/libkconfig.so
-%{_datadir}/compiz/kconfig.xml
-%{_datadir}/config.kcfg/compiz-*.kcfg
 %{_datadir}/config/compizrc
-# what for?
-%{_pkgconfigdir}/compiz-kconfig.pc
+%{_datadir}/config.kcfg/*.kcfg
+%{_datadir}/compiz/kcfg.xslt
+%{_datadir}/compiz/kconfig.xslt
 %endif
 
-%if %{with gnome}
+%files svg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/compiz/libsvg.so
+%{_datadir}/compiz/gconf.xml
+
+%if %{with gnome} && %{with gtk}
 %files gnome-settings
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/window-manager-settings/libcompiz.so
-%{_datadir}/wm-properties/compiz.desktop
+%{_datadir}/gnome-control-center/keybindings/50-compiz-desktop-key.xml
+%{_datadir}/gnome-control-center/keybindings/50-compiz-key.xml
+%{_datadir}/gnome/wm-properties/compiz-wm.desktop
+%{_desktopdir}/compiz.desktop
 %endif
 
 %if %{with gtk}
@@ -324,3 +386,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kde-window-decorator
 %endif
+
+%if %{with kde4}
+%files kde4-decorator
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/kde4-window-decorator
+%endif