rpms/gaim-gaym/devel .cvsignore, 1.2, 1.3 gaim-gaym.spec, 1.1, 1.2 sources, 1.2, 1.3

[Chris Weyl (cweyl)]

Author: cweyl

Update of /cvs/extras/rpms/gaim-gaym/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28182

Modified Files:
	.cvsignore gaim-gaym.spec sources 
Log Message:
update to SVN snapshot that can deal with gaim2



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 May 2006 15:43:16 -0000	1.2
+++ .cvsignore	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-qrc-0.96.tgz
+qrc-0.96-289svn.tar.gz


Index: gaim-gaym.spec
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/gaim-gaym.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gaim-gaym.spec	16 May 2006 15:43:16 -0000	1.1
+++ gaim-gaym.spec	24 Oct 2006 05:43:03 -0000	1.2
@@ -1,21 +1,29 @@
-# $Id$
-
-# make sure we require the correct versions of gaim
-%define gaim_min 1:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
-%define gaim_max 1:2.0.0
+# make sure we require the correct versions of gaim 
+%define gaim_min 2:%(pkg-config --modversion gaim | awk -F- '{ print $1 }')
+%define gaim_max 2:3.0.0
+
+%define gaimsrcver 2.0.0beta3
+
+# it's not quite 0.97, but it's definitely:
+#   branch:      fork-for-gaim-2
+#   svn release: 289
+%define alphatag 289svn
 
 Name:           gaim-gaym
 Version:        0.96
-Release:        2%{?dist}
+Release:        3%{?alphatag:.1.%{alphatag}}%{?dist}
 Summary:        A gay.com protocol plugin for gaim
 
 Group:          Applications/Internet
 License:        GPL
 URL:            http://groups.yahoo.com/group/gaymplugin/
-Source0:        http://download.berlios.de/qrc/qrc-%{version}.tgz
+Source0: http://download.berlios.de/qrc/qrc-%{version}%{?alphatag:-%{alphatag}}.tar.gz
+Source1:        http://download.sourceforge.net/gaim/gaim-%{gaimsrcver}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gaim < %{gaim_max}, gtk2-devel
+BuildRequires:  gaim-devel < %{gaim_max}, gtk2-devel
+%{?alphatag:BuildRequires: autoconf, automake, libtool, pkgconfig}
+
 Requires:       gaim >= %{gaim_min}, gaim < %{gaim_max}
 
 %description
@@ -27,10 +35,22 @@
 and less than %{gaim_max}.
 
 %prep
-%setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version}
+#setup -q -n qrc-%{version} -T -D -a 1
+%setup -q -n fork-for-gaim-2
+%setup -q -n fork-for-gaim-2 -T -D -a 1
+
 
+# copy the needed headers to the right places...
+for i in gaym/src bot-challenger gaym-extras/src ; do
+    cp gaim-%{gaimsrcver}/src/internal.h $i
+    cp gaim-%{gaimsrcver}/src/prefix.h   $i
+done
+
+rm -rf gaim-%{gaimsrcver}
 
 %build
+autoreconf --force --install
 %configure --enable-display_options
 make %{?_smp_mflags}
 
@@ -56,6 +76,11 @@
 
 
 %changelog
+* Sun Oct 22 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-3.1.289svn
+- pull in header files not included in gaim-devel
+- switch to SVN branch fork-for-gaim-2, rev 289
+- pull in all the auto* stuff we now need for a devel snapshot
+
 * Mon May  8 2006 Chris Weyl <cweyl at alumni.drew.edu> 0.96-2
 - dropped explicit requires: gtk2
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/gaim-gaym/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 May 2006 15:43:16 -0000	1.2
+++ sources	24 Oct 2006 05:43:03 -0000	1.3
@@ -1 +1 @@
-f846fdc07c2e38e74f8e27c58cdde37a  qrc-0.96.tgz
+34e5740bf03eeb2bd68dfeac54404813  qrc-0.96-289svn.tar.gz