From cea47bae6622e858767edba2e9f7410e8c058fe9 Mon Sep 17 00:00:00 2001
From: Daniel Williams <dcbw@fedoraproject.org>
Date: Sep 30 2008 20:18:26 +0000
Subject: - Fix order of Password TLS certificate choosers (rh #464765)

- Use %find_lang for locale-specific files (rh #448551)

---

diff --git a/NetworkManager-openvpn.spec b/NetworkManager-openvpn.spec
index d2778a0..7b2bf42 100644
--- a/NetworkManager-openvpn.spec
+++ b/NetworkManager-openvpn.spec
@@ -10,7 +10,7 @@ Summary: NetworkManager VPN integration for OpenVPN
 Name: NetworkManager-openvpn
 Epoch:   1
 Version: 0.7.0
-Release: 15.%{svn_snapshot}%{?dist}
+Release: 16.%{svn_snapshot}%{?dist}
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Group: System Environment/Base
@@ -21,6 +21,8 @@ Group: System Environment/Base
 # - make distcheck
 # - use generated NetworkManager-openvpn-0.7.0.tar.gz
 Source: %{name}-%{version}.%{svn_snapshot}.tar.gz
+Patch0: nm-openvpn-fix-pw-tls-entries.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk2-devel                 >= %{gtk2_version}
 BuildRequires: dbus-devel                 >= %{dbus_version}
@@ -55,6 +57,8 @@ with NetworkManager and the GNOME desktop.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .pw-tls-entries
+
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
@@ -68,6 +72,8 @@ make install DESTDIR=%{buildroot} INSTALL="%{__install} -p"
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,7 +93,7 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
       /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
 fi
 
-%files
+%files -f %{name}.lang
 %defattr(-, root, root)
 
 %doc AUTHORS ChangeLog README
@@ -100,9 +106,12 @@ fi
 %{_datadir}/gnome-vpn-properties/openvpn/nm-openvpn-dialog.glade
 %{_datadir}/applications/nm-openvpn.desktop
 %{_datadir}/icons/hicolor/48x48/apps/gnome-mime-application-x-openvpn-settings.png
-%{_datadir}/locale/*/LC_MESSAGES/NetworkManager-openvpn.mo
 
 %changelog
+* Tue Sep 30 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-16.svn4027
+- Fix order of Password TLS certificate choosers (rh #464765)
+- Use %find_lang for locale-specific files (rh #448551)
+
 * Fri Aug 29 2008 Dan Williams <dcbw@redhat.com> 1:0.7.0-15.svn4027
 - Rebuild for updated NetworkManager
 
diff --git a/nm-openvpn-fix-pw-tls-entries.patch b/nm-openvpn-fix-pw-tls-entries.patch
new file mode 100644
index 0000000..a8f1bd0
--- /dev/null
+++ b/nm-openvpn-fix-pw-tls-entries.patch
@@ -0,0 +1,21 @@
+diff -up NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade
+--- NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade.entries	2008-09-30 15:59:39.000000000 -0400
++++ NetworkManager-openvpn-0.7.0/properties/nm-openvpn-dialog.glade	2008-09-30 16:01:37.000000000 -0400
+@@ -426,7 +426,7 @@
+                               <widget class="GtkLabel" id="label8">
+                                 <property name="visible">True</property>
+                                 <property name="xalign">0</property>
+-                                <property name="label" translatable="yes">CA Certificate:</property>
++                                <property name="label" translatable="yes">User Certificate:</property>
+                               </widget>
+                               <packing>
+                                 <property name="top_attach">1</property>
+@@ -438,7 +438,7 @@
+                               <widget class="GtkLabel" id="label6">
+                                 <property name="visible">True</property>
+                                 <property name="xalign">0</property>
+-                                <property name="label" translatable="yes">User Certificate:</property>
++                                <property name="label" translatable="yes">CA Certificate:</property>
+                               </widget>
+                               <packing>
+                                 <property name="top_attach">2</property>