From: Łukasz Kieś <kiesiu@pld-linux.org>
Date: Mon, 25 Mar 2013 15:17:40 +0000 (+0100)
Subject: - updated to 3.8.0
X-Git-Tag: auto/th/gcr-3.8.0-1
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9c6c6e21e6d8d1032d04f5764ea7961d355c6b01;p=packages%2Fgcr.git

- updated to 3.8.0
- added patch to fix format security errors
---

diff --git a/format-security-fix.patch b/format-security-fix.patch
new file mode 100644
index 0000000..3f29a53
--- /dev/null
+++ b/format-security-fix.patch
@@ -0,0 +1,12 @@
+diff -uNr gcr-3.8.0.old/ui/gcr-certificate-exporter.c gcr-3.8.0/ui/gcr-certificate-exporter.c
+--- gcr-3.8.0.old/ui/gcr-certificate-exporter.c	2013-03-25 11:18:03.000000000 +0100
++++ gcr-3.8.0/ui/gcr-certificate-exporter.c	2013-03-25 14:56:52.352682331 +0100
+@@ -227,7 +227,7 @@
+ 		                       _("Do you want to replace it with a new file?"));
+ 		dialog = gtk_message_dialog_new_with_markup (GTK_WINDOW (self->pv->chooser_dialog),
+ 		     GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION,
+-		     GTK_BUTTONS_NONE, msg);
++		     GTK_BUTTONS_NONE, "%s", msg);
+ 		gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+ 		                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ 		                        _("_Replace"), GTK_RESPONSE_ACCEPT, NULL);
diff --git a/gcr.spec b/gcr.spec
index 27617da..9f73220 100644
--- a/gcr.spec
+++ b/gcr.spec
@@ -6,19 +6,20 @@
 Summary:	GObject and GUI library for high level crypto parsing and display
 Summary(pl.UTF-8):	Biblioteka GObject i GUI do wysokopoziomowej analizy i wyświetlania danych kryptograficznych
 Name:		gcr
-Version:	3.6.2
+Version:	3.8.0
 Release:	1
 License:	LGPL v2+
 Group:		X11/Applications
-Source0:	http://ftp.gnome.org/pub/GNOME/sources/gcr/3.6/%{name}-%{version}.tar.xz
-# Source0-md5:	b31d8b95c77333cd49e6eaa5abd93e50
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/gcr/3.8/%{name}-%{version}.tar.xz
+# Source0-md5:	20718f7ec668aeddd89707c1e7e65432
+Patch0:		format-security-fix.patch
 URL:		http://www.gnome.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.11
 BuildRequires:	gettext-devel
 BuildRequires:	glib2-devel >= 1:2.32.0
 BuildRequires:	gnupg
-BuildRequires:	gobject-introspection-devel >= 1.30.0
+BuildRequires:	gobject-introspection-devel >= 1.34.0
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	gtk-doc >= 1.9
 BuildRequires:	intltool >= 0.35.0
@@ -113,6 +114,7 @@ Dokumentacja API bibliotek gcr i gck.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -136,7 +138,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libmock-test-module.*
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
 
 %find_lang %{name}
@@ -183,28 +184,34 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libgcr-3.so.1
 %attr(755,root,root) %{_libdir}/libgcr-base-3.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgcr-base-3.so.1
+%attr(755,root,root) %{_libdir}/libgcr-ui-3.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgcr-ui-3.so.1
 %{_libdir}/girepository-1.0/Gck-1.typelib
 %{_libdir}/girepository-1.0/Gcr-3.typelib
+%{_libdir}/girepository-1.0/GcrUi-3.typelib
 
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libgck-1.so
 %attr(755,root,root) %{_libdir}/libgcr-3.so
 %attr(755,root,root) %{_libdir}/libgcr-base-3.so
+%attr(755,root,root) %{_libdir}/libgcr-ui-3.so
 %{_datadir}/gir-1.0/Gck-1.gir
 %{_datadir}/gir-1.0/Gcr-3.gir
+%{_datadir}/gir-1.0/GcrUi-3.gir
 %{_includedir}/gck-1
 %{_includedir}/gcr-3
 %{_pkgconfigdir}/gck-1.pc
 %{_pkgconfigdir}/gcr-3.pc
 %{_pkgconfigdir}/gcr-base-3.pc
+%{_pkgconfigdir}/gcr-ui-3.pc
 
 %if %{with static_libs}
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/libgck-1.a
-%{_libdir}/libgcr-3.a
 %{_libdir}/libgcr-base-3.a
+%{_libdir}/libgcr-ui-3.a
 %endif
 
 %if %{with apidocs}