Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2013-07-23 12:30:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz (Old) and /work/SRC/openSUSE:Factory/.compiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz" Changes: -------- --- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2013-03-05 10:04:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2013-07-23 12:30:27.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Jul 10 01:40:39 UTC 2013 - hrvoje.sen...@gmail.com + +- Drop kde4 package for 13.1, KWin has dropped support for compiz + with 4.11 release. +- Spec cleanup + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.hBuycV/_old 2013-07-23 12:30:28.000000000 +0200 +++ /var/tmp/diff_new_pack.hBuycV/_new 2013-07-23 12:30:28.000000000 +0200 @@ -20,8 +20,8 @@ Version: 0.8.8 Release: 0 Url: http://www.compiz.org -PreReq: %fillup_prereq -%if 0%{suse_version} <= 01100 +Requires(pre): %fillup_prereq +%if 0%{?suse_version} <= 01100 Enhances: xgl >= git_070104 %endif Summary: OpenGL window and compositing manager @@ -31,39 +31,32 @@ BuildRequires: freeglut-devel BuildRequires: fuse-devel BuildRequires: gcc-c++ -BuildRequires: gconf2-devel -BuildRequires: gtk2-devel -BuildRequires: libgnome-desktop-2-devel #BuildRequires: gtk-devel BuildRequires: intltool -%if 0%{suse_version} < 01120 +BuildRequires: libgnome-desktop-2-devel +BuildRequires: pkgconfig(gconf-2.0) +BuildRequires: pkgconfig(gtk+-2.0) +%if 0%{?suse_version} < 01120 BuildRequires: kdebase3-devel BuildRequires: kdelibs3-devel %endif -%kde4_runtime_requires BuildRequires: librsvg-devel -BuildRequires: libwnck-devel -%if 0%{suse_version} > 01140 -BuildRequires: dbus-1-glib-devel BuildRequires: libwnck2-devel -%endif BuildRequires: libxslt-devel BuildRequires: metacity -BuildRequires: pango-devel BuildRequires: perl-XML-Parser BuildRequires: pkg-config BuildRequires: translation-update-upstream BuildRequires: update-desktop-files BuildRequires: xorg-x11-devel +BuildRequires: pkgconfig(dbus-glib-1) +BuildRequires: pkgconfig(libwnck-1.0) +BuildRequires: pkgconfig(pango) %if "%_repository" == "SUSE_Linux_10.1" || "%_repository" == "SLE_10" BuildRequires: xorg-x11-compat70-devel %endif -%if 0%{suse_version} >= 01021 -BuildRequires: metacity-devel -%endif -%if 0%{suse_version} > 01030 BuildRequires: gnome-control-center-devel -%endif +BuildRequires: metacity-devel #### # # KDE4 Extension disabled for openSUSE 11.2, due to incompatibility @@ -72,7 +65,7 @@ # our package for a proper / tested backport at this time. # Disabled by dims...@opensuse.org # -%if 0%{suse_version} == 01030 || 0%{suse_version} > 1120 +%if 0%{?suse_version} < 1310 BuildRequires: kde4-kwin BuildRequires: kdebase4-workspace-devel BuildRequires: kwin @@ -80,8 +73,13 @@ %endif #BuildRequires: libgnome-window-settings-devel BuildRequires: libgnomeui-devel +# KWin has, since 4.11 version, dropped support for Compiz in KDecoration +# For details see http://lists.kde.org/?l=kwin&m=136335502805911&w=2 and commit c146941 in kde-workspace +%if 0%{?suse_version} > 1230 +Obsoletes: compiz-kde4 +%endif # To be nuked: MesaLib, patch60 $mesagl -Source: compiz-%version.tar.bz2 +Source: compiz-%{version}.tar.bz2 Source1: opensuse.png Source2: sle.png Source3: compiz-decorator @@ -105,6 +103,7 @@ Patch7: compiz-global_Region_define.patch # PATCH-FIX-OPENSUSE r...@suse.de -- kde-4.9 buildfix taken from gentoo Patch8: compiz-kde-4.9.patch +# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch9: compiz-0.8.8-non-abstract-KWD-Window.patch Requires: compiz-branding = %{version} Requires: compiz-decorator = %{version} @@ -136,26 +135,26 @@ Summary: OpenGL window and compositing manager configuration utilities License: GPL-2.0+ and HPND Group: System/GUI/GNOME -Requires: %name = %version +Requires: %{name} = %{version} Requires: 3ddiag -%if 0%{suse_version} < 01220 +%if 0%{?suse_version} < 01220 Requires: freeglut %else Requires: Mesa-demo-x %endif Requires: gnome-desktop2 Requires: pciutils -%if 0%{suse_version} <= 01100 +%if 0%{?suse_version} <= 01100 Requires: xgl-hardware-list >= 060526 %endif Requires: metacity >= 2.15.1 -%if 0%{suse_version} > 01030 +%if 0%{?suse_version} > 01030 Requires: gnome-control-center %endif -%if 0%{suse_version} <= 01030 +%if 0%{?suse_version} <= 01030 Requires: control-center2 %endif -Provides: compiz-decorator = %version +Provides: compiz-decorator = %{version} %description gnome This package contains Gnome based configuration utilities for the @@ -167,62 +166,65 @@ Summary: OpenGL window and compositing managerdecorator License: GPL-2.0+ and HPND Group: System/GUI/KDE -Requires: %name = %version -Provides: compiz-decorator = %version +Requires: %{name} = %{version} +Provides: compiz-decorator = %{version} %description kde This package contains the KDE window decorator for the Compiz compositing manager. %endif +%if 0%{?suse_version} < 1310 %package kde4 Summary: OpenGL window and compositing managerdecorator for kde4 License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/KDE -Requires: %name = %version -%if 0%{suse_version} > 1130 +Requires: %{name} = %{version} +%if 0%{?suse_version} > 1130 BuildRequires: kdebase4-workspace-devel %endif -%if 0%{suse_version} <= 01030 +%if 0%{?suse_version} <= 01030 BuildRequires: control-center2-devel %endif -%if 0%{suse_version} >= 01120 +%if 0%{?suse_version} >= 01120 +BuildRequires: kdebase4-session Requires: kde4-kwin Requires: kdebase4-session -BuildRequires: kdebase4-session -Recommends: simple-ccsm-kde4 -Recommends: kolor-manager Recommends: icc_examin -Provides: compiz-decorator = %version +Recommends: kolor-manager +Recommends: simple-ccsm-kde4 +Provides: compiz-decorator = %{version} +%kde4_runtime_requires %endif %description kde4 This package contains the KDE4 window decorator for the Compiz compositing manager. +%endif %package devel Summary: OpenGL window and compositing manager License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other -Requires: %name = %version +Requires: %{name} = %{version} Requires: Mesa-devel Requires: freeglut-devel Requires: fuse-devel Requires: gcc-c++ -Requires: gconf2-devel Requires: gnome-control-center-devel -Requires: gtk2-devel Requires: intltool Requires: librsvg-devel -Requires: libwnck-devel -Requires: libxml2-devel Requires: libxslt-devel Requires: metacity-devel -Requires: pango-devel Requires: perl-XML-Parser -Requires: startup-notification-devel Requires: update-desktop-files Requires: xorg-x11-devel +Requires: pkgconfig(gconf-2.0) +Requires: pkgconfig(gtk+-2.0) +Requires: pkgconfig(libstartup-notification-1.0) +Requires: pkgconfig(libwnck-1.0) +Requires: pkgconfig(libxml-2.0) +Requires: pkgconfig(pango) %description devel Compiz is an OpenGL compositing manager that use @@ -234,11 +236,11 @@ Summary: OpenGL window and compositing manager License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other -PreReq: /bin/ln -PreReq: /bin/rm -Requires: %name = %version +Requires(pre): /bin/ln +Requires(pre): /bin/rm +Requires: %{name} = %{version} Supplements: packageand(branding-openSUSE:compiz) -Provides: compiz-branding = %version +Provides: compiz-branding = %{version} %description branding-openSUSE Compiz is an OpenGL compositing manager that use @@ -250,11 +252,11 @@ Summary: OpenGL window and compositing manager License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other -PreReq: /bin/ln -PreReq: /bin/rm -Requires: %name = %version +Requires(pre): /bin/ln +Requires(pre): /bin/rm +Requires: %{name} = %{version} Supplements: packageand(branding-SLED:compiz) -Provides: compiz-branding = %version +Provides: compiz-branding = %{version} %description branding-SLE Compiz is an OpenGL compositing manager that use @@ -266,11 +268,11 @@ Summary: OpenGL window and compositing manager License: HPND and GPL-2.0+ and LGPL-2.1+ Group: System/GUI/Other -PreReq: /bin/ln -PreReq: /bin/rm -Requires: %name = %version +Requires(pre): /bin/ln +Requires(pre): /bin/rm +Requires: %{name} = %{version} Supplements: packageand(branding-upstream:compiz) -Provides: compiz-branding = %version +Provides: compiz-branding = %{version} %description branding-upstream Compiz is an OpenGL compositing manager that use @@ -286,14 +288,14 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%if 0%{suse_version} <= 1110 +%if 0%{?suse_version} <= 1110 # Reverse back to old GTK symbols. %patch5 -p1 -R %endif %patch6 -p1 -R %patch7 -p1 %patch8 -p1 -%if 0%{suse_version} > 1220 +%if 0%{?suse_version} > 1220 %patch9 %endif @@ -310,13 +312,16 @@ --disable-kde \ %endif --enable-metacity \ +%if 0%{?suse_version} > 1230 + --disable-kde4 \ +%endif QTLIB=%{_prefix}/lib/qt3/%{_lib} \ --with-default-plugins=core,ccp,compicc,png,dbus,move,place,resize,decoration,minimize,regex,annotate,wobbly,cube,expo,rotate,scale -make %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -%makeinstall +%make_install find %{buildroot} -type f -name '*.la' -delete -print #remove locale data as it is not required anymore, translations are merged in .xml and .schemas rm -r %{buildroot}%{_datadir}/locale @@ -324,14 +329,16 @@ install -m 444 %_sourcedir/sle.png %{buildroot}%{_datadir}/compiz/ install -m 755 %_sourcedir/compiz-decorator %{buildroot}%{_bindir}/ mkdir -p %{buildroot}%{_datadir}/xsessions/ +%if 0%{?suse_version} < 1310 install -m 444 %_sourcedir/kde-compiz.desktop %{buildroot}%{_datadir}/xsessions/ install -m 755 %_sourcedir/startkde-compiz %{buildroot}%{_bindir}/ +%endif %find_gconf_schemas -touch %name.schemas_pre %name.schemas_preun %name.schemas_posttrans %name.schemas_list +touch %{name}.schemas_pre %{name}.schemas_preun %{name}.schemas_posttrans %{name}.schemas_list -%pre -f %name.schemas_pre +%pre -f %{name}.schemas_pre -%preun -f %name.schemas_preun +%preun -f %{name}.schemas_preun %post -p /sbin/ldconfig @@ -361,12 +368,12 @@ rm /usr/share/compiz/cube-image.png || true fi -%posttrans -f %name.schemas_posttrans +%posttrans -f %{name}.schemas_posttrans %clean -%__rm -rf %{buildroot} +rm -rf %{buildroot} -%files -f %name.schemas_list +%files -f %{name}.schemas_list %defattr(-, root, root) %{_bindir}/compiz %{_bindir}/compiz-decorator @@ -436,11 +443,13 @@ %kde_prefix/share/config.kcfg/compiz-* %endif +%if 0%{?suse_version} < 1310 %files kde4 %defattr(-, root, root) %{_bindir}/kde4-window-decorator %{_bindir}/startkde-compiz %{_datadir}/xsessions/kde-compiz.desktop +%endif %files branding-openSUSE %defattr(-, root, root) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
