Update of /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28991
Modified Files:
seahorse.info
Added Files:
seahorse.patch
Log Message:
Cleaner disabling of update-mime-database at compile-time.
Index: seahorse.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/crypto/finkinfo/seahorse.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- seahorse.info 18 Jan 2006 01:20:46 -0000 1.1
+++ seahorse.info 18 Jan 2006 23:11:08 -0000 1.2
@@ -5,17 +5,22 @@
Source: mirror:gnome:sources/%n/%v/%n-%v.tar.bz2
Source-MD5: b8c4878cdcbf57e9885583672934772c
-BuildDepends: intltool, gconf2-dev, libgnome2-dev, libgnomeui2-dev,
libbonobo2-dev, libbonoboui2-dev, libgnomecanvas2-dev, popt, libxml2, atk1,
gnome-keyring-dev, x11-dev, pango1-xft2-dev, gtk+2-dev, gnome-vfs2-ssl-dev |
gnome-vfs2-dev, libglade2, orbit2-dev, glib2-dev, libgettext3-dev,
gettext-tools, libiconv-dev, gpgme11, libsoup2.2.8-ssl, libtasn1, gnutls12,
libgcrypt, libart2, audiofile, esound, libjpeg, pth
+BuildDepends: intltool, gconf2-dev, libgnome2-dev, libgnomeui2-dev,
libbonobo2-dev, libbonoboui2-dev, libgnomecanvas2-dev, popt, libxml2, atk1,
gnome-keyring-dev, x11-dev, pango1-xft2-dev, gtk+2-dev, gnome-vfs2-ssl-dev |
gnome-vfs2-dev, libglade2, orbit2-dev, glib2-dev, libgettext3-dev,
gettext-tools, libiconv-dev, gpgme11, libsoup2.2.8-ssl, libtasn1, gnutls12,
libgcrypt, libart2, audiofile, esound, libjpeg, pth, automake1.9
Depends: %N-shlibs (>= %v-%r), gconf2-shlibs, gconf2, libgnome2-shlibs,
libgnomeui2-shlibs, libbonobo2-shlibs, libbonoboui2-shlibs,
libgnomecanvas2-shlibs, popt-shlibs, libxml2-shlibs, atk1-shlibs,
gnome-keyring-shlibs, x11, pango1-xft2-shlibs, gtk+2-shlibs,
gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, libglade2-shlibs, orbit2-shlibs,
glib2-shlibs, libgettext3-shlibs, libiconv, gnupg, gpgme11-shlibs,
libsoup2.2.8-ssl-shlibs, libtasn1-shlibs, gnutls12-shlibs, libgcrypt-shlibs,
libart2-shlibs, audiofile-shlibs, esound-shlibs, libjpeg-shlibs, pth-shlibs,
scrollkeeper, shared-mime-info
+Patch: %n.patch
PatchScript: <<
- perl -pi -e 's/(-scrollkeeper-update)/#\1/' help/C/Makefile.in
- perl -pi -e 's/(update-mime-database)/#\1/' plugins/nautilus/Makefile.in
- perl -pi -e 's/(chmod)/#\1/' agent/Makefile.in
+ perl -ni -e 'print unless /-scrollkeeper-update/' omf.make
+ perl -ni -e 'print unless /chmod/' agent/Makefile.am
<<
-ConfigureParams: --mandir=%p/share/man --disable-schemas-install
--disable-dependency-tracking --disable-ldap --disable-gedit --disable-nautilus
+ConfigureParams: --mandir=%p/share/man --disable-schemas-install
--disable-dependency-tracking --disable-ldap --disable-gedit --disable-nautilus
--disable-update-mime-database
SetCPPFLAGS: -Wall
+CompileScript: <<
+ autoreconf -fi
+ ./configure %c
+ make
+<<
InstallScript: make install DESTDIR=%d
DocFiles: AUTHORS COPYING* ChangeLog po/ChangeLog:ChangeLog.po NEWS README
THANKS TODO
--- NEW FILE: seahorse.patch ---
diff -Nurd -x'*~' seahorse-0.8.orig/configure.in seahorse-0.8/configure.in
--- seahorse-0.8.orig/configure.in 2005-10-05 17:47:11.000000000 -0400
+++ seahorse-0.8/configure.in 2006-01-18 16:20:56.000000000 -0500
@@ -353,6 +353,13 @@
AM_GLIB_GNU_GETTEXT
+AC_ARG_ENABLE(update-mime-database,
+ AC_HELP_STRING([--disable-update-mime-database],
+ [do not run the update-mime-database utility (mostly useful for package
maintainers)]),
+ [],
+ [enable_update_mime_database=yes])
+AM_CONDITIONAL(UPDATE_MIME_DATABASE, test "$enable_update_mime_database" =
"yes")
+
dnl ******************************
AC_OUTPUT([
diff -Nurd -x'*~' seahorse-0.8.orig/plugins/nautilus/Makefile.am
seahorse-0.8/plugins/nautilus/Makefile.am
--- seahorse-0.8.orig/plugins/nautilus/Makefile.am 2005-04-11
18:51:43.000000000 -0400
+++ seahorse-0.8/plugins/nautilus/Makefile.am 2006-01-18 16:21:56.000000000
-0500
@@ -10,7 +10,7 @@
bin_PROGRAMS = seahorse-pgp-preferences
seahorse_pgp_preferences_SOURCES = seahorse-pgp-preferences.c
-
+
seahorse_pgp_preferences_LDADD = \
$(top_builddir)/libseahorse/libseahorse-internal.la \
$(SEAHORSE_LIBS)
@@ -23,13 +23,19 @@
mimedir = $(datadir)/mime/packages
mime_DATA = seahorse.xml
+if UPDATE_MIME_DATABASE
install-data-local:
mkdir -p $(datadir)/mime/packages/
update-mime-database $(datadir)/mime/
-
+
uninstall-local:
update-mime-database $(datadir)/mime/
-
+else
+install-data-local:
+
+uninstall-local:
+endif
+
@INTLTOOL_DESKTOP_RULE@
olddesktopdir = $(datadir)/control-center-2.0/capplets
olddesktop_in_files = seahorse-pgp-preferences.desktop.in
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
