From 4dc726fb70b60786688f17e3ee97f448afd6762f Mon Sep 17 00:00:00 2001 From: raveit65 Date: Aug 06 2021 22:07:31 +0000 Subject: update to 1.26.0 --- diff --git a/.gitignore b/.gitignore index feec0eb..c697295 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ /caja-extensions-1.23.1.tar.xz /caja-extensions-1.24.0.tar.xz /caja-extensions-1.24.1.tar.xz +/caja-extensions-1.26.0.tar.xz diff --git a/caja-extensions.spec b/caja-extensions.spec index 0f25c93..6c41891 100644 --- a/caja-extensions.spec +++ b/caja-extensions.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.24 +%global branch 1.26 # Settings used for build from snapshots. %{!?rel_build:%global commit 298c7255b82986eeba72fff06f59479deae0b9d0} @@ -14,9 +14,9 @@ Name: caja-extensions Summary: Set of extensions for caja file manager -Version: %{branch}.1 +Version: %{branch}.0 %if 0%{?rel_build} -Release: 3%{?dist} +Release: 1%{?dist} %else Release: 0.16%{?git_rel}%{?dist} %endif @@ -29,23 +29,21 @@ 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}} -Source1: caja-share-setup-instructions -Source2: caja-share-smb.conf.example +Source1: caja-share-setup-instructions +Source2: caja-share-smb.conf.example -Patch0: caja-extensions_use-beesu-command-for-gksu.patch - -BuildRequires: mate-common -BuildRequires: caja-devel -BuildRequires: mate-desktop-devel -BuildRequires: dbus-glib-devel -BuildRequires: gtk3-devel -BuildRequires: gupnp-devel -BuildRequires: dbus-glib-devel +BuildRequires: make +BuildRequires: mate-common +BuildRequires: caja-devel +BuildRequires: mate-desktop-devel +BuildRequires: dbus-glib-devel +BuildRequires: gtk3-devel +BuildRequires: gupnp-devel +BuildRequires: dbus-glib-devel %if 0%{?rhel} <= 7 || 0%{?fedora} -BuildRequires: gajim +BuildRequires: gajim %endif -BuildRequires: make %description Extensions for the caja file-browser, open-terminal, @@ -175,8 +173,6 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %files -n caja-image-converter %{_libdir}/caja/extensions-2.0/libcaja-image-converter.so -%{_datadir}/caja-extensions/caja-image-resize.ui -%{_datadir}/caja-extensions/caja-image-rotate.ui %{_datadir}/caja/extensions/libcaja-image-converter.caja-extension %files -n caja-open-terminal @@ -228,6 +224,9 @@ cp %{SOURCE2} %{buildroot}/%{_sysconfdir}/samba/ %changelog +* Fri Aug 06 2021 Wolfgang Ulbrich - 1.26.0-1 +- update to 1.26.0 release + * Wed Jul 21 2021 Fedora Release Engineering - 1.24.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/caja-extensions_0001-Do-not-collect-the-translation-for-Icon.patch b/caja-extensions_0001-Do-not-collect-the-translation-for-Icon.patch deleted file mode 100644 index bea521f..0000000 --- a/caja-extensions_0001-Do-not-collect-the-translation-for-Icon.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 47594d970a75be2daf43ffb2fe075cbaa7098f46 Mon Sep 17 00:00:00 2001 -From: raveit65 -Date: Wed, 4 Mar 2020 11:05:54 +0100 -Subject: [PATCH] Do not collect the translation for Icon - ---- - gksu/Makefile.am | 2 +- - image-converter/Makefile.am | 2 +- - open-terminal/Makefile.am | 2 +- - sendto/Makefile.am | 2 +- - share/Makefile.am | 2 +- - wallpaper/Makefile.am | 2 +- - xattr-tags/Makefile.am | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/gksu/Makefile.am b/gksu/Makefile.am -index 93431c8..3cf4ed8 100644 ---- a/gksu/Makefile.am -+++ b/gksu/Makefile.am -@@ -31,6 +31,6 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-gksu.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - CLEANFILES = $(extension_DATA) -diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am -index 0b8154f..df93167 100644 ---- a/image-converter/Makefile.am -+++ b/image-converter/Makefile.am -@@ -48,7 +48,7 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-image-converter.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - EXTRA_DIST = $(builder_DATA) - -diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am -index f1c77fb..d65fade 100644 ---- a/open-terminal/Makefile.am -+++ b/open-terminal/Makefile.am -@@ -40,7 +40,7 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-open-terminal.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - DISTCLEANFILES = \ - org.mate.caja-open-terminal.gschema.xml -diff --git a/sendto/Makefile.am b/sendto/Makefile.am -index e23cde8..d4f056c 100644 ---- a/sendto/Makefile.am -+++ b/sendto/Makefile.am -@@ -83,7 +83,7 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-sendto.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - EXTRA_DIST = \ - $(man_MANS) \ -diff --git a/share/Makefile.am b/share/Makefile.am -index 8a257f3..6fc1a32 100644 ---- a/share/Makefile.am -+++ b/share/Makefile.am -@@ -41,7 +41,7 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-share.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - EXTRA_DIST = share-dialog.ui - -diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am -index 5bb905e..acc6496 100644 ---- a/wallpaper/Makefile.am -+++ b/wallpaper/Makefile.am -@@ -33,6 +33,6 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-wallpaper.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - CLEANFILES = $(extension_DATA) -diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am -index 27cd567..515d8e1 100644 ---- a/xattr-tags/Makefile.am -+++ b/xattr-tags/Makefile.am -@@ -34,6 +34,6 @@ extensiondir = $(datadir)/caja/extensions - extension_in_files = libcaja-xattr-tags.caja-extension.desktop.in - extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) - $(extension_DATA): $(extension_in_files) -- $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ -+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword= --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ - - CLEANFILES = $(extension_DATA) --- -2.21.1 - diff --git a/caja-extensions_use-beesu-command-for-gksu.patch b/caja-extensions_use-beesu-command-for-gksu.patch deleted file mode 100644 index 910ff9e..0000000 --- a/caja-extensions_use-beesu-command-for-gksu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr caja-extensions-298c725-orig/gksu/libcaja-gksu.c caja-extensions-298c725/gksu/libcaja-gksu.c ---- caja-extensions-298c725-orig/gksu/libcaja-gksu.c 2013-11-03 16:10:13.000000000 +0100 -+++ caja-extensions-298c725/gksu/libcaja-gksu.c 2013-12-05 21:48:00.929591101 +0100 -@@ -159,7 +159,7 @@ start_gksu_thread (void *data) - gchar **argv = (gchar**) g_malloc (sizeof (gchar*) * 3); - gchar *full_cmd = (gchar*) data; - -- argv[0] = g_strdup ("gksu"); -+ argv[0] = g_strdup ("beesu"); - argv[1] = full_cmd; - argv[2] = NULL; - diff --git a/sources b/sources index c78fecf..89c8a4a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (caja-extensions-1.24.1.tar.xz) = b844a774271d81ac811b1aff1f04be4a65c6e38a683938dfb593f65297a6398fbfe4c8f6a51c649a1311fb5ca8134b4478860f51b1b3eaf9965a6b8776af2817 +SHA512 (caja-extensions-1.26.0.tar.xz) = c60ac189328853ed309b60cdabce302feb79de62b2fb19156b55055d26ff29e6be05badc3e7eba2fba3de9870b04851bacfb0e92dc47b6fb656273caa980ddc7