diff options
| author | Ondrej Holy <oholy@redhat.com> | 2016-08-09 10:41:41 +0200 |
|---|---|---|
| committer | Ondrej Holy <oholy@redhat.com> | 2016-08-11 08:16:01 +0200 |
| commit | c4da270a189001393c2eb2c5ee2ddfb3f429a944 (patch) | |
| tree | 5f47ec3e584cb4673041828f67977dcd4b82eb7e | |
| parent | 812f42e6bec9d9adf7c97d83fb55f0f0e4f3e3d6 (diff) | |
| download | gvfs-c4da270a189001393c2eb2c5ee2ddfb3f429a944.tar.gz | |
build: Include its rules for polkit temporarily
polkit.loc and polkit.its files are neccessary for merging translations
back into policy files with gettext. Include those files temporarily
before new polkit is released and distributed.
https://bugzilla.gnome.org/show_bug.cgi?id=768707
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | daemon/Makefile.am | 2 | ||||
| -rw-r--r-- | gettext/its/polkit.its | 7 | ||||
| -rw-r--r-- | gettext/its/polkit.loc | 6 |
5 files changed, 17 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 03e9e3f5..1bea4042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,8 @@ EXTRA_DIST = \ README.commits \ MAINTAINERS \ m4 \ + gettext/its/polkit.loc \ + gettext/its/polkit.its \ $(NULL) distclean-local: diff --git a/configure.ac b/configure.ac index 8ab4fdce..4c7146ba 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,7 @@ AC_ARG_ENABLE([admin], [AS_HELP_STRING([--disable-admin],[build without admin ba msg_admin=no if test "x$enable_admin" != "xno"; then - PKG_CHECK_MODULES([ADMIN], [polkit-gobject-1 >= 0.114], [msg_admin=yes]) + PKG_CHECK_MODULES([ADMIN], [polkit-gobject-1], [msg_admin=yes]) if test "x$msg_admin" = "xyes"; then AC_DEFINE([HAVE_ADMIN], 1, [Define to 1 if admin backend is going to be built]) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 818dd0cc..24b39216 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -666,7 +666,7 @@ org.gtk.vfs.file-operations.policy.in: org.gtk.vfs.file-operations.policy.in.in $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ org.gtk.vfs.file-operations.policy: org.gtk.vfs.file-operations.policy.in Makefile - $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@ + $(AM_V_GEN) XDG_DATA_DIRS=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ || cp $< $@ gvfs_polkit_actionsdir = $(datadir)/polkit-1/actions gvfs_polkit_actions_in_files = org.gtk.vfs.file-operations.policy.in diff --git a/gettext/its/polkit.its b/gettext/its/polkit.its new file mode 100644 index 00000000..1312ecbe --- /dev/null +++ b/gettext/its/polkit.its @@ -0,0 +1,7 @@ +<?xml version="1.0"?> +<its:rules xmlns:its="http://www.w3.org/2005/11/its" + version="2.0"> + <its:translateRule selector="/action/description | + /action/message" + translate="yes"/> +</its:rules> diff --git a/gettext/its/polkit.loc b/gettext/its/polkit.loc new file mode 100644 index 00000000..c7427ec6 --- /dev/null +++ b/gettext/its/polkit.loc @@ -0,0 +1,6 @@ +<?xml version="1.0"?> +<locatingRules> + <locatingRule name="polkit policy" pattern="*.policy"> + <documentRule localName="policyconfig" target="polkit.its"/> + </locatingRule> +</locatingRules> |