diff --git a/.gitignore b/.gitignore index 20cd288..32abbd3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /gala-0.3.0.552.tar.xz /gala-0.3.0.562.tar.xz /gala-0.3.0.567.tar.xz +/gala-0.3.0.119-c7d5.tar.xz diff --git a/gala.spec b/gala.spec index 8d3a881..00c7432 100644 --- a/gala.spec +++ b/gala.spec @@ -1,16 +1,17 @@ -%global rev 567 +%global git_ver 119.c7d5 +%global git_tag 119-c7d5 %global __provides_exclude_from ^%{_libdir}/gala/.*\\.so$ Name: gala Summary: Gala window manager Version: 0.3.0 -Release: 0.bzr%{rev}.1%{?dist}.1 +Release: 0.git%{git_ver}.1%{?dist} License: GPLv3+ URL: https://launchpad.net/gala # The tarball was generated by running make-tarball.sh -Source0: %{name}-%{version}.%{rev}.tar.xz +Source0: %{name}-%{version}.%{git_tag}.tar.xz Source1: make-tarball.sh BuildRequires: desktop-file-utils @@ -25,14 +26,14 @@ BuildRequires: pkgconfig(clutter-gtk-1.0) BuildRequires: pkgconfig(gee-0.8) BuildRequires: pkgconfig(glib-2.0) >= 2.44.0 BuildRequires: pkgconfig(gnome-desktop-3.0) -BuildRequires: pkgconfig(gnome-settings-daemon) +BuildRequires: pkgconfig(gnome-settings-daemon) >= 3.15.2 BuildRequires: pkgconfig(granite) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(libbamf3) BuildRequires: pkgconfig(libcanberra) -BuildRequires: pkgconfig(plank) >= 0.3.0 +BuildRequires: pkgconfig(plank) >= 0.11.0 -BuildRequires: mutter-devel +BuildRequires: mutter-devel >= 3.18.3 Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -66,7 +67,7 @@ This package contains the development headers. %prep -%setup -q -n %{name}-%{version}.%{rev} +%setup -q -n %{name}-%{version}.%{git_tag} %build @@ -99,8 +100,8 @@ fi /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %files -f gala.lang @@ -114,7 +115,7 @@ fi %{_datadir}/icons/hicolor/*/apps/multitasking-view.svg -%files libs +%files libs %doc AUTHORS %license COPYING @@ -125,7 +126,7 @@ fi %{_libdir}/libgala.so.0.0.0 -%files devel +%files devel %{_includedir}/gala/ %{_libdir}/libgala.so @@ -136,6 +137,9 @@ fi %changelog +* Mon Jul 31 2017 Fabio Valentini - 0.3.0-0.git119.c7d5.1 +- Update to latest snapshot (git 119-c7d5). + * Wed Jul 26 2017 Fedora Release Engineering - 0.3.0-0.bzr567.1.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/make-tarball.sh b/make-tarball.sh index 91817e8..fd70076 100755 --- a/make-tarball.sh +++ b/make-tarball.sh @@ -2,6 +2,8 @@ set -e +COMMIT="c7d590cd05f852c94d27926e272633cf418aa9d8" + # install dependencies sudo dnf install \ @@ -11,6 +13,7 @@ sudo dnf install \ cogl-devel \ gettext \ gettext-devel \ + git \ glib2-devel \ granite-devel \ gnome-desktop3-devel \ @@ -26,9 +29,10 @@ sudo dnf install \ # generating the gala tarball from bzr -bzr branch lp:gala +git clone https://github.com/elementary/gala.git cd gala +git checkout $COMMIT ./autogen.sh --prefix=/usr diff --git a/sources b/sources index 3dbaa74..28b11b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gala-0.3.0.567.tar.xz) = b1d6152ed833f8a6a7e5f90820053607871fb9567ab37432a806d24aea10f901de01e9bc059dc229b97362af66f220d07716ba8ee54ea73614e505ad1a3ea6f6 +SHA512 (gala-0.3.0.119-c7d5.tar.xz) = bd5970c81b75b80c88d3c2ed55e9657c02ff6594fe0bffb45a9fd38357d6d83627c2c7a4f22a523f16c219f3e8ccbdfd5ad203182ade8498ee141e01c2b5ecb1