- Add support for PolicyKit .policy files (b.g.o #462312)

This commit is contained in:
David Zeuthen 2007-07-31 22:30:17 +00:00
parent e40bd930f3
commit ddc7e452e6
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,32 @@
diff -up intltool-0.35.5/intltool.m4.polkit intltool-0.35.5/intltool.m4
--- intltool-0.35.5/intltool.m4.polkit 2007-07-31 17:23:52.000000000 -0400
+++ intltool-0.35.5/intltool.m4 2007-07-31 17:24:20.000000000 -0400
@@ -65,6 +65,7 @@ INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.
INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
AC_SUBST(INTLTOOL_DESKTOP_RULE)
AC_SUBST(INTLTOOL_DIRECTORY_RULE)
@@ -84,6 +85,7 @@ AC_SUBST(INTLTOOL_CAVES_RULE)
AC_SUBST(INTLTOOL_SCHEMAS_RULE)
AC_SUBST(INTLTOOL_THEME_RULE)
AC_SUBST(INTLTOOL_SERVICE_RULE)
+AC_SUBST(INTLTOOL_POLICY_RULE)
# Use the tools built into the package, not the ones that are installed.
AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
diff -up intltool-0.35.5/intltool-update.in.in.polkit intltool-0.35.5/intltool-update.in.in
--- intltool-0.35.5/intltool-update.in.in.polkit 2007-07-31 17:10:52.000000000 -0400
+++ intltool-0.35.5/intltool-update.in.in 2007-07-31 17:21:45.000000000 -0400
@@ -71,7 +71,8 @@ my $xml_support =
"sheet(?:\\.in)+|". # ?
"schemas(?:\\.in)+|". # GConf specific
"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-"kbd(?:\\.in)+"; # GOK specific.
+"kbd(?:\\.in)+|". # GOK specific.
+"policy(?:\\.in)+"; # PolicyKit files
my $ini_support =
"icon(?:\\.in)+|". # http://www.freedesktop.org/Standards/icon-theme-spec

View File

@ -4,7 +4,7 @@
Name: intltool Name: intltool
Summary: Utility for internationalizing various kinds of data files Summary: Utility for internationalizing various kinds of data files
Version: 0.35.5 Version: 0.35.5
Release: 4%{?dist} Release: 5%{?dist}
License: GPL License: GPL
Group: Development/Tools Group: Development/Tools
Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2 Source: http://ftp.gnome.org/pub/gnome/sources/intltool/0.35/%{name}-%{version}.tar.bz2
@ -19,6 +19,8 @@ BuildRequires: gettext
Patch0: intltool-0.35.5-path.patch Patch0: intltool-0.35.5-path.patch
Patch1: intltool-0.35.5-dont-duplicate-msgid.patch Patch1: intltool-0.35.5-dont-duplicate-msgid.patch
# Submitted upstream: http://bugzilla.gnome.org/show_bug.cgi?id=462312
Patch2: intltool-0.35.5-polkit.patch
%description %description
This tool automatically extracts translatable strings from oaf, glade, This tool automatically extracts translatable strings from oaf, glade,
@ -29,6 +31,7 @@ them in the po files.
%setup -q %setup -q
%patch0 -p1 -b .path %patch0 -p1 -b .path
%patch1 -p1 -b .dont-duplicate-msgid %patch1 -p1 -b .dont-duplicate-msgid
%patch2 -p1 -b .polkit
%build %build
%configure %configure
@ -52,6 +55,9 @@ make
%{_mandir}/man*/* %{_mandir}/man*/*
%changelog %changelog
* Tue Jul 31 2007 David Zeuthen <davidz@redhat.com> - 0.35.5-5
- Add support for PolicyKit .policy files (b.g.o #462312)
* Sat Jul 28 2007 Matthias Clasen <mclasen@redhat.com> - 0.35.5-4 * Sat Jul 28 2007 Matthias Clasen <mclasen@redhat.com> - 0.35.5-4
- Don't produce useless debuginfo (#249969) - Don't produce useless debuginfo (#249969)