summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowi@redhat.com>2015-04-29 21:38:44 -0500
committerYaakov Selkowitz <yselkowi@redhat.com>2015-04-29 21:38:44 -0500
commit6340fdbeea65e26fb879e3466d12668ae06bde3c (patch)
tree5ad9181971ec144b3430d3d9240eb7fd04aca16d
parent7ce41d38579208373934ad239394d924e746b90a (diff)
downloadgnome-flashback-6340fdbeea65e26fb879e3466d12668ae06bde3c.zip
gnome-flashback-6340fdbeea65e26fb879e3466d12668ae06bde3c.tar.gz
gnome-flashback-6340fdbeea65e26fb879e3466d12668ae06bde3c.tar.xz
gnome-flashback 3.14.0
-rw-r--r--gnome-flashback-wm-prefs-overrides.patch19
-rw-r--r--gnome-flashback.spec60
2 files changed, 69 insertions, 10 deletions
diff --git a/gnome-flashback-wm-prefs-overrides.patch b/gnome-flashback-wm-prefs-overrides.patch
new file mode 100644
index 0000000..2da2633
--- /dev/null
+++ b/gnome-flashback-wm-prefs-overrides.patch
@@ -0,0 +1,19 @@
+diff --git a/data/org.gnome.gnome-flashback.gschema.xml.in.in b/data/org.gnome.gnome-flashback.gschema.xml.in.in
+index 5c766a2..262409a 100644
+--- a/data/org.gnome.gnome-flashback.gschema.xml.in.in
++++ b/data/org.gnome.gnome-flashback.gschema.xml.in.in
+@@ -41,4 +41,14 @@
+ <_description>If set to true, then fade effect will be used to change the desktop background.</_description>
+ </key>
+ </schema>
++
++ <schema id="org.gnome.gnome-flashback.overrides" path="/org/gnome/gnome-flashback/overrides/">
++ <key name="button-layout" type="s">
++ <default>"appmenu:minimize,maximize,close"</default>
++ <_summary>Arrangement of buttons on the titlebar</_summary>
++ <_description>
++ This key overrides the key in org.gnome.desktop.wm.preferences when running GNOME Flashback.
++ </_description>
++ </key>
++ </schema>
+ </schemalist>
diff --git a/gnome-flashback.spec b/gnome-flashback.spec
index a5ac54a..5305e14 100644
--- a/gnome-flashback.spec
+++ b/gnome-flashback.spec
@@ -1,17 +1,22 @@
Name: gnome-flashback
-Version: 3.10.0
-Release: 1%{?dist}
+Version: 3.14.0
+Release: 4%{?dist}
Summary: Classic GNOME session
License: GPLv3+
URL: https://wiki.gnome.org/Projects/GnomeFlashback
-Source: http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz
+Source0: http://download.gnome.org/sources/%{name}/3.14/%{name}-%{version}.tar.xz
+Patch0: gnome-flashback-wm-prefs-overrides.patch
BuildRequires: gnome-common
+BuildRequires: gettext-devel
+BuildRequires: intltool
BuildRequires: pkgconfig
+BuildRequires: pkgconfig(dbus-glib-1)
BuildRequires: pkgconfig(glib-2.0) >= 2.40.0
-BuildRequires: pkgconfig(gtk+-3.0) >= 3.10.0
-BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.8.0
+BuildRequires: pkgconfig(gtk+-3.0) >= 3.12.0
+BuildRequires: pkgconfig(gnome-desktop-3.0) >= 3.12.0
+BuildRequires: pkgconfig(gsettings-desktop-schemas) >= 3.12.0
BuildRequires: pkgconfig(libcanberra-gtk3) >= 0.13
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libpulse-mainloop-glib)
@@ -21,7 +26,8 @@ Requires: gnome-panel
Requires: gnome-applets
Requires: metacity
Requires: notification-daemon
-Requires: gnome-keyring-daemon
+Requires: gnome-keyring
+Requires: gnome-screensaver
Requires: gnome-settings-daemon
Requires: gnome-session
@@ -34,7 +40,8 @@ by integrating recent changes of the GNOME libraries.
%prep
-%setup -q -n1
+%setup -q
+%patch0 -p1
%build
@@ -43,14 +50,47 @@ make %{?_smp_mflags}
%install
-%make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
-%files
-%doc
+%postun
+if [ $1 -eq 0 ] ; then
+ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+fi
+%posttrans
+glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
+
+
+%files -f %{name}.lang
+%doc COPYING NEWS
+%{_sysconfdir}/xdg/menus/gnome-flashback-applications.menu
+%{_bindir}/gnome-flashback
+%{_libexecdir}/gnome-flashback-compiz
+%{_libexecdir}/gnome-flashback-metacity
+%{_datadir}/applications/gnome-flashback-init.desktop
+%{_datadir}/applications/gnome-flashback.desktop
+%{_datadir}/glib-2.0/schemas/org.gnome.gnome-flashback.gschema.xml
+%{_datadir}/gnome-session/sessions/gnome-flashback-compiz.session
+%{_datadir}/gnome-session/sessions/gnome-flashback-metacity.session
+%{_datadir}/xsessions/gnome-flashback-compiz.desktop
+%{_datadir}/xsessions/gnome-flashback-metacity.desktop
+
%changelog
+* Fri Feb 27 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-4
+- Fix for BGO#738562
+
+* Mon Feb 23 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-3
+- Requires: gnome-screensaver
+
+* Tue Feb 10 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-2
+- Fix deps
+
+* Mon Feb 02 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.14.0-1
+- Update for GNOME 3.14.
+
* Mon Jan 12 2015 Yaakov Selkowitz <yselkowi@redhat.com> - 3.10.0-1
- Initial release.