diff --git a/.gitignore b/.gitignore index 7475691..1421d58 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /caja-1.11.0.tar.xz /caja-1.12.0.tar.xz /caja-1.12.1.tar.xz +/caja-1.12.2.tar.xz diff --git a/caja.spec b/caja.spec index bd04175..62c0675 100644 --- a/caja.spec +++ b/caja.spec @@ -14,9 +14,9 @@ Name: caja Summary: File manager for MATE -Version: %{branch}.1 +Version: %{branch}.2 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.2%{?git_rel}%{?dist} %endif @@ -30,9 +30,6 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -# https://github.com/mate-desktop/caja/pull/489 -Patch0: caja_set-smclient-mode-to-no-restart-in-other-sessions.patch - BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: exempi-devel @@ -106,8 +103,6 @@ for developing caja extensions. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch0 -p1 -b .smclient-mode - %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -229,6 +224,10 @@ fi %changelog +* Thu Dec 24 2015 Wolfgang Ulbrich - 1.12.2-1 +- update to 1.12.2 release +- remove upstreamed patch + * Tue Dec 22 2015 Wolfgang Ulbrich - 1.12.1-2 - change cajas behaviour in xfce session, rhbz (#1278079) diff --git a/caja_set-smclient-mode-to-no-restart-in-other-sessions.patch b/caja_set-smclient-mode-to-no-restart-in-other-sessions.patch deleted file mode 100644 index 52c1ca3..0000000 --- a/caja_set-smclient-mode-to-no-restart-in-other-sessions.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/caja-main.c b/src/caja-main.c -index b829bf6..9547778 100644 ---- a/src/caja-main.c -+++ b/src/caja-main.c -@@ -483,6 +483,9 @@ main (int argc, char *argv[]) - { - /* do not manage desktop when running as root or on other desktops */ - no_desktop = TRUE; -+ -+ /* set smclient mode to "no restart" when running as root or on other desktops */ -+ egg_sm_client_set_mode (EGG_SM_CLIENT_MODE_NO_RESTART); - } - - if (perform_self_check && remaining != NULL) - diff --git a/sources b/sources index e0e2a0f..a811c62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bba2c688b56099e7f3e8263d7c661b92 caja-1.12.1.tar.xz +7a2020f17a76bd9f129dcb546b63df83 caja-1.12.2.tar.xz