From db1a07eb0f330390e2b7fd6f4d82647f076a307d Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Mon, 9 Aug 2004 04:22:27 +0000 Subject: [PATCH] 2004-08-09 Jim Evins * configure.in: * glabels.spec.in: Cleanup of required library macros. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@442 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels2/ChangeLog | 6 ++++++ glabels2/configure.in | 21 ++++++++++++++++++++- glabels2/glabels.spec.in | 21 +++++++++++++++------ 3 files changed, 41 insertions(+), 7 deletions(-) diff --git a/glabels2/ChangeLog b/glabels2/ChangeLog index f8bba99d..e12617d8 100644 --- a/glabels2/ChangeLog +++ b/glabels2/ChangeLog @@ -1,3 +1,9 @@ +2004-08-09 Jim Evins + + * configure.in: + * glabels.spec.in: + Cleanup of required library macros. + 2004-08-08 Jim Evins * glabels.spec.in: diff --git a/glabels2/configure.in b/glabels2/configure.in index 293c19b3..ab331104 100644 --- a/glabels2/configure.in +++ b/glabels2/configure.in @@ -24,24 +24,42 @@ AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal) dnl ******************************************************************* -dnl * Check for required package and version +dnl * Check for required packages and versions dnl ******************************************************************* dnl Minimum versions of libraries GLIB_REQUIRED=2.2.0 GTK_REQUIRED=2.0.5 +LIBGNOME_REQUIRED=2.0.1 LIBGNOMEUI_REQUIRED=2.0.1 LIBBONOBO_REQUIRED=2.0.0 +LIBBONOBOUI_REQUIRED=2.0.0 LIBXML_REQUIRED=2.4.23 LIBGNOMEPRINT_REQUIRED=2.2.0 LIBGNOMEPRINTUI_REQUIRED=2.2.0 LIBGNOMECANVAS_REQUIRED=2.0.1 LIBGLADE_REQUIRED=2.0.1 + +dnl Make above strings available for rpm spec file +AC_SUBST(GLIB_REQUIRED) +AC_SUBST(GTK_REQUIRED) +AC_SUBST(LIBGNOME_REQUIRED) +AC_SUBST(LIBGNOMEUI_REQUIRED) +AC_SUBST(LIBBONOBO_REQUIRED) +AC_SUBST(LIBBONOBOUI_REQUIRED) +AC_SUBST(LIBXML_REQUIRED) +AC_SUBST(LIBGNOMEPRINT_REQUIRED) +AC_SUBST(LIBGNOMEPRINTUI_REQUIRED) +AC_SUBST(LIBGNOMECANVAS_REQUIRED) +AC_SUBST(LIBGLADE_REQUIRED) +dnl glabels prerequisites PKG_CHECK_MODULES(GLABELS, \ glib-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ +libgnome-2.0 >= $LIBGNOME_REQUIRED \ libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED \ libbonobo-2.0 >= $LIBBONOBO_REQUIRED \ +libbonoboui-2.0 >= $LIBBONOBOUI_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED \ libgnomeprint-2.2 >= $LIBGNOMEPRINT_REQUIRED \ libgnomeprintui-2.2 >= $LIBGNOMEPRINTUI_REQUIRED \ @@ -52,6 +70,7 @@ libglade-2.0 >= $LIBGLADE_REQUIRED \ AC_SUBST(GLABELS_CFLAGS) AC_SUBST(GLABELS_LIBS) +dnl libglabels more modest prerequisites PKG_CHECK_MODULES(LIBGLABELS, \ glib-2.0 >= $GLIB_REQUIRED \ libxml-2.0 >= $LIBXML_REQUIRED \ diff --git a/glabels2/glabels.spec.in b/glabels2/glabels.spec.in index 84fa545d..952ec6de 100644 --- a/glabels2/glabels.spec.in +++ b/glabels2/glabels.spec.in @@ -10,12 +10,21 @@ Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/root-%{name}-%{version} Prefix: %{_prefix} -BuildRequires: gtk+-devel >= 1.2 -BuildRequires: libgnomeui-devel >= 2.0 -BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libgnomeprint22-devel >= 2.2 -BuildRequires: libxml2-devel >= 2.4 -BuildRequires: libglade2-devel >= 2.0 +BuildRequires: gtk2-devel >= @GTK_REQUIRED@ +BuildRequires: libxml2-devel >= @LIBXML_REQUIRED@ +BuildRequires: libgnomeui-devel >= @LIBGNOMEUI_REQUIRED@ +BuildRequires: libbonoboui-devel >= @LIBBONOBOUI_REQUIRED@ +BuildRequires: libgnomecanvas-devel >= @LIBGNOMECANVAS_REQUIRED@ +BuildRequires: libgnomeprintui22-devel >= @LIBGNOMEPRINT_REQUIRED@ +BuildRequires: libglade2-devel >= @LIBGLADE_REQUIRED@ + +Requires: gtk2 >= @GTK_REQUIRED@ +Requires: libxml2 >= @LIBXML_REQUIRED@ +Requires: libgnomeui >= @LIBGNOMEUI_REQUIRED@ +Requires: libbonoboui >= @LIBBONOBOUI_REQUIRED@ +Requires: libgnomecanvas >= @LIBGNOMECANVAS_REQUIRED@ +Requires: libgnomeprintui22 >= @LIBGNOMEPRINT_REQUIRED@ +Requires: libglade2 >= @LIBGLADE_REQUIRED@ %description gLabels is a lightweight program for creating labels and -- 2.39.5