commit 1a5fcafd3f740d11d1459fccd8330266582e152a
Author: Jakub Bogusz <[email protected]>
Date: Thu Jan 2 17:53:19 2014 +0100
- updated to 1.6.1
- updated doc,names patches
mate-keyring-doc.patch | 56 ++++++++++++++++++++++++++++++++----------------
mate-keyring-names.patch | 26 +++++++---------------
mate-keyring.spec | 6 ++++--
3 files changed, 50 insertions(+), 38 deletions(-)
---
diff --git a/mate-keyring.spec b/mate-keyring.spec
index b99a32b..84d6f70 100644
--- a/mate-keyring.spec
+++ b/mate-keyring.spec
@@ -6,12 +6,12 @@
Summary: Keep passwords and other user's secrets
Summary(pl.UTF-8): Przechowywanie haseł i innych tajnych danych
użytkowników
Name: mate-keyring
-Version: 1.6.0
+Version: 1.6.1
Release: 1
License: LGPL v2+ (library), GPL v2+ (programs)
Group: X11/Applications
Source0:
http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
-# Source0-md5: 46aebb2d0c612f9281e48ce874109871
+# Source0-md5: 3691d4d42ce7db525e6374b1e6505677
Patch0: %{name}-doc.patch
Patch1: %{name}-names.patch
URL: http://mate-desktop.org/
@@ -197,6 +197,8 @@ fi
%{_datadir}/glib-2.0/schemas/org.mate.crypto.*.gschema.xml
%{_datadir}/mate-keyring
%{_datadir}/mategcr
+%{_mandir}/man1/mate-keyring.1*
+%{_mandir}/man1/mate-keyring-daemon.1*
%files libs
%defattr(644,root,root,755)
diff --git a/mate-keyring-doc.patch b/mate-keyring-doc.patch
index a3df4b8..b0e217b 100644
--- a/mate-keyring-doc.patch
+++ b/mate-keyring-doc.patch
@@ -1,31 +1,41 @@
---- mate-keyring-1.6.0/docs/reference/gcr/Makefile.am.orig 2013-03-31
12:28:51.000000000 +0200
-+++ mate-keyring-1.6.0/docs/reference/gcr/Makefile.am 2013-12-29
21:42:28.555880022 +0100
-@@ -21,7 +21,7 @@
+--- mate-keyring-1.6.1/docs/reference/gcr/Makefile.am.orig 2014-01-01
13:15:45.000000000 +0100
++++ mate-keyring-1.6.1/docs/reference/gcr/Makefile.am 2014-01-02
17:26:23.878688026 +0100
+@@ -9,7 +9,8 @@
+ # of using the various options.
+
+ # The name of the module, e.g. 'glib'.
+-DOC_MODULE=gcr
++DOC_MODULE=mate-gcr
++SRC_MODULE=gcr
+
+ # Uncomment for versioned docs and specify the version of the module, e.g.
'2'.
+ DOC_MODULE_VERSION=@GCR_MAJOR@
+@@ -21,7 +22,7 @@
# gtk-doc will search all .c & .h files beneath here for inline comments
# documenting the functions and macros.
# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../../../$(DOC_MODULE)
-+DOC_SOURCE_DIR=../../../gcr
++DOC_SOURCE_DIR=../../../$(SRC_MODULE)
# Extra options to pass to gtkdoc-scangobj. Not normally needed.
SCANGOBJ_OPTIONS=
-@@ -48,8 +48,8 @@
+@@ -48,8 +49,8 @@
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.h
-CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.c
-+HFILE_GLOB=$(top_srcdir)/gcr/*.h
-+CFILE_GLOB=$(top_srcdir)/gcr/*.c
++HFILE_GLOB=$(top_srcdir)/$(SRC_MODULE)/*.h
++CFILE_GLOB=$(top_srcdir)/$(SRC_MODULE)/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-@@ -79,7 +79,7 @@
+@@ -79,7 +80,7 @@
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
GTKDOC_LIBS= $(GOBJECT_LIBS) \
-- $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE)@[email protected] \
-+ $(top_builddir)/gcr/libmategcr@[email protected] \
+-
$(top_builddir)/$(DOC_MODULE)/libmate$(DOC_MODULE)@[email protected] \
++ $(top_builddir)/$(SRC_MODULE)/libmategcr@[email protected] \
$(top_builddir)/gck/libmategck.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
@@ -69,25 +79,35 @@
GcrCertificateDetailsWidget* gcr_certificate_details_widget_new
(GcrCertificate *cert);
GcrCertificate* gcr_certificate_details_widget_get_certificate
(GcrCertificateDetailsWidget *details);
---- mate-keyring-1.6.0/docs/reference/gck/Makefile.am.orig 2013-03-31
12:28:51.000000000 +0200
-+++ mate-keyring-1.6.0/docs/reference/gck/Makefile.am 2013-12-30
08:01:43.787654100 +0100
-@@ -49,8 +49,8 @@
+--- mate-keyring-1.6.1/docs/reference/gck/Makefile.am.orig 2014-01-01
13:15:45.000000000 +0100
++++ mate-keyring-1.6.1/docs/reference/gck/Makefile.am 2014-01-02
17:27:53.098684281 +0100
+@@ -9,7 +9,8 @@
+ # of using the various options.
+
+ # The name of the module, e.g. 'glib'.
+-DOC_MODULE=gck
++DOC_MODULE=mate-gck
++SRC_MODULE=gck
+
+ # Uncomment for versioned docs and specify the version of the module, e.g.
'2'.
+ #DOC_MODULE_VERSION=2
+@@ -49,8 +50,8 @@
# Used for dependencies. The docs will be rebuilt if any of these change.
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.h
-CFILE_GLOB=$(top_srcdir)/$(DOC_MODULE)/*.c
-+HFILE_GLOB=$(top_srcdir)/gck/*.h
-+CFILE_GLOB=$(top_srcdir)/gck/*.c
++HFILE_GLOB=$(top_srcdir)/$(SRC_MODULE)/*.h
++CFILE_GLOB=$(top_srcdir)/$(SRC_MODULE)/*.c
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h
-@@ -79,7 +79,7 @@
+@@ -79,7 +80,7 @@
# e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
GTKDOC_CFLAGS= -I$(top_srcdir) -I$(top_builddir) $(GOBJECT_CFLAGS) -Wno-error
--GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(DOC_MODULE)/lib$(DOC_MODULE).la
-+GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/gck/libmategck.la
+-GTKDOC_LIBS= $(GOBJECT_LIBS)
$(top_builddir)/$(DOC_MODULE)/libmate$(DOC_MODULE).la
++GTKDOC_LIBS= $(GOBJECT_LIBS) $(top_builddir)/$(SRC_MODULE)/libmategck.la
# This includes the standard gtk-doc make rules, copied by gtkdocize.
include $(top_srcdir)/gtk-doc.make
diff --git a/mate-keyring-names.patch b/mate-keyring-names.patch
index 9d55cef..d4fcb0b 100644
--- a/mate-keyring-names.patch
+++ b/mate-keyring-names.patch
@@ -1,24 +1,14 @@
---- mate-keyring-1.6.0/gck/mate-gck.pc.in.orig 2013-03-31 12:28:51.000000000
+0200
-+++ mate-keyring-1.6.0/gck/mate-gck.pc.in 2013-12-30 10:08:23.320668507
+0100
-@@ -10,5 +10,5 @@ Name: mate-gck
- Description: GObject bindings for PKCS#11
- Version: @VERSION@
- Requires: glib-2.0
--Libs: -L${libdir} -lmate-gck
-+Libs: -L${libdir} -lmategck
- Cflags: -I${includedir}/mate-gck
---- mate-keyring-1.6.0/gcr/mate-gcr.pc.in.orig 2013-03-31 12:28:51.000000000
+0200
-+++ mate-keyring-1.6.0/gcr/mate-gcr.pc.in 2013-12-30 10:09:27.003999169
+0100
-@@ -11,6 +11,6 @@ pkcs11standalonedir=@pkcs11standalonedir
+--- mate-keyring-1.6.1/gcr/mate-gcr.pc.in.orig 2014-01-02 17:31:42.192008002
+0100
++++ mate-keyring-1.6.1/gcr/mate-gcr.pc.in 2014-01-02 17:31:47.345341117
+0100
+@@ -11,6 +11,6 @@
Name: gcr@GCR_VERSION_SUFFIX@
Description: GObject and GUI library for high level crypto parsing and display
Version: @VERSION@
--Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libtasn1 gck-0
--Libs: -L${libdir} -lgcr@GCR_VERSION_SUFFIX@
--Cflags: -I${includedir}/gcr@GCR_VERSION_SUFFIX@
-+Requires: glib-2.0 gtk+-@GTK_API_VERSION@ mate-gck-@GCK_MAJOR@
-+Libs: -L${libdir} -lmategcr@GCR_VERSION_SUFFIX@
-+Cflags: -I${includedir}/mategcr@GCR_VERSION_SUFFIX@
+-Requires: glib-2.0 gtk+-@GTK_API_VERSION@ libtasn1 mate-gck-0
++Requires: glib-2.0 gtk+-@GTK_API_VERSION@ mate-gck-0
+ Libs: -L${libdir} -lmategcr
+-Cflags: -I${includedir}/mategcr/gcr
++Cflags: -I${includedir}/mategcr
--- mate-keyring-1.6.0/pkcs11/Makefile.am.orig 2013-03-31 12:28:51.000000000
+0200
+++ mate-keyring-1.6.0/pkcs11/Makefile.am 2013-12-30 10:11:19.893994435
+0100
@@ -1,6 +1,6 @@
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mate-keyring.git/commitdiff/1a5fcafd3f740d11d1459fccd8330266582e152a
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
