From ddc7e452e6091fdda713720119e875729d929bce Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@fedoraproject.org>
Date: Tue, 31 Jul 2007 22:30:17 +0000
Subject: [PATCH] - Add support for PolicyKit .policy files (b.g.o #462312)

---
 intltool-0.35.5-polkit.patch | 32 ++++++++++++++++++++++++++++++++
 intltool.spec                |  8 +++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 intltool-0.35.5-polkit.patch

diff --git a/intltool-0.35.5-polkit.patch b/intltool-0.35.5-polkit.patch
new file mode 100644
index 0000000..2d89fbe
--- /dev/null
+++ b/intltool-0.35.5-polkit.patch
@@ -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
diff --git a/intltool.spec b/intltool.spec
index 3912c8e..95777a1 100644
--- a/intltool.spec
+++ b/intltool.spec
@@ -4,7 +4,7 @@
 Name: intltool
 Summary: Utility for internationalizing various kinds of data files
 Version: 0.35.5
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL
 Group: Development/Tools
 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
 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
 This tool automatically extracts translatable strings from oaf, glade,
@@ -29,6 +31,7 @@ them in the po files.
 %setup -q
 %patch0 -p1 -b .path
 %patch1 -p1 -b .dont-duplicate-msgid
+%patch2 -p1 -b .polkit
 
 %build
 %configure
@@ -52,6 +55,9 @@ make
 %{_mandir}/man*/*
 
 %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
 - Don't produce useless debuginfo (#249969)