Hello community,
here is the log from the commit of package gnome-keyring-sharp
checked in at Thu Aug 14 01:07:47 CEST 2008.
--------
--- GNOME/gnome-keyring-sharp/gnome-keyring-sharp.changes 2007-06-22 17:51:27.000000000 +0200
+++ gnome-keyring-sharp/gnome-keyring-sharp.changes 2008-08-08 21:02:17.000000000 +0200
@@ -1,0 +2,7 @@
+Wed Aug 6 17:10:50 MDT 2008 - ajorgensen@novell.com
+
+- Update to 1.0.0
+ * Has a stable API version
+ * Installs in the GAC
+
+-------------------------------------------------------------------
Old:
----
Gnome.Keyring.key
gnome-keyring-sharp-0.1.0.tar.bz2
gnome-keyring-sharp-gacutil.patch
gnome-keyring-sharp-makefix.patch
New:
----
gnome-keyring-sharp-1.0.0.tar.bz2
pkgconfigdir.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-keyring-sharp.spec ++++++
--- /var/tmp/diff_new_pack.H26311/_old 2008-08-14 01:04:10.000000000 +0200
+++ /var/tmp/diff_new_pack.H26311/_new 2008-08-14 01:04:10.000000000 +0200
@@ -1,29 +1,36 @@
#
-# spec file for package gnome-keyring-sharp (Version 0.1.0)
+# spec file for package gnome-keyring-sharp (Version 1.0.0)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
# norootforbuild
+
Name: gnome-keyring-sharp
Group: Development/Libraries/Other
-Summary: Managed implementation of libgnome-keyring.
-Version: 0.1.0
-Release: 2
+Summary: Managed Implementation of libgnome-keyring.
+Version: 1.0.0
+Release: 1
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gnome-keyring gnome-keyring-devel gtk2-devel mono-devel ndesk-dbus
Requires: ndesk-dbus gnome-keyring
Source: %{name}-%{version}.tar.bz2
-Source1: Gnome.Keyring.key
-Patch: gnome-keyring-sharp-gacutil.patch
-Patch1: gnome-keyring-sharp-makefix.patch
-Autoreqprov: on
+Patch0: pkgconfigdir.patch
+AutoReqProv: on
+BuildArch: noarch
%description
When the gnome-keyring-daemon is running, you can use this to
@@ -33,10 +40,11 @@
%package devel
+License: X11/MIT
Requires: %{name} = %{version} pkg-config
Summary: Managed implementation of libgnome-keyring.
Group: Development/Libraries/Other
-Autoreqprov: on
+AutoReqProv: on
%description devel
When the gnome-keyring-daemon is running, you can use this to retrieve
@@ -46,35 +54,36 @@
%prep
-%setup -n Gnome.Keyring-%{version}
-cp %{S:1} .
-%patch
-%patch1
+%setup
+%patch0
%build
autoreconf -f -i
-%configure\
- --disable-scrollkeeper
+./configure --prefix=/usr
make %{?jobs:-j%jobs}
%install
-make -C src install DESTDIR="$RPM_BUILD_ROOT" prefix=%{_prefix}
+make install DESTDIR="$RPM_BUILD_ROOT"
%clean
rm -rf "$RPM_BUILD_ROOT"
%files
%defattr(-,root,root)
-%dir %{_prefix}/lib/Gnome.Keyring
-%{_prefix}/lib/Gnome.Keyring/Gnome.Keyring.dll
+%dir %{_prefix}/lib/mono/gnome-keyring-sharp-1.0
+%{_prefix}/lib/mono/gnome-keyring-sharp-1.0/Gnome.Keyring.dll
%{_prefix}/lib/mono/gac/Gnome.Keyring
%files devel
%defattr(-,root,root)
-%{_libdir}/pkgconfig/gnome-keyring-sharp.pc
+%{_datadir}/pkgconfig/gnome-keyring-sharp-1.0.pc
%changelog
-* Fri Jun 22 2007 - maw@suse.de
+* Wed Aug 06 2008 ajorgensen@novell.com
+- Update to 1.0.0
+ * Has a stable API version
+ * Installs in the GAC
+* Fri Jun 22 2007 maw@suse.de
- Remove some crud that caused the build to fail.
-* Thu Jun 21 2007 - maw@suse.de
+* Thu Jun 21 2007 maw@suse.de
- Initial drop.
++++++ gnome-keyring-sharp-0.1.0.tar.bz2 -> gnome-keyring-sharp-1.0.0.tar.bz2 ++++++
++++ 4155 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/AUTHORS new/gnome-keyring-sharp-1.0.0/AUTHORS
--- old/Gnome.Keyring-0.1.0/AUTHORS 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/AUTHORS 2008-08-08 19:36:12.000000000 +0200
@@ -1 +1,2 @@
Gonzalo Paniagua Javier <gonzalo novell com>
+Alp Toker
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/ChangeLog new/gnome-keyring-sharp-1.0.0/ChangeLog
--- old/Gnome.Keyring-0.1.0/ChangeLog 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/ChangeLog 2008-08-08 19:36:12.000000000 +0200
@@ -1,3 +1,55 @@
+2007-10-17 Alp Toker
+
+ * src/Makefile.am: Don't install to $prefix/lib.
+
+2007-10-13 Alp Toker
+
+ * src/Gnome.Keyring/AssemblyInfo.cs.in: Set
+ AssemblyInformationalVersion as well.
+
+2007-10-13 Alp Toker
+
+ * src/Gnome.Keyring/AssemblyInfo.cs.in: Set AssemblyFileVersion to
+ VERSION, and AssemblyVersion to API_VERSION so as not to break
+ backward compatibility on every minor release.
+
+2007-10-13 Alp Toker
+
+ * configure.ac:
+ * src/gnome-keyring-sharp-1.0.pc.in:
+ * src/Makefile.am: Provide an API version for the package name.
+
+2007-10-05 Alp Toker
+
+ * src/Gnome.Keyring/AssemblyInfo.cs.in: Add an AssemblyDescription.
+
+2007-10-05 Alp Toker
+
+ * src/Gnome.Keyring/AssemblyInfo.cs.in:
+ * src/Makefile.am:
+ * Makefile.am:
+ * Gnome.Keyring.snk: Rename Gnome.Keyring.key to Gnome.Keyring.snk
+
+2007-10-03 Alp Toker
+
+ * docs/Makefile.am: Remove redundant install/uninstall hooks.
+
+2007-10-03 Alp Toker
+
+ * README: Update with an explanation of the recently added D-Bus support,
+ and provide contact/support details (the Mono mailing list).
+ * AUTHORS: Add self.
+
+2007-10-03 Alp Toker
+
+ * configure.ac:
+ * Gnome.Keyring.key:
+ * src/Makefile.am:
+ * src/Gnome.Keyring/AssemblyInfo.cs.in:
+ * docs/Makefile.am:
+ * Makefile.am: Make the library installable to the GAC. Based on patches
+ from the OpenSUSE RPM package.
+
2007-03-15 Alp Toker
* src/Gnome.Keyring/Ring.cs: Fall back to D-Bus even if the
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/configure.ac new/gnome-keyring-sharp-1.0.0/configure.ac
--- old/Gnome.Keyring-0.1.0/configure.ac 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/configure.ac 2008-08-08 19:36:12.000000000 +0200
@@ -2,7 +2,14 @@
AC_PREREQ(2.57)
AC_INIT(src/Gnome.Keyring/Ring.cs)
AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(Gnome.Keyring, 0.1.0)
+
+API_VERSION=1.0
+VERSION=$API_VERSION.0
+
+AC_SUBST(API_VERSION)
+AC_SUBST(VERSION)
+
+AM_INIT_AUTOMAKE(gnome-keyring-sharp, $VERSION)
AM_MAINTAINER_MODE
AC_PROG_INSTALL
@@ -27,6 +34,20 @@
fi
#
+# The GAC tool
+#
+
+AC_PATH_PROG(GACUTIL, gacutil, no)
+if test "x$GACUTIL" = "xno" ; then
+ AC_MSG_ERROR([No gacutil tool found])
+fi
+
+AC_SUBST(GACUTIL)
+
+GACUTIL_FLAGS='/gacdir $(DESTDIR)$(prefix)'
+AC_SUBST(GACUTIL_FLAGS)
+
+#
# Use D-Bus as a fallback to get the keyring socket address
#
AC_ARG_ENABLE(dbus,
@@ -67,7 +88,7 @@
AC_OUTPUT([
Makefile
src/Makefile
- src/gnome-keyring-sharp.pc
+ src/gnome-keyring-sharp-1.0.pc
src/Gnome.Keyring/Makefile
src/Gnome.Keyring/AssemblyInfo.cs
docs/Makefile
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/docs/Makefile.am new/gnome-keyring-sharp-1.0.0/docs/Makefile.am
--- old/Gnome.Keyring-0.1.0/docs/Makefile.am 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/docs/Makefile.am 2008-08-08 19:36:12.000000000 +0200
@@ -22,12 +22,6 @@
Gnome.Keyring.tree Gnome.Keyring.zip: $(srcdir)/Gnome.Keyring/*.xml $(srcdir)/Gnome.Keyring/*/*.xml
mdassembler --ecma $(srcdir)/Gnome.Keyring -o Gnome.Keyring
-install-hook:
- cp Gnome.Keyring.* `pkg-config monodoc --variable=sourcesdir`
-
-uninstall-hook:
- rm -f `pkg-config monodoc --variable=sourcesdir`/Gnome.Keyring.*
-
update:
$(UPDATER)
Files old/Gnome.Keyring-0.1.0/Gnome.Keyring.snk and new/gnome-keyring-sharp-1.0.0/Gnome.Keyring.snk differ
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/INSTALL new/gnome-keyring-sharp-1.0.0/INSTALL
--- old/Gnome.Keyring-0.1.0/INSTALL 2006-11-25 13:03:38.000000000 +0100
+++ new/gnome-keyring-sharp-1.0.0/INSTALL 2008-05-01 16:41:30.000000000 +0200
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
-Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
+2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,7 +10,10 @@
Basic Installation
==================
-These are generic installation instructions.
+Briefly, the shell commands `./configure; make; make install' should
+configure, build, and install this package. The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -23,9 +26,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. (Caching is
+the results of its tests to speed up reconfiguring. Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.)
+cache files.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -35,20 +38,17 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You only need
-`configure.ac' if you want to change it or regenerate `configure' using
-a newer version of `autoconf'.
+`configure' by a program called `autoconf'. You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system. If you're
- using `csh' on an old version of System V, you might need to type
- `sh ./configure' instead to prevent `csh' from trying to execute
- `configure' itself.
+ `./configure' to configure the package for your system.
- Running `configure' takes awhile. While running, it prints some
- messages telling which features it is checking for.
+ Running `configure' might take a while. While running, it prints
+ some messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,6 +67,9 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
+ 6. Often, you can also type `make uninstall' to remove the installed
+ files again.
+
Compilers and Options
=====================
@@ -78,7 +81,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,17 +90,15 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you must use a version of `make' that
-supports the `VPATH' variable, such as GNU `make'. `cd' to the
+own directory. To do this, you can use GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- If you have to use a `make' that does not support the `VPATH'
-variable, you have to compile the package for one architecture at a
-time in the source code directory. After you have installed the
-package for one architecture, use `make distclean' before reconfiguring
-for another architecture.
+ With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory. After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
Installation Names
==================
@@ -190,12 +191,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script). Here is a another example:
+overridden in the site shell script).
- /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf bug. Until the bug is fixed you can use this workaround:
-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
-configuration-related scripts to be executed by `/bin/bash'.
+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
`configure' Invocation
======================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/Makefile.am new/gnome-keyring-sharp-1.0.0/Makefile.am
--- old/Gnome.Keyring-0.1.0/Makefile.am 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/Makefile.am 2008-08-08 19:36:12.000000000 +0200
@@ -1,2 +1,3 @@
SUBDIRS=src docs sample
+EXTRA_DIST=Gnome.Keyring.snk
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/missing new/gnome-keyring-sharp-1.0.0/missing
--- old/Gnome.Keyring-0.1.0/missing 2006-11-25 13:03:38.000000000 +0100
+++ new/gnome-keyring-sharp-1.0.0/missing 2008-05-01 16:41:30.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/README new/gnome-keyring-sharp-1.0.0/README
--- old/Gnome.Keyring-0.1.0/README 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/README 2008-08-08 19:36:12.000000000 +0200
@@ -1,7 +1,6 @@
-Last updated: 2006-08-01
-
README for gnome-keyring-sharp
----------------------------
+------------------------------
+
gnome-keyring-sharp is a fully managed implementation of libgnome-keyring.
When the gnome-keyring-daemon is running, you can use this to retrive/store
@@ -20,5 +19,24 @@
src/
Source files for the library
+D-Bus integration
+-----------------
+
+When the NDesk.DBus library and C# 2.0 build environment is detected,
+gnome-keyring-sharp will be built with D-Bus support.
+
+In this mode of operation, D-Bus is used to determine the socket address
+of the keyring daemon, which can be more reliable than taking the value
+provided in an environment variable (which is still done as a fallback if
+D-Bus is not running).
+
+This optional dependency can be found at http://www.ndesk.org/DBusSharp
+and is widely packaged by distributions.
+
+
Maintainer: gonzalo@ximian.com
+Support is available via the Mono mailing list:
+ http://lists.ximian.com/mailman/listinfo/mono-list
+ mono-list@lists.ximian.com
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/src/Gnome.Keyring/AssemblyInfo.cs.in new/gnome-keyring-sharp-1.0.0/src/Gnome.Keyring/AssemblyInfo.cs.in
--- old/Gnome.Keyring-0.1.0/src/Gnome.Keyring/AssemblyInfo.cs.in 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/src/Gnome.Keyring/AssemblyInfo.cs.in 2008-08-08 19:36:12.000000000 +0200
@@ -28,9 +28,12 @@
using System.Reflection;
using System.Runtime.CompilerServices;
-[assembly: AssemblyVersion("@VERSION@")]
+[assembly: AssemblyFileVersion("@VERSION@")]
+[assembly: AssemblyInformationalVersion("@VERSION@")]
+[assembly: AssemblyVersion("@API_VERSION@")]
[assembly: AssemblyTitle ("Gnome.Keyring")]
-[assembly: AssemblyDescription ("")]
+[assembly: AssemblyDescription ("Client library to access the GNOME Keyring daemon")]
[assembly: AssemblyCopyright ("(c) 2006 Novell, Inc.")]
[assembly: AssemblyCompany ("Novell, Inc.")]
+[assembly: AssemblyKeyFile ("Gnome.Keyring.snk")]
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/src/gnome-keyring-sharp-1.0.pc.in new/gnome-keyring-sharp-1.0.0/src/gnome-keyring-sharp-1.0.pc.in
--- old/Gnome.Keyring-0.1.0/src/gnome-keyring-sharp-1.0.pc.in 1970-01-01 01:00:00.000000000 +0100
+++ new/gnome-keyring-sharp-1.0.0/src/gnome-keyring-sharp-1.0.pc.in 2008-08-08 19:36:12.000000000 +0200
@@ -0,0 +1,8 @@
+prefix=@prefix@
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+Name: Gnome.Keyring
+Description: Client library to access the GNOME Keyring daemon
+Version: @VERSION@
+Libs: -r:${libdir}/mono/@PACKAGE@-@API_VERSION@/Gnome.Keyring.dll
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/src/gnome-keyring-sharp.pc.in new/gnome-keyring-sharp-1.0.0/src/gnome-keyring-sharp.pc.in
--- old/Gnome.Keyring-0.1.0/src/gnome-keyring-sharp.pc.in 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/src/gnome-keyring-sharp.pc.in 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-prefix=@prefix@
-assemblies_dir=${prefix}/lib/Gnome.Keyring
-Libraries=${assemblies_dir}/Gnome.Keyring.dll
-
-Name: Gnome.Keyring
-Description: Gnome.Keyring.dll -
-Version: 0.1
-Libs: -r:${assemblies_dir}/Gnome.Keyring.dll
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/Gnome.Keyring-0.1.0/src/Makefile.am new/gnome-keyring-sharp-1.0.0/src/Makefile.am
--- old/Gnome.Keyring-0.1.0/src/Makefile.am 2007-04-04 23:33:14.000000000 +0200
+++ new/gnome-keyring-sharp-1.0.0/src/Makefile.am 2008-08-08 19:36:12.000000000 +0200
@@ -1,15 +1,16 @@
SUBDIRS=Gnome.Keyring
+ASSEMBLY_NAME=Gnome.Keyring
+ASSEMBLY=$(ASSEMBLY_NAME).dll
+SNK=$(ASSEMBLY_NAME).snk
+
pkgconfigdir=$(libdir)/pkgconfig
CSFLAGS+= -debug+ -debug:full -nologo -r:Mono.Posix.dll
-gnomekeyringdir = $(prefix)/lib/Gnome.Keyring
-pkgconfig_DATA = gnome-keyring-sharp.pc
-gnomekeyring_SCRIPTS = Gnome.Keyring.dll
+pkgconfig_DATA = gnome-keyring-sharp-1.0.pc
-CLEANFILES = Gnome.Keyring.dll*
+CLEANFILES = $(ASSEMBLY_NAME).*
-#
gnomekeyring_references = $(DBUS_LIBS)
gnomekeyring_sources = \
@@ -31,6 +32,21 @@
gnomekeyring_build_sources = $(addprefix $(srcdir)/, $(gnomekeyring_sources)) $(addprefix $(top_builddir)/src/Gnome.Keyring/, AssemblyInfo.cs)
-Gnome.Keyring.dll: $(gnomekeyring_build_sources)
+all: $(ASSEMBLY)
+
+$(ASSEMBLY): $(gnomekeyring_build_sources) $(SNK)
$(CSC) $(CSFLAGS) $(gnomekeyring_references) -target:library -out:$@ $(gnomekeyring_build_sources)
+$(SNK): $(top_srcdir)/$(SNK)
+ cp $(top_srcdir)/$(SNK) .
+
+### GAC install rules ###
+
+install-data-local:
+ echo "$(GACUTIL) /i $(ASSEMBLY) $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) /i $(ASSEMBLY) /package $(PACKAGE)-$(API_VERSION) $(GACUTIL_FLAGS) || exit 1;
+
+uninstall-local:
+ echo "$(GACUTIL) /u $(ASSEMBLY_NAME) $(GACUTIL_FLAGS)"; \
+ $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE)-$(API_VERSION) $(GACUTIL_FLAGS) || exit 1;
+
++++++ pkgconfigdir.patch ++++++
--- src/Makefile.am 2008-08-06 17:15:25.000000000 -0600
+++ src/Makefile.am 2008-08-06 17:15:41.000000000 -0600
@@ -4,7 +4,7 @@
ASSEMBLY=$(ASSEMBLY_NAME).dll
SNK=$(ASSEMBLY_NAME).snk
-pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(datadir)/pkgconfig
CSFLAGS+= -debug+ -debug:full -nologo -r:Mono.Posix.dll
pkgconfig_DATA = gnome-keyring-sharp-1.0.pc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org