rpms/NetworkManager-openvpn/F-8 nm-openvpn-fix-pw-tls-entries.patch, NONE, 1.1 NetworkManager-openvpn.spec, 1.17, 1.18

[Daniel Williams]

Author: dcbw

Update of /cvs/pkgs/rpms/NetworkManager-openvpn/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24356

Modified Files:
	NetworkManager-openvpn.spec 
Added Files:
	nm-openvpn-fix-pw-tls-entries.patch 
Log Message:
* Tue Sep 30 2008 Dan Williams <dcbw at 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)



nm-openvpn-fix-pw-tls-entries.patch:

--- NEW FILE nm-openvpn-fix-pw-tls-entries.patch ---
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>


Index: NetworkManager-openvpn.spec
===================================================================
RCS file: /cvs/pkgs/rpms/NetworkManager-openvpn/F-8/NetworkManager-openvpn.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- NetworkManager-openvpn.spec	29 Aug 2008 14:05:35 -0000	1.17
+++ NetworkManager-openvpn.spec	30 Sep 2008 20:18:45 -0000	1.18
@@ -10,7 +10,7 @@
 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 @@
 # - 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 @@
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch0 -p1 -b .pw-tls-entries
+
 %build
 if [ ! -f configure ]; then
   ./autogen.sh
@@ -68,6 +72,8 @@
 
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
 
+%find_lang %{name}
+
 %clean
 rm -rf %{buildroot}
 
@@ -87,7 +93,7 @@
       /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 @@
 %{_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 at 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 at redhat.com> 1:0.7.0-15.svn4027
 - Rebuild for updated NetworkManager