rpms/f-spot/devel 0001-fix-parallel-build.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 0001-use-system-Mono.Addins-if-available.patch, 1.1, 1.2 f-spot.spec, 1.90, 1.91 sources, 1.21, 1.22 0001-use-the-correct-stock-icon.patch, 1.1, NONE
chkr
chkr at fedoraproject.org
Thu Sep 17 18:31:45 UTC 2009
- Previous message (by thread): rpms/gupnp-igd/devel gupnp-igd.spec,1.5,1.6
- Next message (by thread): rpms/virt-manager/devel state_paused.png, NONE, 1.1 state_running.png, NONE, 1.1 state_shutoff.png, NONE, 1.1 virt-manager-0.8.0-conn-close-exception.patch, NONE, 1.1 virt-manager-0.8.0-manager-ui-tweaks.patch, NONE, 1.1 virt-manager-0.8.0-stats-logging.patch, NONE, 1.1 virt-manager.spec, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: chkr
Update of /cvs/pkgs/rpms/f-spot/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv964
Modified Files:
.cvsignore 0001-use-system-Mono.Addins-if-available.patch
f-spot.spec sources
Added Files:
0001-fix-parallel-build.patch
Removed Files:
0001-use-the-correct-stock-icon.patch
Log Message:
* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
- move the screensaver plugin into a sub-package (BZ 519640)
- let f-spot-screensaver obsolete older f-spot version so that it
is pulled in during update (fresh installations of f-spot will not
pull in gnome-screensaver)
* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
- update to 0.6.1.1
- remove upstreamed patch
- updated use-system-Mono.Addins-if-available patch
- add a patch to enable parallel build
0001-fix-parallel-build.patch:
extensions/Exporters/FlickrExport/Makefile.am | 3 ---
extensions/Exporters/PicasaWebExport/Makefile.am | 3 ---
extensions/Exporters/SmugMugExport/Makefile.am | 4 ----
extensions/Exporters/TabbloExport/Makefile.am | 3 ---
src/Makefile.am | 5 ++---
5 files changed, 2 insertions(+), 16 deletions(-)
--- NEW FILE 0001-fix-parallel-build.patch ---
diff --git a/extensions/Exporters/FlickrExport/Makefile.am b/extensions/Exporters/FlickrExport/Makefile.am
index 812904c..6457ffd 100644
--- a/extensions/Exporters/FlickrExport/Makefile.am
+++ b/extensions/Exporters/FlickrExport/Makefile.am
@@ -34,13 +34,10 @@ RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-all: $(PLUGIN_ASSEMBLY)
-
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/PicasaWebExport/Makefile.am b/extensions/Exporters/PicasaWebExport/Makefile.am
index 45e3bac..b617fc8 100644
--- a/extensions/Exporters/PicasaWebExport/Makefile.am
+++ b/extensions/Exporters/PicasaWebExport/Makefile.am
@@ -35,13 +35,10 @@ RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_MANIFEST) \
-resource:$(srcdir)/$(PLUGIN_NAME).glade
-all: $(PLUGIN_ASSEMBLY)
-
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/SmugMugExport/Makefile.am b/extensions/Exporters/SmugMugExport/Makefile.am
index 397461f..f96d603 100644
--- a/extensions/Exporters/SmugMugExport/Makefile.am
+++ b/extensions/Exporters/SmugMugExport/Makefile.am
@@ -34,14 +34,10 @@ RESOURCES = \
SUBDIRS = \
SmugMugNet
-
-all: $(PLUGIN_ASSEMBLY)
-
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/extensions/Exporters/TabbloExport/Makefile.am b/extensions/Exporters/TabbloExport/Makefile.am
index b7465d6..915a95f 100644
--- a/extensions/Exporters/TabbloExport/Makefile.am
+++ b/extensions/Exporters/TabbloExport/Makefile.am
@@ -44,13 +44,10 @@ RESOURCES = \
-resource:$(srcdir)/$(PLUGIN_NAME).glade \
-resource:$(srcdir)/TrustError.glade
-all: $(PLUGIN_ASSEMBLY)
-
mpack: $(PLUGIN_ASSEMBLY)
mautil p $(PLUGIN_ASSEMBLY)
$(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIRS)
$(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
plugindir = $(pkglibdir)/extensions
diff --git a/src/Makefile.am b/src/Makefile.am
index 02add7d..ba9bcaf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -509,13 +509,13 @@ FSpot.JobScheduler.dll: $(JOBSCHEDULER_CSFILES) FSpot.Utils.dll
FSpot.Bling.dll.mdb: FSpot.Bling.dll
-FSpot.Bling.dll: $(BLING_CSFILES)
+FSpot.Bling.dll: $(BLING_CSFILES) FSpot.Utils.dll
@echo -e "\n*** Compiling $@"
$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(BLING_CSFILES) $(BLING_ASSEMBLIES)
FSpot.Widgets.dll.mdb: FSpot.Widgets.dll
-FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll
+FSpot.Widgets.dll: $(WIDGETS_CSFILES) FSpot.Utils.dll FSpot.Core.dll Cms.dll
@echo -e "\n*** Compiling $@"
$(CSC_LIB) -out:$@ $(EXTRAFLAGS) $(WIDGETS_CSFILES) $(WIDGETS_ASSEMBLIES)
--
1.6.0.6
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore 9 Aug 2009 14:43:22 -0000 1.21
+++ .cvsignore 17 Sep 2009 18:31:43 -0000 1.22
@@ -1 +1 @@
-f-spot-0.6.0.0.tar.bz2
+f-spot-0.6.1.1.tar.bz2
0001-use-system-Mono.Addins-if-available.patch:
Makefile.include | 7 -------
configure.ac | 28 ++++++++++++++++++++++++++++
lib/Makefile.am | 4 ++--
3 files changed, 30 insertions(+), 9 deletions(-)
Index: 0001-use-system-Mono.Addins-if-available.patch
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/0001-use-system-Mono.Addins-if-available.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- 0001-use-system-Mono.Addins-if-available.patch 9 Aug 2009 14:43:22 -0000 1.1
+++ 0001-use-system-Mono.Addins-if-available.patch 17 Sep 2009 18:31:44 -0000 1.2
@@ -1,5 +1,5 @@
diff --git a/Makefile.include b/Makefile.include
-index efd6d72..4be9a8b 100644
+index ca739b8..43e748f 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -3,9 +3,6 @@
@@ -12,7 +12,7 @@ index efd6d72..4be9a8b 100644
DIR_DOCS = $(top_builddir)/docs
DIR_EXTENSIONS = $(top_builddir)/extensions
DIR_GLITZ = $(top_builddir)/lib/glitz-sharp/src
-@@ -28,10 +25,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
+@@ -24,10 +21,6 @@ DIR_GTKSHARPBEANS = $(top_builddir)/lib/gtk-sharp-beans
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
@@ -21,10 +21,10 @@ index efd6d72..4be9a8b 100644
- -r:$(DIR_ADDINS_SETUP)/Mono.Addins.Setup.dll \
- -r:$(DIR_ADDINS_GUI)/Mono.Addins.Gui.dll
LINK_SEMWEB = -r:$(DIR_SEMWEB)/SemWeb.dll
- LINK_TAO = \
- -r:$(DIR_TAO_OPENGL)/Tao.OpenGl.dll \
+ LINK_GIOSHARP = -r:$(DIR_GIOSHARP)/gio-sharp.dll
+ LINK_GTKSHARPBEANS = -r:$(DIR_GTKSHARPBEANS)/gtk-sharp-beans.dll
diff --git a/configure.ac b/configure.ac
-index e31bd27..1acaaa6 100644
+index fe0bdc9..237e6bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ GTK_REQUIRED=2.14
@@ -35,9 +35,9 @@ index e31bd27..1acaaa6 100644
MONO_CAIRO_REQUIRED=1.2.4
dnl -- this check is
LCMS_REQUIRED=1.12
-@@ -127,6 +128,33 @@ AC_SUBST(LINK_BEAGLE)
-
- AC_SUBST(CSC_DEFINES)
+@@ -146,6 +147,33 @@ AC_SUBST(DIR_DBUS_GLIB)
+ AC_SUBST(LINK_DBUS)
+ AC_SUBST(PATH_DBUS)
+dnl -- mono-addins link or bundle ?
+PKG_CHECK_MODULES(MONO_ADDINS,
@@ -66,11 +66,11 @@ index e31bd27..1acaaa6 100644
+AC_SUBST(DIR_ADDINS_GUI)
+AC_SUBST(LINK_MONO_ADDINS)
+
- dnl -- dbus-sharp: link or bundle ?
- PKG_CHECK_MODULES(NDESK_DBUS, ndesk-dbus-1.0 >= $NDESK_DBUS_REQUIRED ndesk-dbus-glib-1.0 >= $NDESK_DBUS_GLIB_REQUIRED,
- [
+ 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 c6d69f9..d0b9a6c 100644
+index f2adf82..ea888d8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -10,7 +10,6 @@ UNCONDITIONAL_SUBDIRS = \
@@ -78,21 +78,21 @@ index c6d69f9..d0b9a6c 100644
libfspot \
libgphoto2-sharp \
- mono-addins \
- semweb \
- Tao
+ semweb
-@@ -21,11 +20,13 @@ UNCONDITIONAL_SUBDIRS = \
+ # Depending on whether the packaged ndesk-dbus is used, we might not want to
+@@ -20,11 +19,13 @@ UNCONDITIONAL_SUBDIRS = \
SUBDIRS = \
$(DIR_DBUS) \
$(DIR_DBUS_GLIB) \
-+ $(DIR_ADDINS) \
++ $(DIR_ADDINS) \
$(UNCONDITIONAL_SUBDIRS)
DIST_SUBDIRS = \
dbus-sharp \
dbus-sharp-glib \
-+ mono-addins \
dpap-sharp \
++ mono-addins \
$(UNCONDITIONAL_SUBDIRS)
--
Index: f-spot.spec
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/f-spot.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- f-spot.spec 9 Aug 2009 15:57:15 -0000 1.90
+++ f-spot.spec 17 Sep 2009 18:31:44 -0000 1.91
@@ -1,14 +1,14 @@
Name: f-spot
-Version: 0.6.0.0
-Release: 3%{?dist}
+Version: 0.6.1.1
+Release: 2%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+ and CPL and MIT
URL: http://f-spot.org/
Source0: http://ftp.gnome.org/pub/gnome/sources/f-spot/0.6/f-spot-%{version}.tar.bz2
-# http://bugzilla.gnome.org/show_bug.cgi?id=591223
-Patch1: 0001-use-the-correct-stock-icon.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=593243
+Patch1: 0001-fix-parallel-build.patch
# Use system mono-addins
Patch2: 0001-use-system-Mono.Addins-if-available.patch
# unmount cameras before importing
@@ -31,7 +31,6 @@ Requires: sqlite >= 3.3.1
Requires: lcms
Requires: dcraw
Requires: hicolor-icon-theme
-Requires: gnome-screensaver
Requires: yelp
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
@@ -50,10 +49,20 @@ F-Spot is an application designed to pro
to the GNOME desktop. Features include import, export, printing and advanced
sorting and tagging of digital images.
+%package screensaver
+Summary: F-Spot gnome-screensaver plugin
+Group: Applications/Multimedia
+Requires: %{name} = %{version}-%{release}
+Requires: gnome-screensaver
+Obsoletes: f-spot < 0.6.1.1
+
+%description screensaver
+F-Spot provides a plugin for gnome-screensaver which displays parts of the
+photo collection in a slideshow as a screensaver.
+
%prep
%setup -q
-
-%patch1 -p1 -b .missing-icon
+%patch1 -p1 -b .parallel-build
%patch2 -p1 -b .link-system-mono-addins
%patch3 -p1 -b .gvfs-gphoto
@@ -61,8 +70,7 @@ sorting and tagging of digital images.
autoreconf -f -i
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
%configure --disable-scrollkeeper
-# parallel build broken in 0.6.0.0, try again with next release
-make # %{?_smp_mflags}
+make %{?_smp_mflags}
%install
@@ -108,15 +116,40 @@ gtk-update-icon-cache %{_datadir}/icons/
%{_datadir}/gnome/help/f-spot/
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/f-spot/
-%{_libdir}/f-spot/
+%dir %{_libdir}/f-spot/
+%{_libdir}/f-spot/*.dll
+%{_libdir}/f-spot/*.exe
+%{_libdir}/f-spot/*.addins
+%{_libdir}/f-spot/*.config
+%{_libdir}/f-spot/*.mdb
+%{_libdir}/f-spot/*.so
+%{_libdir}/f-spot/*.so.*
+%exclude %{_libdir}/f-spot/extensions/ScreensaverConfig.dll
+%{_libdir}/f-spot/extensions/
%{_bindir}/f-spot
%{_bindir}/f-spot-import
%{_bindir}/f-spot-sqlite-upgrade
+%{_datadir}/omf/f-spot/
+
+%files screensaver
+%defattr(-,root,root,-)
+%{_libdir}/f-spot/extensions/ScreensaverConfig.dll
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
-%{_datadir}/omf/f-spot/
%changelog
+* Fri Aug 28 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-2
+- move the screensaver plugin into a sub-package (BZ 519640)
+- let f-spot-screensaver obsolete older f-spot version so that it
+ is pulled in during update (fresh installations of f-spot will not
+ pull in gnome-screensaver)
+
+* Wed Aug 26 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.1.1-1
+- update to 0.6.1.1
+- remove upstreamed patch
+- updated use-system-Mono.Addins-if-available patch
+- add a patch to enable parallel build
+
* Sun Aug 09 2009 Christian Krause <chkr at fedoraproject.org> - 0.6.0.0-3
- Build arch ppc64.
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/f-spot/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources 9 Aug 2009 14:43:24 -0000 1.21
+++ sources 17 Sep 2009 18:31:44 -0000 1.22
@@ -1 +1 @@
-9115f9df72c5fc1c82eb46b3af01e67d f-spot-0.6.0.0.tar.bz2
+06bf6ef59be0be8dd8f5ee2d5c69d172 f-spot-0.6.1.1.tar.bz2
--- 0001-use-the-correct-stock-icon.patch DELETED ---
- Previous message (by thread): rpms/gupnp-igd/devel gupnp-igd.spec,1.5,1.6
- Next message (by thread): rpms/virt-manager/devel state_paused.png, NONE, 1.1 state_running.png, NONE, 1.1 state_shutoff.png, NONE, 1.1 virt-manager-0.8.0-conn-close-exception.patch, NONE, 1.1 virt-manager-0.8.0-manager-ui-tweaks.patch, NONE, 1.1 virt-manager-0.8.0-stats-logging.patch, NONE, 1.1 virt-manager.spec, 1.57, 1.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list