Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>

.gitignore

@@ -1,8 +1 @@
-clog
-compiz-*.tar.*
-compiz-*.src.rpm
-kde-desktop-effects-*.tar.*
-core-*.tar.*
-.build-*.log
-/i?86/
-/x86_64/
+compiz-core-*.tar.bz2

compiz-0.8.18-fedora-logo.patch

@@ -1,9 +1,10 @@
-diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xml.in
---- compiz-0.8.2.orign/metadata/cube.xml.in	2009-02-15 10:10:23.000000000 +0100
-+++ compiz-0.8.2/metadata/cube.xml.in	2009-05-25 22:54:03.060114649 +0200
-@@ -92,9 +92,9 @@
- 		    <_short>Cube Color</_short>
- 		    <_long>Color of top and bottom sides of the cube</_long>
+diff --git a/metadata/cube.xml.in b/metadata/cube.xml.in
+index 5d2e7a7..2a20012 100644
+--- a/metadata/cube.xml.in
++++ b/metadata/cube.xml.in
+@@ -96,9 +96,9 @@
+ 		    <short>Cube Color</short>
+ 		    <long>Color of top and bottom sides of the cube</long>
  		    <default>
 -			<red>0xfefe</red>
 -			<green>0xffff</green>
@@ -14,7 +15,7 @@ diff -upNr compiz-0.8.2.orign/metadata/cube.xml.in compiz-0.8.2/metadata/cube.xm
  		    </default>
  		</option>
  		<subgroup>
-@@ -110,7 +110,7 @@
+@@ -114,7 +114,7 @@
  			<type>string</type>
  			<hints>file;image;</hints>
  			<default>

compiz-0.8.18-rsvg2-2.52-fix.patch

@@ -0,0 +1,16 @@
+diff --git a/plugins/svg.c b/plugins/svg.c
+index a0eb715..39fed02 100644
+--- a/plugins/svg.c
++++ b/plugins/svg.c
+@@ -31,7 +31,10 @@
+ #ifndef RSVG_CAIRO_H
+ #include <librsvg/rsvg-cairo.h>
+ #endif
+-#ifndef LIBRSVG_FEATURES_H
++#if !defined(RSVG_FEATURES_H) && !defined(LIBRSVG_FEATURES_H)
++#include <librsvg/rsvg-features.h>
++#endif
++#if !defined(RSVG_FEATURES_H) && !defined(LIBRSVG_FEATURES_H)
+ #include <librsvg/librsvg-features.h>
+ #endif
+ 

compiz.spec

@@ -1,22 +1,23 @@
 %global    core_plugins    blur clone cube decoration fade ini inotify minimize move place png regex resize rotate scale screenshot switcher water wobbly zoom fs obs commands wall annotate svg matecompat
- 
+
 # List of plugins passed to ./configure.  The order is important
- 
+
 %global    plugins         core,dbus,decoration,fade,minimize,move,obs,place,png,resize,scale,screenshot,svg,switcher,wall
 
 Name:           compiz
-URL:            https://github.com/compiz-reloaded/%{name}
 License:        GPLv2+ and LGPLv2+ and MIT
-Group:          User Interface/Desktops
-Version:        0.8.14
-Release:        5%{?dist}
+Version:        0.8.18
+Release:        6%{?dist}
 Epoch:          1
 Summary:        OpenGL window and compositing manager
- 
-Source0:        https://github.com/compiz-reloaded/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz
+
+URL:            https://gitlab.com/compiz/compiz-core
+Source0:        %{url}/-/archive/v%{version}/compiz-core-v%{version}.tar.bz2
 
 # fedora specific
-Patch0:        compiz_fedora-logo.patch
+Patch0:        compiz-0.8.18-fedora-logo.patch
+# FTBFS fix, this can be dropped with compiz > 0.8.18
+Patch1:        compiz-0.8.18-rsvg2-2.52-fix.patch
 
 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
@@ -47,8 +48,10 @@ BuildRequires: libwnck3-devel
 BuildRequires: libcompizconfig-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: automake
+BuildRequires: make
 
-Requires:       glx-utils
+Requires:      glx-utils
 
 # obsolete old subpackges
 Obsoletes: %{name}-xfce < %{epoch}:%{version}-%{release}
