grim/guifications1

Updates for building with Gaim 0.79

2004-06-25, Stu Tomlinson
6fdd4e6f385f
Parents cbd362bb7bd9
Children 4642cf91c268
Updates for building with Gaim 0.79
3 files changed, 22 insertions(+), 59 deletions(-)
  • +11 -40
    configure.ac
  • +9 -18
    guifications.spec.in
  • +2 -1
    src/Makefile.am
    • --- a/configure.ac Mon Jun 21 07:52:00 2004 +0000
    +++ b/configure.ac Fri Jun 25 03:45:30 2004 +0000
    @@ -31,44 +31,6 @@
    AC_PROG_CC
    CFLAGS="$CFLAGS_save"
    -#
    -# Utilities
    -#
    -
    -check_for_header() {
    - file="$1"
    - bases="$2"
    - variations=". $3"
    -
    - result=
    - for dir in $bases; do
    - if test -z "$result"; then
    - for variant in $variations; do
    - if test -z "$result" -a -f "$dir/$variant/$file"; then
    - result="$dir/$variant"
    - fi
    - done
    - fi
    - done
    -
    - if test -z "$result"; then
    - AC_MSG_RESULT([not found!])
    - AC_MSG_ERROR([*** Can not continue, note this must be an absolute path])
    - fi
    -}
    -
    -#
    -# Find gaim
    -#
    -
    -AC_ARG_WITH(gaim, AC_HELP_STRING([--with-gaim=PATH], [absolute path to gaim source code]))
    -
    -AC_MSG_CHECKING([for gaim source code])
    -gaim_dirs="$with_gaim .. ../gaim ../.. . $prefix /usr/local/src/gaim /usr/local/gaim /usr"
    -check_for_header gaim.h "$gaim_dirs" "src include"
    -AC_MSG_RESULT([$result])
    -CPPFLAGS="-I$result/../ -I$result -I$result/win32 $CPPFLAGS"
    -
    AC_ARG_ENABLE(debug, [ --enable-debug compile with debugging support],,enable_debug=no)
    AC_ARG_ENABLE(deprecated, [ --disable-deprecated compile without deprecated API usage],,enable_deprecated=yes)
    @@ -87,6 +49,17 @@
    AC_SUBST(CFLAGS)
    #
    +# Check for Gaim
    +#
    +
    +PKG_CHECK_MODULES(GAIM, gaim,
    +[
    + AC_DEFINE(HAVE_GAIM, 1, [Define if we've found gaim.])
    +])
    +
    +AC_SUBST(GAIM_CFLAGS)
    +
    +#
    # check for gtk and other dependencies
    #
    @@ -128,8 +101,6 @@
    echo;
    echo Configuration complete
    echo;
    -echo Using Gaim source from.........: $with_gaim
    -echo;
    echo Debugging enabled..............: $enable_debug
    echo Deprecated API enabled.........: $enable_deprecated
    echo;
    --- a/guifications.spec.in Mon Jun 21 07:52:00 2004 +0000
    +++ b/guifications.spec.in Fri Jun 25 03:45:30 2004 +0000
    @@ -1,43 +1,31 @@
    +%define rpmrelease 0
    Summary: Guifications Plugin for Gaim
    Name: gaim-@PACKAGE@
    Version: @VERSION@
    -Release: %{gaimver}%{?gaimdist:.%{gaimdist}}.0
    +Release: %{gaimver}%{?gaimdist:.%{gaimdist}}.%{rpmrelease}
    Epoch: 1
    License: GPL
    Group: Applications/Internet
    Url: http://guifications.sourceforge.net/
    Source: guifications-%{version}.tar.gz
    Source1: gaim-%{?gaimver:%{gaimver}}%{!?gaimver:ERROR:_undefined_gaimver}.tar.gz
    -%{!?withsource:NoSource: 1}
    BuildRoot: %{_tmppath}/%{name}-%{version}-root
    Requires: gaim = 1:%{gaimver}
    -BuildRequires: pkgconfig, libtool, glib2-devel, gtk2-devel, gcc-c++
    +BuildRequires: pkgconfig, libtool, glib2-devel, gtk2-devel, gaim-devel, gcc-c++
    %description
    Guifications is a graphical notification plugin for the open source instant messaging client Gaim
    To rebuild for a specific Gaim version or dist tag:
    -rpmbuild --rebuild gaim-@PACKAGE@-@VERSION@-%{release}.nosrc.rpm --define 'gaimver %{gaimver}' --define 'gaimdist fc1'
    -Note: You must have gaim-<gaimver>.tar.gz in your RPM SOURCES directory.
    +rpmbuild --rebuild gaim-@PACKAGE@-@VERSION@-%{rpmrelease}.src.rpm --define 'gaimver %{gaimver}' --define 'gaimdist fc1'
    %prep
    -%setup -q -n guifications-%{version} -a1
    +%setup -q -n guifications-%{version}
    %build
    -cd gaim-%{gaimver}
    -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
    - --bindir=%{_bindir} \
    - --datadir=%{_datadir} \
    - --includedir=%{_includedir} \
    - --libdir=%{_libdir} \
    - --mandir=%{_mandir} \
    - --sysconfdir=%{_sysconfdir} \
    - --with-perl-lib=$RPM_BUILD_ROOT%{_prefix}
    -cd ..
    -CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
    - --with-gaim=`pwd`/gaim-%{gaimver}
    +CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix}
    make %{?_smp_mflags}
    @@ -64,6 +52,9 @@
    %{_datadir}/pixmaps/gaim/guifications/*
    %changelog
    +* Fri Jun 25 2004 Stu Tomlinson <stu@nosnilmot.com>
    +- Update for Gaim 0.79
    +
    * Thu May 27 2004 Stu Tomlinson <stu@nosnilmot.com>
    - Tweak to allow both .src.rpm and .nosrc.rpm to be generated
    from a dist tarball.
    --- a/src/Makefile.am Mon Jun 21 07:52:00 2004 +0000
    +++ b/src/Makefile.am Fri Jun 25 03:45:30 2004 +0000
    @@ -33,4 +33,5 @@
    -I$(top_srcdir)/src \
    $(DEBUG_CFLAGS) \
    $(GTK_CFLAGS) \
    - $(GLIB_CFLAGS)
    + $(GLIB_CFLAGS) \
    + $(GAIM_CFLAGS)