#3 Update to 3.6.1
Merged 11 days ago by pingou. Opened 4 months ago by carmenbianca.
rpms/ carmenbianca/guake f30  into  f30

@@ -1,38 +0,0 @@ 

- From e959dddcce0c1e561837abe622c74efd5abcaae7 Mon Sep 17 00:00:00 2001

- From: Pierre-Yves Chibon <pingou@pingoured.fr>

- Date: Wed, 19 Mar 2014 10:43:17 +0100

- Subject: [PATCH] Remove vte check in the configure.ac

- 

- ---

-  configure.ac | 15 ---------------

-  1 file changed, 15 deletions(-)

- 

- diff --git a/configure.ac b/configure.ac

- index 76f0649..130c160 100644

- --- a/configure.ac

- +++ b/configure.ac

- @@ -55,21 +55,6 @@ AS_AC_EXPAND(LIBDIR, ${libdir})

-  AS_AC_EXPAND(BINDIR, ${bindir})

-  AS_AC_EXPAND(DATADIR, ${datarootdir})

-  

- -dnl Checking python-vte

- -AC_MSG_CHECKING([for the python-vte package])

- -ac_pvte_result=`$PYTHON -c 'try:

- -    import vte

- -except Exception, e:

- -    print str(e)' 2> /dev/null`

- -

- -if test -z "$ac_pvte_result"; then

- -    AC_MSG_RESULT([yes])

- -else

- -    AC_MSG_RESULT([no])

- -    AC_MSG_ERROR([cannot import Python module "vte".

- -    Please check if you have python-vte installed. The error was:

- -    $ac_pvte_result])

- -fi

-  

-  dnl gconf

-  AC_PATH_PROG(GCONFTOOL, gconftool-2, no)

- -- 

- 1.8.5.3

- 

@@ -1,25 +0,0 @@ 

- From bccfca9fb8ffd2b73a0286308c68c3c54f6cda50 Mon Sep 17 00:00:00 2001

- From: Oliver Haessler <oliver@redhat.com>

- Date: Tue, 2 Jun 2015 17:02:02 +0200

- Subject: [PATCH 1/1] set default value for /apps/guake/general/debug_mode

- 

- ---

-  data/guake.schemas | 2 +-

-  1 file changed, 1 insertion(+), 1 deletion(-)

- 

- diff --git a/data/guake.schemas b/data/guake.schemas

- index fedff64..2254f8f 100644

- --- a/data/guake.schemas

- +++ b/data/guake.schemas

- @@ -5,7 +5,7 @@

-              <applyto>/apps/guake/general/debug_mode</applyto>

-              <owner>guake</owner>

-              <type>bool</type>

- -            <default></default>

- +            <default>false</default>

-              <locale name="C">

-                  <short>Enable debug mode</short>

-                  <long>When debug mode is enabled, logs are printed in the

- -- 

- 1.8.3.1

- 

@@ -1,12 +0,0 @@ 

- diff -up guake-0.2.2/configure.fix_vte guake-0.2.2/configure

- --- guake-0.2.2/configure.fix_vte	2008-06-05 20:39:47.000000000 +0200

- +++ guake-0.2.2/configure	2008-06-05 20:43:04.000000000 +0200

- @@ -21596,7 +21596,7 @@ ac_pvte_result=`$PYTHON -c 'try:

-  except Exception, e:

-      print str(e)' 2> /dev/null`

-  

- -if test -z "$ac_pvte_result"; then

- +if test -z ""; then

-      { echo "$as_me:$LINENO: result: yes" >&5

-  echo "${ECHO_T}yes" >&6; }

-  else

file modified
+39 -78

@@ -1,109 +1,70 @@ 

  Name:           guake

- Version:        0.8.8

- Release:        7%{?dist}

+ Version:        3.6.1

+ Release:        1%{?dist}

  Summary:        Drop-down terminal for GNOME

  

  License:        GPLv2+

  URL:            http://guake-project.org/

- #Source0:        https://github.com/Guake/guake/archive/%%{version}.tar.gz

- Source0:        guake-%{version}.tar.gz

- Patch5:         0001-Remove-vte-check-in-the-configure.ac.patch

+ Source0:        https://github.com/Guake/guake/archive/%{version}.tar.gz

  

  BuildArch:      noarch

  

- # Not used here -- official release --

- #Source0:        %%{name}-%%{version}.20090321git.tar.gz

- # Source generated from

- # git clone git://repos.guake-terminal.org/guake

- # cd guake

- # ./autogen.sh

- # cd ../

- # tar zcvf guake-0.3.1.20090321git.tar.gz guake/

- # ---------------------------------------------

- 

- 

- BuildRequires:  python2-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel

- BuildRequires:  pygtk2-devel >= 2.10 intltool vte

+ BuildRequires:  python3-devel

+ BuildRequires:  python3-setuptools

+ BuildRequires:  python3-pip

+ BuildRequires:  %{py3_dist pbr}

+ BuildRequires:  gettext

  BuildRequires:  gnome-common

- BuildRequires:  python2-keybinder

- Requires:       pygtk2 >= 2.10 vte python2-notify pygtk2-libglade gnome-python2-gconf python2-dbus

- Requires:       desktop-notification-daemon python2-pyxdg

- Requires:       python2-keybinder

  

- Requires(pre):   GConf2

- Requires(post):  GConf2

- Requires(preun): GConf2

+ Requires:       python3 >= 3.5

+ Requires:       python3-cairo

+ Requires:       python3-dbus

+ Requires:       python3-gobject

