rpms/xastir/devel xastir-1.9.2-IM.patch, NONE, 1.1 xastir-1.9.2-libdir.patch, 1.1, 1.2 xastir.spec, 1.2, 1.3

[Lucian Langa (lucilanga)]

Author: lucilanga

Update of /cvs/pkgs/rpms/xastir/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12109

Modified Files:
	xastir-1.9.2-libdir.patch xastir.spec 
Added Files:
	xastir-1.9.2-IM.patch 
Log Message:
newer IM; new libdir patch

xastir-1.9.2-IM.patch:

--- NEW FILE xastir-1.9.2-IM.patch ---
--- xastir-1.9.2/acinclude.m4	2007-07-15 06:33:25.000000000 +0300
+++ xastir-1.9.2-mod/acinclude.m4	2008-05-15 20:41:29.000000000 +0300
@@ -450,7 +450,7 @@
 # because AC_CHECK_PROG will do nothing if the variable is already set!
 #
 use_imagemagick=no
-AC_PATH_PROG(MAGIC_BIN, [Magick-config], no, $BINPATH)
+AC_PATH_PROG(MAGIC_BIN, [MagickCore-config], no, $BINPATH)
 if test "$MAGIC_BIN" != "no"; then
   use_imagemagick=yes
 #else
@@ -489,7 +489,7 @@
   if test "${use_imagemagick}" = "no"; then
     AC_MSG_WARN(*** Cannot find ImageMagick include files:  Building w/o ImageMagick support. ***)
   else
-    AC_CHECK_LIB([Magick], [WriteImage], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
+    AC_CHECK_LIB([MagickCore], [WriteImage], AC_DEFINE(HAVE_IMAGEMAGICK, 1, [Imagemagick image library]), use_imagemagick="no")
     if test "${use_imagemagick}" = "no"; then
       AC_MSG_WARN(*** Cannot find ImageMagick library files:  Building w/o ImageMagick support. ***)
     fi

xastir-1.9.2-libdir.patch:

Index: xastir-1.9.2-libdir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir-1.9.2-libdir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xastir-1.9.2-libdir.patch	1 Mar 2008 08:16:26 -0000	1.1
+++ xastir-1.9.2-libdir.patch	16 May 2008 05:24:57 -0000	1.2
@@ -1,24 +1,20 @@
-diff -Naur xastir-1.9.2/Makefile.in xastir-libdir/Makefile.in
---- xastir-1.9.2/Makefile.in	2007-11-06 19:12:46.000000000 +0200
-+++ xastir-libdir/Makefile.in	2008-02-23 14:56:11.000000000 +0200
-@@ -23,7 +23,7 @@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = .
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-diff -Naur xastir-1.9.2/scripts/Makefile.in xastir-libdir/scripts/Makefile.in
---- xastir-1.9.2/scripts/Makefile.in	2007-11-06 19:12:43.000000000 +0200
-+++ xastir-libdir/scripts/Makefile.in	2008-02-23 14:48:22.000000000 +0200
-@@ -23,7 +23,7 @@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+--- xastir-1.9.2/scripts/Makefile.am	2007-01-03 21:40:49.000000000 +0200
++++ xastir-1.9.2-mod/scripts/Makefile.am	2008-05-16 08:05:53.000000000 +0300
+@@ -3,7 +3,7 @@
+ # Copyright (C) 2000-2007  The Xastir Group
+ #
+ 
+-pkglib_SCRIPTS = \
++pkgdata_SCRIPTS = \
+     Coordinate.pm \
+     coord-convert.pl \
+     fcc-get \
+@@ -34,7 +34,7 @@
+     Xastir_tigerpoly.py
+ 
+ 
+-EXTRA_DIST = $(pkglib_SCRIPTS)
++EXTRA_DIST = $(pkgdata_SCRIPTS)
+ 
+ 
+ 


Index: xastir.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xastir/devel/xastir.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xastir.spec	8 Mar 2008 16:54:01 -0000	1.2
+++ xastir.spec	16 May 2008 05:24:57 -0000	1.3
@@ -1,13 +1,14 @@
 Summary   : Amateur Station Tracking and Reporting system for amateur radio
 Name      : xastir
 Version   : 1.9.2
-Release   : 4%{?dist}
+Release   : 5%{?dist}
 License   : GPLv2
 Group     : Applications/Internet
 Source0   : http://downloads.sourceforge.net/xastir/xastir-%{version}.tar.gz
 Source1   : %{name}.desktop
 Source2   : %{name}.png
 Patch0    : xastir-1.9.2-libdir.patch
+Patch1    : xastir-1.9.2-IM.patch
 URL       : http://www.xastir.org
 BuildRoot : %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires : wget
@@ -35,6 +36,7 @@
 %prep
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .libdir
+%patch1 -p1 -b .IM
 
 %build
 #./bootstrap.sh
@@ -42,6 +44,7 @@
 #autoheader
 #autoconf
 #automake -a -c
+autoreconf -i -f
 %configure --without-graphicsmagick --with-rtree
 make %{?_smp_mflags}
 for f in README ChangeLog ; do
@@ -93,6 +96,9 @@
 %doc README.MAPS README.win32 UPGRADE
 
 %changelog
+* Thu May  5 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-5
+- Update to newer ImageMagick
+
 * Sat Mar  8 2008 Lucian Langa <cooly at gnome.eu.org> - 1.9.2-4
 - Install correct xastir icon
 - Misc cleanups