@@ -66,29 +69,30 @@ compositing effects in window management, such as a minimization
 effect and a cube work space. Compiz is an OpenGL compositing manager
 that use Compiz use EXT_texture_from_pixmap OpenGL extension for
 binding redirected top-level windows to texture objects.
- 
+
 %package devel
 Summary: Development packages for compiz
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
 Requires: pkgconfig
 Requires: libXcomposite-devel libXfixes-devel libXdamage-devel libXrandr-devel
 Requires: libXinerama-devel libICE-devel libSM-devel libxml2-devel
 Requires: libxslt-devel startup-notification-devel
- 
+
 %description devel
 The compiz-devel package includes the header files,
 and developer docs for the compiz package.
 Install compiz-devel if you want to develop plugins for the compiz
 windows and compositing manager.
 
- 
+
 %prep
-%setup -q
+%setup -q -n compiz-core-v%{version}
 
 %patch0 -p1 -b .fedora-logo
- 
+%patch1 -p1 -b .rsvg2-2.52-fix
+
 %build
+./autogen.sh
 %configure \
     --with-gtk=3.0 \
     --enable-librsvg \
@@ -96,10 +100,10 @@ windows and compositing manager.
     --enable-marco \
     --enable-menu-entries \
     --with-default-plugins=%{plugins}
- 
+
 make %{?_smp_mflags} V=1
- 
- 
+
+
 %install
 %{make_install}
 
@@ -112,21 +116,22 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %find_lang %{name}
- 
+
 cat %{name}.lang > core-files.txt
- 
+
 for f in %{core_plugins}; do
   echo %{_libdir}/compiz/lib$f.so
   echo %{_datadir}/compiz/$f.xml
 done >> core-files.txt
- 
 
-%post -p /sbin/ldconfig
- 
-%postun -p /sbin/ldconfig
+# placeholder for local icons
+mkdir -p %{buildroot}%{_datadir}/compiz/icons/hicolor/{scalable/{apps,\
+categories},22x22/{categories,devices,mimetypes}}
+
+%ldconfig_scriptlets
 
 %files -f core-files.txt
-%doc AUTHORS ChangeLog COPYING.GPL COPYING.LGPL README.md TODO NEWS
+%doc AUTHORS COPYING.GPL COPYING.LGPL README.md TODO NEWS
 %{_bindir}/compiz
 %{_bindir}/compiz-decorator
 %{_bindir}/gtk-window-decorator
@@ -136,6 +141,7 @@ done >> core-files.txt
 %{_libdir}/compiz/libglib.so
 %dir %{_datadir}/compiz
 %{_datadir}/compiz/*.png
+%{_datadir}/compiz/icons
 %{_datadir}/compiz/core.xml
 %{_datadir}/compiz/dbus.xml
 %{_datadir}/compiz/glib.xml
@@ -155,6 +161,57 @@ done >> core-files.txt
 
 
 %changelog
+* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Wed Jan 26 2022 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.18-5
+- Fixed FTBFS with the librsvg2-2.52
+  Resolves: rhbz#2045273
+
+* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.18-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Nov  9 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.18-1
+- New version
+  Resolves: rhbz#1891137
+
+* Fri Oct 23 2020 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-7
+- build with marco again
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.16.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-3
+- build with marco-1.22.2
+- enable BR libcompizconfig-devel
+
+* Mon Jun 17 2019 Wolfgang Ulbrich <fedora@raveit.de - 1:0.8.16.1-2
+- build without marco, because of reverse dependencies to libcompizconfig
+- disable BR libcompizconfig-devel
+
+* Tue Apr  2 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 1:0.8.16.1-1
+- New version
+  Resolves: rhbz#1656467
+- New URL
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1:0.8.14-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

sources

@@ -1 +1 @@
-SHA512 (compiz-0.8.14.tar.xz) = ce02c7ac0ba864a68ace05abf4b9cb833185cf47a2dcaf5aa9e900336a4ecff5107ef503646bdd6ec675d9fa7a54bb5ae07df4f1cadea098765e5a5b4ca80d5e
+SHA512 (compiz-core-v0.8.18.tar.bz2) = f65d869469706e9bea3ac1622ee7f4e1257101600a2373537e903f8495cb236a27de5868ad10136fa8344b6f503dc4e84648516b2ad56aba5c4ae7793e68a4a0