+ Requires:       python3-pyxdg

+ Requires:       %{py3_dist pbr}

+ Requires:       keybinder3

+ Requires:       libwnck3

+ Requires:       libnotify

+ Requires:       vte291 >= 0.42

+ 

+ Recommends:     libutempter

  

  %description

- Guake is a drop-down terminal for Gnome Desktop Environment,

- so you just need to press a key to invoke him,

- and press again to hide.

+ Guake is a dropdown terminal made for the GNOME desktop environment. Guake's

+ style of window is based on an FPS game, and one of its goals is to be easy to

+ reach.

  

  %prep

  %setup -q

- #-n guake-guake-%{version}

- 

- sed -i -e '/^#!\//, 1d' src/guake/notifier.py

- 

- %patch5 -p1 -b .

- 

- ./autogen.sh

- 

- # Enables to pass the configure without problem concerning python vte library

- sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure

  

  %build

- %configure --disable-schemas-install --disable-static

- make %{?_smp_mflags}

- 

+ %make_build

  

  %install

- export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1

- make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"

- 

- desktop-file-install --vendor=""                           \

-   --delete-original                                        \

-   --dir=%{buildroot}%{_datadir}/applications               \

-   %{buildroot}%{_datadir}/applications/%{name}.desktop

- 

- 

- desktop-file-install --vendor=""                           \

-   --delete-original                                        \

-   --dir=%{buildroot}%{_datadir}/applications               \

-   %{buildroot}%{_datadir}/applications/%{name}-prefs.desktop

+ PBR_VERSION=%{version} %make_install prefix=%{_prefix}

  

+ rm %{buildroot}%{_datadir}/glib-2.0/schemas/gschemas.compiled

  

  %find_lang %{name}

- rm -f %{buildroot}%{python2_sitelib}/%{name}/globalhotkeys.la

- 

- 

- %pre

- %gconf_schema_prepare %{name}

- 

- %post

- %gconf_schema_upgrade %{name}

- 

- %preun

- %gconf_schema_remove %{name}

- 

- %posttrans

- killall gconfd-2 > /dev/null || :

  

  %files -f %{name}.lang

- %doc AUTHORS ChangeLog COPYING README.rst

- %{_sysconfdir}/gconf/schemas/%{name}.schemas

+ %doc README.rst NEWS.rst

+ %license COPYING

+ %{python3_sitelib}/%{name}

+ %{python3_sitelib}/Guake*egg-info/

  %{_bindir}/%{name}

- %{_bindir}/%{name}-prefs

- %{python2_sitelib}/%{name}

- %{_datadir}/applications/%{name}.desktop

+ %{_bindir}/%{name}-toggle

  %{_datadir}/applications/%{name}-prefs.desktop

- %{_datadir}/dbus-1/services/org.guake.Guake.service

- %{_datadir}/%{name}

- %{_datadir}/pixmaps/%{name}

- %{_mandir}/man1/guake.1.gz

- %{_datadir}/icons/hicolor/*/apps/%{name}*.png

+ %{_datadir}/applications/%{name}.desktop

+ %{_datadir}/glib-2.0/schemas/org.guake.gschema.xml

+ %{_datadir}/metainfo/%{name}.appdata.xml

+ %{_datadir}/pixmaps/%{name}.png

+ %{_datadir}/%{name}/

  

  %changelog

+ * Fri Apr 26 2019 Carmen Bianca Bakker <carmenbianca@fedoraproject.org> - 3.6.1-1

+ - Update to 3.6.1.

+ 

  * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.8-7

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

  

I did some work to upgrade Guake to 3.6.1. It basically works, though you get a notification along the lines of "A problem happened when binding F12 key" inside of a Wayland session. This error is silent in version 0.8.8.

You can get the keybinding to work inside of a Wayland session by going to gnome-control-center -> devices -> keyboard, and adding a custom keybinding for guake. The notification stays, however.

I used the tarball from GitHub in spite of the warning against it. PBR_VERSION=%{version} gets around any complications.

I removed the patches because they are obsolete and/or not needed.

I removed the gconf_schema_update lines because I couldn't get them to work, and they do not appear to be necessary. But if they are necessary, you can add them back.

I removed the desktop-file-install lines as well as they do not appear to be necessary.

I also made the observation that Guake is released under GPLv2 ONLY.

I hope that this pull request is helpful.

1 new commit added

  • Use built-in make commands
4 months ago

1 new commit added

  • Add libnotify as dependency
4 months ago

1 new commit added

  • Fix Requires
4 months ago

The change to the license tag is wrong:

Guake is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.

Source: about panel -> License

Strange, you're right. Can't remember how I made that observation. Fixed

Strange, you're right. Can't remember how I made that observation. Fixed

Because one the developer upstream added the wrong tag in the setup.py :)

Cf the discussion at: https://github.com/Guake/guake/pull/1613 (feel free to comment on it btw ;))

Btw, did you push? I'm still seeing the spec file with GPLv2

Ah, apologies, pushed again. I tried pushing to the wrong remote and didn't bother to check after hitting enter.

1 new commit added

  • Repair license tag
2 months ago

You missed the changelog ;-)

I need to step away from the keyboard, I'll likely get back to this next week.

Thanks!

5 new commits added

  • Repair license tag
  • Fix Requires
  • Add libnotify as dependency
  • Use built-in make commands
  • Update to 3.6.1
2 months ago

This looks good to me, could you by any chance squash all the commits into one?

rebased onto c222c9b

2 months ago

Pull-Request has been merged by pingou

11 days ago