Update to 1.29.90
... and rebase gvfs-archive-integration.patch so that it uses gettext instead of intltool, now that upstream gvfs has switched over to gettext.
This commit is contained in:
Kalev Lember
parent
90e9938ada
commit
de940e613b
|
|
@ -1,11 +1,9 @@
|
||||||
diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
|
diff -up gvfs-1.29.90/Makefile.am.archive-integration gvfs-1.29.90/Makefile.am
|
||||||
--- gvfs-1.3.2/Makefile.am.archive-integration 2009-06-25 19:55:39.000000000 -0400
|
--- gvfs-1.29.90/Makefile.am.archive-integration 2016-08-11 14:01:26.000000000 +0200
|
||||||
+++ gvfs-1.3.2/Makefile.am 2009-07-13 22:51:52.480693853 -0400
|
+++ gvfs-1.29.90/Makefile.am 2016-08-13 12:19:21.313402711 +0200
|
||||||
@@ -1,5 +1,19 @@
|
@@ -1,5 +1,20 @@
|
||||||
NULL =
|
NULL =
|
||||||
|
|
||||||
+@INTLTOOL_DESKTOP_RULE@
|
|
||||||
+
|
|
||||||
+desktop_in_files = mount-archive.desktop.in
|
+desktop_in_files = mount-archive.desktop.in
|
||||||
+
|
+
|
||||||
+mount-archive.desktop.in: mount-archive.desktop.in.in
|
+mount-archive.desktop.in: mount-archive.desktop.in.in
|
||||||
|
|
@ -13,7 +11,10 @@ diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
|
||||||
+
|
+
|
||||||
+desktopdir = $(datadir)/applications
|
+desktopdir = $(datadir)/applications
|
||||||
+if HAVE_ARCHIVE
|
+if HAVE_ARCHIVE
|
||||||
+desktop_DATA = mount-archive.desktop
|
+desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
|
||||||
|
+
|
||||||
|
+$(desktop_DATA): %.desktop: %.desktop.in
|
||||||
|
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
|
||||||
+else
|
+else
|
||||||
+desktop_DATA =
|
+desktop_DATA =
|
||||||
+endif
|
+endif
|
||||||
|
|
@ -21,21 +22,21 @@ diff -up gvfs-1.3.2/Makefile.am.archive-integration gvfs-1.3.2/Makefile.am
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
common \
|
common \
|
||||||
metadata \
|
metadata \
|
||||||
@@ -19,6 +33,8 @@ EXTRA_DIST = \
|
@@ -24,6 +39,8 @@ EXTRA_DIST = \
|
||||||
gvfs.doap \
|
gvfs.doap \
|
||||||
README.commits \
|
README.commits \
|
||||||
MAINTAINERS \
|
MAINTAINERS \
|
||||||
+ mount-archive.desktop.in.in \
|
+ mount-archive.desktop.in.in \
|
||||||
+ $(desktop_in_files) \
|
+ $(desktop_in_files) \
|
||||||
m4 \
|
m4 \
|
||||||
$(NULL)
|
gettext/its/polkit.loc \
|
||||||
|
gettext/its/polkit.its \
|
||||||
diff -up /dev/null gvfs-1.3.2/mount-archive.desktop.in.in
|
diff -up gvfs-1.29.90/mount-archive.desktop.in.in.archive-integration gvfs-1.29.90/mount-archive.desktop.in.in
|
||||||
--- /dev/null 2009-07-13 16:21:55.049012465 -0400
|
--- gvfs-1.29.90/mount-archive.desktop.in.in.archive-integration 2016-08-13 12:19:21.313402711 +0200
|
||||||
+++ gvfs-1.3.2/mount-archive.desktop.in.in 2009-07-13 22:39:14.844931097 -0400
|
+++ gvfs-1.29.90/mount-archive.desktop.in.in 2016-08-13 12:19:21.313402711 +0200
|
||||||
@@ -0,0 +1,13 @@
|
@@ -0,0 +1,13 @@
|
||||||
+[Desktop Entry]
|
+[Desktop Entry]
|
||||||
+_Name=Archive Mounter
|
+Name=Archive Mounter
|
||||||
+Exec=@libexecdir@/gvfsd-archive file=%u
|
+Exec=@libexecdir@/gvfsd-archive file=%u
|
||||||
+X-Gnome-Vfs-System=gio
|
+X-Gnome-Vfs-System=gio
|
||||||
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;application/x-xz-compressed-tar;
|
+MimeType=application/x-cd-image;application/x-bzip-compressed-tar;application/x-compressed-tar;application/x-tar;application/x-cpio;application/x-zip;application/zip;application/x-lzma-compressed-tar;application/x-xz-compressed-tar;
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
%global glib2_version 2.45.7
|
%global glib2_version 2.49.3
|
||||||
%global libgdata_version 0.17.3
|
%global libgdata_version 0.17.3
|
||||||
|
|
||||||
Name: gvfs
|
Name: gvfs
|
||||||
Version: 1.29.4
|
Version: 1.29.90
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Backends for the gio framework in GLib
|
Summary: Backends for the gio framework in GLib
|
||||||
|
|
||||||
|
|
@ -23,7 +23,6 @@ BuildRequires: libgudev1-devel
|
||||||
BuildRequires: libsoup-devel >= 2.34.0
|
BuildRequires: libsoup-devel >= 2.34.0
|
||||||
BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib)
|
BuildRequires: pkgconfig(avahi-client) pkgconfig(avahi-glib)
|
||||||
BuildRequires: libsecret-devel
|
BuildRequires: libsecret-devel
|
||||||
BuildRequires: intltool
|
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: libudisks2-devel
|
BuildRequires: libudisks2-devel
|
||||||
BuildRequires: libbluray-devel
|
BuildRequires: libbluray-devel
|
||||||
|
|
@ -382,6 +381,9 @@ killall -USR1 gvfsd >&/dev/null || :
|
||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Aug 12 2016 Kalev Lember <klember@redhat.com> - 1.29.90-1
|
||||||
|
- Update to 1.29.90
|
||||||
|
|
||||||
* Mon Jul 18 2016 Richard Hughes <rhughes@redhat.com> - 1.29.4-1
|
* Mon Jul 18 2016 Richard Hughes <rhughes@redhat.com> - 1.29.4-1
|
||||||
- Update to 1.29.4
|
- Update to 1.29.4
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue