New version

Resolves: rhbz#1656467 New URL
2019-04-02 21:15:32 +02:00 · 2019-04-02 21:15:32 +02:00 · ed5915c008
commit ed5915c008
parent 27bacfbf27
4 changed files with 40 additions and 35 deletions
--- a/.gitignore
+++ b/.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
--- a/compiz-0.8.16-fedora-logo.patch
+++ b/compiz-0.8.16-fedora-logo.patch
@ -1,7 +1,8 @@
-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 @@
+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>
@ -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>
--- a/compiz.spec
+++ b/compiz.spec
@ -1,21 +1,21 @@
 %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
-Version:        0.8.14
-Release:        7%{?dist}
+Version:        0.8.16.1
+Release:        1%{?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.16-fedora-logo.patch

 BuildRequires: libX11-devel
 BuildRequires: libdrm-devel
@ -46,8 +46,9 @@ BuildRequires: libwnck3-devel
 BuildRequires: libcompizconfig-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
+BuildRequires: automake

-Requires:       glx-utils
+Requires:      glx-utils

 # obsolete old subpackges
 Obsoletes: %{name}-xfce < %{epoch}:%{version}-%{release}
@ -65,7 +66,7 @@ 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
 Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
@ -73,20 +74,21 @@ 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
- 
+
 %build
+./autogen.sh
 %configure \
    --with-gtk=3.0 \
    --enable-librsvg \
@ -94,10 +96,10 @@ windows and compositing manager.
    --enable-marco \
    --enable-menu-entries \
    --with-default-plugins=%{plugins}
- 
+
 make %{?_smp_mflags} V=1
- 
- 
+
+
 %install
 %{make_install}

@ -110,19 +112,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
- 
+
+# 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
@ -132,6 +137,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
@ -151,6 +157,11 @@ done >> core-files.txt


 %changelog
+* 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

--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (compiz-0.8.14.tar.xz) = ce02c7ac0ba864a68ace05abf4b9cb833185cf47a2dcaf5aa9e900336a4ecff5107ef503646bdd6ec675d9fa7a54bb5ae07df4f1cadea098765e5a5b4ca80d5e
+SHA512 (compiz-core-v0.8.16.1.tar.bz2) = 504f6381d71e5806a16ed2b40698fa2dfd38183b02ad3f8ffde4d515be734cf197b8cab058d7c87107ad75072f6db9c78fa0bbfb6423cf95c08ec49de14c3701