[arch-commits] Commit in f-spot/trunk (3 files)
Jan de Groot
jgc at archlinux.org
Tue Oct 14 07:27:48 UTC 2008
Date: Tuesday, October 14, 2008 @ 03:27:48
Author: jgc
Revision: 15520
upgpkg: f-spot 0.5.0.2-1
Modified:
f-spot/trunk/PKGBUILD
Deleted:
f-spot/trunk/makefile-destdir.patch
f-spot/trunk/mono-1.9.1-compilefix.patch
-----------------------------+
PKGBUILD | 26 ++++++++++----------------
makefile-destdir.patch | 20 --------------------
mono-1.9.1-compilefix.patch | 20 --------------------
3 files changed, 10 insertions(+), 56 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-10-14 07:05:41 UTC (rev 15519)
+++ PKGBUILD 2008-10-14 07:27:48 UTC (rev 15520)
@@ -3,36 +3,30 @@
# Contributor: Kritoke <kritoke at nospam.gmail.com>
pkgname=f-spot
-pkgver=0.4.4
+pkgver=0.5.0.2
pkgrel=1
pkgdesc="A personal photo management program for GNOME"
url="http://www.gnome.org/projects/f-spot/"
arch=(i686 x86_64)
license=('GPL')
-depends=('gnome-desktop-sharp>=2.20.1' 'ndesk-dbus-glib>=0.4.1' 'lcms' 'libexif' 'libgphoto2>=2.4.0-6' 'libjpeg' 'sqlite3' 'libgnomeui>=2.22.1' 'desktop-file-utils')
-makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.12.2' 'gnome-screensaver>=2.22.2')
+depends=('gnome-desktop-sharp>=2.24.0' 'ndesk-dbus-glib>=0.4.1' 'lcms' 'libexif' 'libgphoto2>=2.4.2' 'sqlite3' 'libgnomeui>=2.24.0' 'desktop-file-utils')
+makedepends=('perlxml' 'pkgconfig' 'gnome-doc-utils>=0.14.0' 'gnome-screensaver>=2.24.0')
options=('!libtool' '!makeflags')
install=f-spot.install
-source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.4/f-spot-${pkgver}.tar.bz2
- mono-1.9.1-compilefix.patch
- makefile-destdir.patch)
-md5sums=('54cab07d300c0bef9049b0aeea196d1b' '0ae9f0df27fd52504a96d9e39829dd0f'\
- '62a2b3d433bc1b45340ad7725848e89e')
+source=(http://ftp.gnome.org/pub/gnome/sources/f-spot/0.5/f-spot-${pkgver}.tar.bz2)
build() {
- export MONO_SHARED_DIR="${startdir}/src/.wabi"
+ export MONO_SHARED_DIR="${srcdir}/.wabi"
mkdir -p "${MONO_SHARED_DIR}"
- cd ${startdir}/src/${pkgname}-${pkgver}
- patch -Np0 -i ${startdir}/src/mono-1.9.1-compilefix.patch || return 1
- patch -Np0 -i ${startdir}/src/makefile-destdir.patch || return 1
+ cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --sysconfdir=/etc \
--localstatedir=/var --disable-static \
--disable-scrollkeeper || return 1
make || return 1
- make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR=${startdir}/pkg install || return 1
+ make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="${pkgdir}" install || return 1
- install -m755 -d ${startdir}/pkg/usr/share/gconf/schemas
- gconf-merge-schema ${startdir}/pkg/usr/share/gconf/schemas/${pkgname}.schemas ${startdir}/pkg/etc/gconf/schemas/*.schemas || return 1
- rm -f ${startdir}/pkg/etc/gconf/schemas/*.schemas
+ install -m755 -d "${pkgdir}/usr/share/gconf/schemas"
+ gconf-merge-schema "${pkgdir}/usr/share/gconf/schemas/${pkgname}.schemas" ${pkgdir}/etc/gconf/schemas/*.schemas || return 1
+ rm -f ${pkgdir}/etc/gconf/schemas/*.schemas
}
Deleted: makefile-destdir.patch
===================================================================
--- makefile-destdir.patch 2008-10-14 07:05:41 UTC (rev 15519)
+++ makefile-destdir.patch 2008-10-14 07:27:48 UTC (rev 15520)
@@ -1,20 +0,0 @@
---- Makefile.in.orig 2008-06-01 15:48:02.000000000 +0000
-+++ Makefile.in 2008-06-01 15:48:50.000000000 +0000
-@@ -892,14 +892,14 @@
- install-data-hook:
- $(UPDATE_DESKTOP)
- if [ "x$(DIR_GIO)" != "x" ] ; then \
-- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(libdir)/f-spot/; \
-- $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(libdir)/f-spot/; \
-+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/; \
-+ $(install_sh_DATA) $(top_builddir)/gio-sharp/gio/gio-sharp.dll.config $(DESTDIR)$(libdir)/f-spot/; \
- fi
-
- uninstall-hook:
- $(UPDATE_DESKTOP)
- if [ "x$(DIR_GIO)" != "x" ] ; then \
-- rm -f $(libdir)/f-spot/gio-sharp.dll $(libdir)/f-spot/gio-sharp.dll.config; \
-+ rm -f $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll $(DESTDIR)$(libdir)/f-spot/gio-sharp.dll.config; \
- fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
Deleted: mono-1.9.1-compilefix.patch
===================================================================
--- mono-1.9.1-compilefix.patch 2008-10-14 07:05:41 UTC (rev 15519)
+++ mono-1.9.1-compilefix.patch 2008-10-14 07:27:48 UTC (rev 15520)
@@ -1,20 +0,0 @@
---- extensions/SmugMugExport/Makefile.in.orig 2008-06-01 15:30:29.000000000 +0000
-+++ extensions/SmugMugExport/Makefile.in 2008-06-01 15:30:53.000000000 +0000
-@@ -314,7 +314,7 @@
- -r:$(DIR_TAO_EXTENSIONLOADER)/Tao.OpenGl.ExtensionLoader.dll
-
- CSC_FLAGS = -debug
--CSC_LIB = gmcs $(CSC_FLAGS) -target:library
-+CSC_LIB = gmcs -target:library
- MONO_DEBUGFLAGS = --debug
- RUNTIME = mono $(MONO_DEBUGFLAGS)
- PLUGIN_NAME = SmugMugExport
-@@ -702,7 +702,7 @@
-
- $(PLUGIN_ASSEMBLY): $(PLUGIN_SOURCES) $(PLUGIN_MANIFEST)
- $(MAKE) -C $(SUBDIRS)
-- $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES)
-+ $(CSC_LIB) -out:$@ $(PLUGIN_SOURCES) $(REFS) $(PKGS) $(ASSEMBLIES) $(RESOURCES) -g
-
- install-data-hook:
- rm -f $(plugindir)/$(PLUGIN_NAME).addin.xml
More information about the arch-commits
mailing list