Author: arekm                        Date: Sun Feb 24 11:31:34 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- up to 0.7.0

---- Files affected:
SPECS:
   compiz.spec (1.89 -> 1.90) 

---- Diffs:

================================================================
Index: SPECS/compiz.spec
diff -u SPECS/compiz.spec:1.89 SPECS/compiz.spec:1.90
--- SPECS/compiz.spec:1.89      Mon Jan  7 19:40:15 2008
+++ SPECS/compiz.spec   Sun Feb 24 12:31:29 2008
@@ -6,16 +6,17 @@
 %bcond_without gnome           # gnome settings module
 %bcond_without metacity        # metacity theme support
 %bcond_without kde             # kde-window-decorator
+%bcond_with    kde4
 #
 Summary:       OpenGL window and compositing manager
 Summary(pl.UTF-8):     OpenGL-owy zarządca okien i składania
 Name:          compiz
-Version:       0.6.2
-Release:       2
+Version:       0.7.0
+Release:       1
 License:       GPL or MIT
 Group:         X11/Applications
 Source0:       
http://xorg.freedesktop.org/releases/individual/app/%{name}-%{version}.tar.gz
-# Source0-md5: 7e6edfdbf0dc46b135313440edae7a53
+# Source0-md5: f87e17d62b22ab2db5bdf9326c480ee7
 Patch0:                %{name}-DESTDIR.patch
 URL:           http://compiz.org/
 %if %{with gconf} || %{with gtk}
@@ -52,7 +53,7 @@
 BuildRequires: libwnck-devel >= 2.18.1
 BuildRequires: xorg-lib-libXrender-devel >= 0.9.3
 %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
@@ -66,6 +67,9 @@
 BuildRequires: kdebase-devel
 BuildRequires: qt-devel >= 1:3.0
 %endif
+%if %{with kde4}
+BuildRequires: FIXME
+%endif
 Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     compiz-kconfig
 Obsoletes:     compiz-opacity
@@ -199,6 +203,19 @@
 %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.
+
 # for gconf subpackage
 %define        plugins annotate blur clone core cube dbus decoration fade fs 
gconf glib ini inotify minimize move place plane png regex resize rotate scale 
screenshot svg switcher video water wobbly zoom
 
@@ -221,6 +238,7 @@
        %{!?with_gnome:--disable-gnome} \
        %{!?with_gtk:--disable-gtk} \
        %{!?with_kde:--disable-kde} \
+       %{!?with_kde4:--disable-kde4} \
        %{!?with_metacity:--disable-metacity}
 
 %{__make}
@@ -289,6 +307,7 @@
 %{_includedir}/compiz
 %{_pkgconfigdir}/compiz.pc
 %{_pkgconfigdir}/libdecoration.pc
+%{?with_kde:%{_pkgconfigdir}/compiz-kconfig.pc}
 # checked by compiz-fusion-plugins-extra
 %{_pkgconfigdir}/compiz-cube.pc
 # checked by compiz-fusion-plugins-main
@@ -336,6 +355,14 @@
 %files kde-decorator
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kde-window-decorator
+%{_datadir}/config.kcfg/*.kcfg
+%{_datadir}/config/compizrc
+%endif
+
+%if %{with kde4}
+%files kde4-decorator
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/kde4-window-decorator
 %endif
 
 %define date   %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -344,6 +371,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.90  2008-02-24 11:31:29  arekm
+- up to 0.7.0
+
 Revision 1.89  2008-01-07 18:40:15  qboosh
 - moved beryl-core O to -libs (beryl-core used to P: compiz, -libs C: old 
compiz)
 
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/compiz.spec?r1=1.89&r2=1.90&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to