Hello community, here is the log from the commit of package compiz for openSUSE:Factory checked in at 2017-05-03 15:56:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/compiz (Old) and /work/SRC/openSUSE:Factory/.compiz.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "compiz" Wed May 3 15:56:39 2017 rev:130 rq:492297 version:0.8.14 Changes: -------- --- /work/SRC/openSUSE:Factory/compiz/compiz.changes 2017-04-24 09:48:16.576264126 +0200 +++ /work/SRC/openSUSE:Factory/.compiz.new/compiz.changes 2017-05-03 15:56:40.700561005 +0200 @@ -15,0 +16,2 @@ +- Workaround /usr/@DATADIRNAME@/locale/ on openSUSE Leap 42.1 and + older. @@ -16,0 +19,2 @@ +- Only switch gtk-window-decorator to Gtk3 on openSUSE Leap 42.3 + and newer. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz.spec ++++++ --- /var/tmp/diff_new_pack.erYAlX/_old 2017-05-03 15:56:41.940385974 +0200 +++ /var/tmp/diff_new_pack.erYAlX/_new 2017-05-03 15:56:41.944385409 +0200 @@ -51,12 +51,11 @@ BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gobject-introspection-1.0) -BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(ice) +BuildRequires: pkgconfig(libmarco-private) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(librsvg-2.0) >= 2.14.0 BuildRequires: pkgconfig(libstartup-notification-1.0) >= 0.7 -BuildRequires: pkgconfig(libwnck-3.0) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxslt) BuildRequires: pkgconfig(pangocairo) @@ -83,8 +82,12 @@ Obsoletes: %{name}-kde < %{version} Obsoletes: %{name}-kde4 < %{version} ExcludeArch: s390 s390x -%if 0%{?suse_version} > 1310 -BuildRequires: pkgconfig(libmarco-private) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +BuildRequires: pkgconfig(gtk+-3.0) +BuildRequires: pkgconfig(libwnck-3.0) +%else +BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(libwnck-1.0) %endif %description @@ -134,12 +137,10 @@ Requires: pkgconfig(fuse) Requires: pkgconfig(gl) Requires: pkgconfig(glu) -Requires: pkgconfig(gtk+-3.0) Requires: pkgconfig(ice) Requires: pkgconfig(libpng) Requires: pkgconfig(librsvg-2.0) Requires: pkgconfig(libstartup-notification-1.0) -Requires: pkgconfig(libwnck-3.0) Requires: pkgconfig(libxml-2.0) Requires: pkgconfig(libxslt) Requires: pkgconfig(pangocairo) @@ -154,6 +155,13 @@ Requires: pkgconfig(xrandr) Requires: pkgconfig(xrender) Recommends: pkgconfig(libmarco-private) +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) +Requires: pkgconfig(gtk+-3.0) +Requires: pkgconfig(libwnck-3.0) +%else +Requires: pkgconfig(gtk+-2.0) +Requires: pkgconfig(libwnck-1.0) +%endif %description devel Compiz is an OpenGL compositing manager that uses @@ -229,15 +237,22 @@ cp -f %{SOURCE1} opensuse.png cp -f %{SOURCE2} sle.png +%if 0%{?suse_version} <= 1320 && !(0%{?sle_version} > 120100 && 0%{?is_opensuse}) +# Workaround /usr/@DATADIRNAME@/locale/. +rm -r m4/ +%endif + %build NOCONFIGURE=1 ./autogen.sh %configure \ --disable-static \ - --with-gtk=3.0 \ -%if 0%{?suse_version} > 1310 --enable-marco \ +%if 0%{?suse_version} > 1320 || (0%{?sle_version} >= 120300 && 0%{?is_opensuse}) + --with-gtk=3.0 \ +%else + --with-gtk=2.0 \ %endif - --with-default-plugins=core,ccp,decoration,dbus,commands,ezoom,fade,minimize,mousepoll,move,neg,place,png,regex,resize,session,snap,switcher,vpswitch,wall,workarounds,matecompat + --with-default-plugins=core,ccp,decoration,dbus,commands,ezoom,fade,minimize,mousepoll,move,place,png,regex,resize,session,snap,switcher,vpswitch,wall,workarounds,matecompat make %{?_smp_mflags} V=1 %install