rpms/f-spot/devel 0003-use-system-Gnome.Keyring-if-available.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 f-spot.spec, 1.96, 1.97 sources, 1.24, 1.25 0001-remove-support-for-older-cairo-version.patch, 1.1, NONE
chkr
chkr at fedoraproject.org
Sun Nov 8 17:43:40 UTC 2009
Author: chkr
Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5420
Modified Files:
.cvsignore f-spot.spec sources
Added Files:
0003-use-system-Gnome.Keyring-if-available.patch
Removed Files:
0001-remove-support-for-older-cairo-version.patch
Log Message:
* Sun Nov 08 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-1
- Update to 0.6.1.5 (BZ 531955)
- Build f-spot against system gnome-keyring-sharp library (BZ 442343)
- Make all .dll and .exe files executable so that they are respected
by the find-requires/find-provides scripts
- Remove upstreamed patch
0003-use-system-Gnome.Keyring-if-available.patch:
Makefile.include | 2 --
configure.ac | 19 +++++++++++++++++++
lib/Makefile.am | 4 ++--
3 files changed, 21 insertions(+), 4 deletions(-)
--- NEW FILE 0003-use-system-Gnome.Keyring-if-available.patch ---
>From c9686697f9f46e3e1e795a8e0942f80057a40b1c Mon Sep 17 00:00:00 2001
From: Christian Krause <chkr at plauener.de>
Date: Sun, 8 Nov 2009 16:08:25 +0100
Subject: [PATCH 3/3] use system gnome-keyring if available
---
Makefile.include | 2 --
configure.ac | 19 +++++++++++++++++++
lib/Makefile.am | 3 ++-
3 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Makefile.include b/Makefile.include
index 43e748f..5afad6a 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -9,7 +9,6 @@ DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
DIR_GPHOTO2 = $(top_builddir)/lib/libgphoto2-sharp
DIR_ICONS = $(top_builddir)/icons
DIR_JPEGTRAN = $(top_builddir)/lib/libjpegtran
-DIR_KEYRING = $(top_builddir)/lib/gnome-keyring-sharp
DIR_LIBFSPOT = $(top_builddir)/lib/libfspot
DIR_SEMWEB = $(top_builddir)/lib/semweb
DIR_SRC = $(top_builddir)/src
@@ -18,7 +17,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
## Links
-LINK_KEYRING = -r:$(DIR_KEYRING)/gnome-keyring-sharp.dll
LINK_GLITZ = -r:$(DIR_GLITZ)/NDesk.Glitz.dll
LINK_GPHOTO2 = -r:$(DIR_GPHOTO2)/libgphoto2-sharp.dll
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
diff --git a/configure.ac b/configure.ac
index 99c6e36..544d90d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,6 +69,7 @@ BEAGLE_REQUIRED=0.3.0
NDESK_DBUS_REQUIRED=0.4.2
NDESK_DBUS_GLIB_REQUIRED=0.3.0
MONO_ADDINS_REQUIRED=0.3.0
+KEYRING_REQUIRED=1.0.0.0
MONO_CAIRO_REQUIRED=1.2.4
CAIRO_REQUIRED=1.4.0
dnl -- this check is
@@ -174,6 +175,24 @@ AC_SUBST(DIR_ADDINS_SETUP)
AC_SUBST(DIR_ADDINS_GUI)
AC_SUBST(LINK_MONO_ADDINS)
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(GNOME_KEYRING,
+ gnome-keyring-sharp-1.0 >= $KEYRING_REQUIRED,
+[
+ DIR_KEYRING=""
+ DIR_GNOME_KEYRING=""
+ LINK_KEYRING="-pkg:gnome-keyring-sharp-1.0"
+],
+[
+ DIR_KEYRING="gnome-keyring-sharp"
+ DIR_GNOME_KEYRING='$(top_builddir)/lib/gnome-keyring-sharp'
+ LINK_KEYRING='-r:$(DIR_GNOME_KEYRING)/gnome-keyring-sharp.dll'
+])
+AC_SUBST(DIR_KEYRING)
+AC_SUBST(DIR_GNOME_KEYRING)
+AC_SUBST(LINK_KEYRING)
+
+
dnl -- nunit
PKG_CHECK_MODULES(NUNIT, nunit >= $NUNIT_REQUIRED,
do_tests="yes", do_tests="no")
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ea888d8..7e7bc4e 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -5,7 +5,6 @@ UNCONDITIONAL_SUBDIRS = \
GKeyFile \
gio-sharp \
glitz-sharp \
- gnome-keyring-sharp \
gtk-sharp-beans \
libjpegtran \
libfspot \
@@ -20,6 +19,7 @@ SUBDIRS = \
$(DIR_DBUS) \
$(DIR_DBUS_GLIB) \
$(DIR_ADDINS) \
+ $(DIR_GNOME_KEYRING) \
$(UNCONDITIONAL_SUBDIRS)
DIST_SUBDIRS = \
@@ -27,5 +27,6 @@ DIST_SUBDIRS = \
dbus-sharp-glib \
dpap-sharp \
mono-addins \
+ gnome-keyring-sharp \
$(UNCONDITIONAL_SUBDIRS)
--
1.6.2.5
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- .cvsignore 4 Oct 2009 19:55:29 -0000 1.24
+++ .cvsignore 8 Nov 2009 17:43:40 -0000 1.25
@@ -1 +1 @@
-f-spot-0.6.1.3.tar.bz2
+f-spot-0.6.1.5.tar.bz2
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- f-spot.spec 26 Oct 2009 20:42:27 -0000 1.96
+++ f-spot.spec 8 Nov 2009 17:43:40 -0000 1.97
@@ -1,6 +1,6 @@
Name: f-spot
-Version: 0.6.1.3
-Release: 2%{?dist}
+Version: 0.6.1.5
+Release: 1%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
@@ -11,8 +11,8 @@ Source0: http://ftp.gnome.org/pub
Patch2: 0001-use-system-Mono.Addins-if-available.patch
# unmount cameras before importing
Patch3: 0002-enhance-the-f-spot-import-script.patch
-# http://bugzilla.gnome.org/show_bug.cgi?id=596922
-Patch5: 0001-remove-support-for-older-cairo-version.patch
+# Use system gnome-keyring
+Patch4: 0003-use-system-Gnome.Keyring-if-available.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -28,6 +28,7 @@ BuildRequires: gnome-doc-utils
BuildRequires: ndesk-dbus-glib-devel
BuildRequires: mono-addins-devel
BuildRequires: desktop-file-utils
+BuildRequires: gnome-keyring-sharp-devel
Requires: sqlite >= 3.3.1
Requires: lcms
Requires: dcraw
@@ -63,9 +64,9 @@ photo collection in a slideshow as a scr
%prep
%setup -q
-%patch2 -p1 -b .link-system-mono-addins
+%patch2 -p1 -F 2 -b .link-system-mono-addins
%patch3 -p1 -b .gvfs-gphoto
-%patch5 -p1 -F 2 -b .cairo-fix
+%patch4 -p1 -b .link-system-keyring
%build
autoreconf -f -i
@@ -83,8 +84,10 @@ rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.a
rm $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.exe
-chmod a+x $RPM_BUILD_ROOT%{_libdir}/%{name}/*.dll
+# only files marked executable are used to auto-generate the
+# requires/provides of the package
+find $RPM_BUILD_ROOT%{_libdir}/%{name} -name '*.exe' -or -name '*.dll' \
+ -exec chmod a+x {} \;
for file in $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
do
@@ -139,6 +142,13 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%changelog
+* Sun Nov 08 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.5-1
+- Update to 0.6.1.5 (BZ 531955)
+- Build f-spot against system gnome-keyring-sharp library (BZ 442343)
+- Make all .dll and .exe files executable so that they are respected
+ by the find-requires/find-provides scripts
+- Remove upstreamed patch
+
* Mon Oct 26 2009 Dennis Gilmore <dennis at ausil.us> - 0.6.1.3-2
- ExcludeArch sparc64
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- sources 4 Oct 2009 19:55:29 -0000 1.24
+++ sources 8 Nov 2009 17:43:40 -0000 1.25
@@ -1 +1 @@
-fbfef5c37c201f54b590f03d5b0000d5 f-spot-0.6.1.3.tar.bz2
+411bac8266a60d9a728218d19dd5e735 f-spot-0.6.1.5.tar.bz2
--- 0001-remove-support-for-older-cairo-version.patch DELETED ---
More information about the scm-commits
mailing list