Thread: [Gaim-commits] SF.net SVN: gaim: [16159] trunk/gaim.spec.in

A universal instant messaging (IM) program

Brought to you by: amc_grim, bigbrownchunx, qulogic, rekkanoryo, rlaager

pidgin-commits

[Gaim-commits] SF.net SVN: gaim: [16159] trunk/gaim.spec.in

From: <the...@us...> - 2006-05-08 17:09:00

Revision: 16159
Author:   thekingant
Date:     2006-05-07 21:47:56 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16159&view=rev

Log Message:
-----------
I think this will fix that error I just mentioned

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-05-08 04:45:41 UTC (rev 16158)
+++ trunk/gaim.spec.in	2006-05-08 04:47:56 UTC (rev 16159)
@@ -185,7 +185,7 @@
 
 %install
 rm -rf %{buildroot}
-if 0%{?_with_perlmakehack}
+%if 0%{?_with_perlmakehack}
 make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
      datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \
      libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16158] trunk/gaim.spec.in

From: <the...@us...> - 2006-05-08 17:09:04

Revision: 16158
Author:   thekingant
Date:     2006-05-07 21:45:41 -0700 (Sun, 07 May 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16158&view=rev

Log Message:
-----------
Add a "--with avahi" option to our RPM spec file.  I think
this should work, but I just got the following error and I
want to go to sleep:

/var/tmp/rpm-tmp.68399: line 39: syntax error: unexpected end of file
error: Bad exit status from /var/tmp/rpm-tmp.68399 (%install)


RPM build errors:
    /home/mark/rpmbuild/SPECS/gaim.spec:194: Got a %else with no %if
    Bad exit status from /var/tmp/rpm-tmp.68399 (%install)

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-05-08 04:32:21 UTC (rev 16157)
+++ trunk/gaim.spec.in	2006-05-08 04:45:41 UTC (rev 16158)
@@ -28,6 +28,7 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
+%{?_with_avahi:BuildRequires: avahi-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}
@@ -61,7 +62,7 @@
 %endif
 %endif
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %package bonjour
 Summary:    Bonjour plugin for Gaim
 Group:      Applications/Internet
@@ -121,7 +122,7 @@
 Gaim is NOT affiliated with or endorsed by America Online, Inc.,
 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %description bonjour
 Bonjour plugin for Gaim
 %endif
@@ -200,7 +201,7 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
-%if 0%{!?_with_howl:1}
+%if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so
 %endif
 
@@ -264,7 +265,7 @@
 %{_datadir}/dbus-1/services/gaim.service
 %endif
 
-%if 0%{?_with_howl:1}
+%if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %files bonjour
 %defattr(-, root, root)
 
@@ -322,6 +323,10 @@
 %endif
 
 %changelog
+* Mon May 8 2006 <the...@us...>
+- Add --with avahi option to compile the gaim-bonjour package against
+  Avahi's Howl compatibility layer.
+
 * Wed Mar 29 2006 <st...@no...>
 - Source RPM uses tar.bz2 now to save space
 - Update BuildRequires for new intltool dependencies


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16438] trunk/gaim.spec.in

From: <the...@us...> - 2006-07-06 08:01:37

Revision: 16438
Author:   thekingant
Date:     2006-07-06 01:01:36 -0700 (Thu, 06 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16438&view=rev

Log Message:
-----------
I think these changes make sense?  Maybe?

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-07-06 02:52:10 UTC (rev 16437)
+++ trunk/gaim.spec.in	2006-07-06 08:01:36 UTC (rev 16438)
@@ -6,10 +6,10 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 3
+%define beta 4
 
 %if 0%{?beta}
-%define gaimver %(echo "@VERSION@"|sed -e 's/svn//; s/beta.*//')
+%define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')
 %else
 %define gaimver @VERSION@
 %endif
@@ -28,7 +28,7 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
-%{?_with_avahi:BuildRequires: avahi-devel}
+%{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16768] trunk/gaim.spec.in

From: <the...@us...> - 2006-08-15 08:54:16

Revision: 16768
Author:   thekingant
Date:     2006-08-15 01:47:44 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16768&view=rev

Log Message:
-----------
Add gstreamer-devel and remove libao-devel, audiofile-devel and gettext
from our RPM spec

Good?

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-08-15 08:26:12 UTC (rev 16767)
+++ trunk/gaim.spec.in	2006-08-15 08:47:44 UTC (rev 16768)
@@ -27,7 +27,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, libao-devel, audiofile-devel, intltool, gettext
+BuildRequires: libtool, pkgconfig, intltool, gstreamer-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
@@ -323,9 +323,14 @@
 %endif
 
 %changelog
+* Tue Aug 15 2006 <the...@us...>
+- Add a BuildRequire for gstreamer-devel
+- Remove the BuildRequires for audiofile-devel, libao-devel and
+  gettext
+
 * Mon May 8 2006 <the...@us...>
 - Add --with avahi option to compile the gaim-bonjour package against
-  Avahi's Howl compatibility layer.
+  Avahi's Howl compatibility layer
 
 * Wed Mar 29 2006 <st...@no...>
 - Source RPM uses tar.bz2 now to save space


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16769] trunk/gaim.spec.in

From: <the...@us...> - 2006-08-15 08:59:15

Revision: 16769
Author:   thekingant
Date:     2006-08-15 01:59:11 -0700 (Tue, 15 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16769&view=rev

Log Message:
-----------
I'm not really sure why I removed gettext

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-08-15 08:47:44 UTC (rev 16768)
+++ trunk/gaim.spec.in	2006-08-15 08:59:11 UTC (rev 16769)
@@ -27,7 +27,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gstreamer-devel
+BuildRequires: libtool, pkgconfig, intltool, gettext, gstreamer-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
@@ -325,8 +325,7 @@
 %changelog
 * Tue Aug 15 2006 <the...@us...>
 - Add a BuildRequire for gstreamer-devel
-- Remove the BuildRequires for audiofile-devel, libao-devel and
-  gettext
+- Remove the BuildRequires for audiofile-devel and libao-devel
 
 * Mon May 8 2006 <the...@us...>
 - Add --with avahi option to compile the gaim-bonjour package against


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [16906] trunk/gaim.spec.in

From: <nos...@us...> - 2006-08-20 17:00:46

Revision: 16906
Author:   nosnilmot
Date:     2006-08-20 10:00:38 -0700 (Sun, 20 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/gaim/?rev=16906&view=rev

Log Message:
-----------
Make the gstreamer-devel BuildReq optional and restore some names in
the %changelog

Modified Paths:
--------------
    trunk/gaim.spec.in
Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-08-20 16:49:37 UTC (rev 16905)
+++ trunk/gaim.spec.in	2006-08-20 17:00:38 UTC (rev 16906)
@@ -27,7 +27,8 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gettext, gstreamer-devel
+BuildRequires: libtool, pkgconfig, intltool, gettext
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel}
 %{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
@@ -179,7 +180,8 @@
                                     %{!?_with_tcl:--disable-tcl} \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
-                                    %{?_with_sasl:--enable-cyrus-sasl}
+                                    %{?_with_sasl:--enable-cyrus-sasl} \
+                                    %{?_without_gstreamer:--disable-gstreamer}
 
 make %{?_smp_mflags}
 
@@ -323,21 +325,25 @@
 %endif
 
 %changelog
-* Tue Aug 15 2006 <the...@us...>
+* Sun Aug 20 2006 Stu Tomlinson <st...@no...>
+- Make the gstreamer-devel dependency overridable with '--without-gstreamer'
+  to allow building on older distributions without suitable gstreamer
+
+* Tue Aug 15 2006 Mark Doliner <the...@us...>
 - Add a BuildRequire for gstreamer-devel
 - Remove the BuildRequires for audiofile-devel and libao-devel
 
-* Mon May 8 2006 <the...@us...>
+* Mon May 8 2006 Mark Doliner <the...@us...>
 - Add --with avahi option to compile the gaim-bonjour package against
   Avahi's Howl compatibility layer
 
-* Wed Mar 29 2006 <st...@no...>
+* Wed Mar 29 2006 Stu Tomlinson <st...@no...>
 - Source RPM uses tar.bz2 now to save space
 - Update BuildRequires for new intltool dependencies
 - Add a --with perlmakehack option to allow builds to succeed on RH9
 - Add a --with gadugadu to build (separate) gaim-gadugadu package
 
-* Sat Dec 17 2005 <st...@no...>
+* Sat Dec 17 2005 Stu Tomlinson <st...@no...>
 - Add support for beta versions so the subsequent releases are seen as newer
   by RPM
 - Split of sametime support to gaim-meanwhile
@@ -345,19 +351,19 @@
 - Default build to include cyrus-sasl support in Jabber
 - Add --with dbus to build with DBUS support
 
-* Sun Dec 04 2005 <si...@pr...>
+* Sun Dec 04 2005 Christopher O'Brien <si...@pr...>
 - Added obsoletes gaim-meanwhile
 
-* Sun Oct 30 2005 <st...@no...>
+* Sun Oct 30 2005 Stu Tomlinson <st...@no...>
 - Add separate gaim-bonjour package if built with --with-howl
 - Add separate gaim-mono package if built with --with-mono
 - Exclude some unwanted perl files
 
-* Sat Aug 20 2005 <st...@no...>
+* Sat Aug 20 2005 Stu Tomlinson <st...@no...>
 - Include libgaimperl.so
 - Include gaim.m4 in gaim-devel
 
-* Thu Apr 28 2005 <st...@no...>
+* Thu Apr 28 2005 Stu Tomlinson <st...@no...>
 - Use perl_vendorlib & perl_archlib for better 64bit compat (Jeff Mahoney)
 - Clean up Requires, most should be auto-detected
 - Restore gtkspell-devel build requirement (and add --without gtkspell option)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17235] trunk/gaim.spec.in

From: <the...@us...> - 2006-09-11 01:08:26

Revision: 17235
          http://svn.sourceforge.net/gaim/?rev=17235&view=rev
Author:   thekingant
Date:     2006-09-10 18:08:24 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
Changes to account for shuffling around of some docs and
for gnt

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 01:07:45 UTC (rev 17234)
+++ trunk/gaim.spec.in	2006-09-11 01:08:24 UTC (rev 17235)
@@ -246,8 +246,15 @@
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)
 
-%doc doc/the_penguin.txt doc/CREDITS NEWS COPYING AUTHORS COPYRIGHT
-%doc README ChangeLog
+%doc AUTHORS
+%doc COPYING
+%doc COPYRIGHT
+%doc ChangeLog
+%doc NEWS
+%doc README
+%doc README.SVN
+%doc doc/FAQ
+%doc doc/the_penguin.txt
 %doc %{_mandir}/man1/*
 %doc %{_mandir}/man3*/*
 
@@ -261,10 +268,13 @@
 %dir %{_datadir}/sounds/gaim
 %{_datadir}/sounds/gaim/*
 %{_datadir}/applications/*
+%{_libdir}/libgaim.so.*
+%{_libdir}/libgnt.so.*
 
 %if 0%{?_with_dbus:1}
 %{_libdir}/libgaim-client.so.*
 %{_datadir}/dbus-1/services/gaim.service
+%doc README.dbus
 %endif
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
@@ -313,12 +323,21 @@
 %files devel
 %defattr(-, root, root)
 
-%doc plugins/HOWTO
-%doc HACKING PROGRAMMING_NOTES
+%doc ChangeLog.API
+%doc HACKING
+%doc PLUGIN_HOWTO
+%doc PROGRAMMING_NOTES
 
 %dir %{_includedir}/gaim
 %{_includedir}/gaim/*.h
+%dir %{_includedir}/gaim/gnt
+%{_includedir}/gaim/gnt/*.h
+%dir %{_includedir}/gnt
+%{_includedir}/gnt/*.h
+%{_libdir}/libgaim.so
+%{_libdir}/libgnt.so
 %{_libdir}/pkgconfig/gaim.pc
+%{_libdir}/pkgconfig/gnt.pc
 %{_datadir}/aclocal/gaim.m4
 %if 0%{?_with_dbus:1}
 %{_libdir}/libgaim-client.so


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17246] trunk/gaim.spec.in

From: <the...@us...> - 2006-09-11 06:17:16

Revision: 17246
          http://svn.sourceforge.net/gaim/?rev=17246&view=rev
Author:   thekingant
Date:     2006-09-10 23:17:14 -0700 (Sun, 10 Sep 2006)

Log Message:
-----------
Whoops, I thought this was in the last commit but it wasn't.
Add gaim.schemas to our gaim RPM

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 06:15:58 UTC (rev 17245)
+++ trunk/gaim.spec.in	2006-09-11 06:17:14 UTC (rev 17246)
@@ -270,6 +270,7 @@
 %{_datadir}/applications/*
 %{_libdir}/libgaim.so.*
 %{_libdir}/libgnt.so.*
+%{_sysconfdir}/gconf/schemas/gaim.schemas
 
 %if 0%{?_with_dbus:1}
 %{_libdir}/libgaim-client.so.*


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17247] trunk/gaim.spec.in

From: <rl...@us...> - 2006-09-11 07:01:17

Revision: 17247
          http://svn.sourceforge.net/gaim/?rev=17247&view=rev
Author:   rlaager
Date:     2006-09-11 00:01:15 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Tell configure to disable the installation of the gconf schema.  Add a %post section that calls gconftool-2 to do the real installation.

This is entirely untested, but is documented as The Right Way at:
http://www.gnome.org/projects/gconf/

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 06:17:14 UTC (rev 17246)
+++ trunk/gaim.spec.in	2006-09-11 07:01:15 UTC (rev 17247)
@@ -171,6 +171,7 @@
                                     --libdir=%{_libdir} \
                                     --mandir=%{_mandir} \
                                     --sysconfdir=%{_sysconfdir} \
+                                    --disable-schemas-install \
                                     %{!?_with_dbus:--disable-dbus} \
                                     %{?_without_gstreamer:--disable-gstreamer} \
                                     %{?_without_gtkspell:--disable-gtkspell} \
@@ -243,6 +244,11 @@
 %clean
 rm -rf %{buildroot}
 
+%post
+# From: http://www.gnome.org/projects/gconf/
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
+
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17248] trunk/gaim.spec.in

From: <rl...@us...> - 2006-09-11 07:06:07

Revision: 17248
          http://svn.sourceforge.net/gaim/?rev=17248&view=rev
Author:   rlaager
Date:     2006-09-11 00:06:03 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Add a dependency on GConf2. Again, untested. I'm less sure of this change and how it'll play out with various distros.

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 07:01:15 UTC (rev 17247)
+++ trunk/gaim.spec.in	2006-09-11 07:06:03 UTC (rev 17248)
@@ -42,6 +42,9 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
+# For gconftool-2
+Requires: GConf2
+
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # Mandrake/Mandriva requirements


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17249] trunk/gaim.spec.in

From: <rl...@us...> - 2006-09-11 07:15:04

Revision: 17249
          http://svn.sourceforge.net/gaim/?rev=17249&view=rev
Author:   rlaager
Date:     2006-09-11 00:14:39 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Don't depend on GConf2. Only use gconftool-2 if it's already installed.

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-11 07:06:03 UTC (rev 17248)
+++ trunk/gaim.spec.in	2006-09-11 07:14:39 UTC (rev 17249)
@@ -42,9 +42,6 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
-# For gconftool-2
-Requires: GConf2
-
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
 # Mandrake/Mandriva requirements
@@ -248,9 +245,8 @@
 rm -rf %{buildroot}
 
 %post
-# From: http://www.gnome.org/projects/gconf/
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
+# Modified from the sample at: http://www.gnome.org/projects/gconf/
+[ -n "`which gconftool-2 2>/dev/null`" ] && GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
 
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17340] trunk/gaim.spec.in

From: <the...@us...> - 2006-09-23 19:04:05

Revision: 17340
          http://svn.sourceforge.net/gaim/?rev=17340&view=rev
Author:   thekingant
Date:     2006-09-23 12:04:03 -0700 (Sat, 23 Sep 2006)

Log Message:
-----------
Put gaim-text and the gnt stuff into a gaim-text RPM so that our main RPM doesn't
depend on ncurses.

rpmbuild -ta gaim-2.0.0dev.tar.bz2 doesn't work for me anymore.  Did it used to?
Does it work for other people?  For me it prints
error: Name field must be present in package: (main package)
error: Version field must be present in package: (main package)
error: Release field must be present in package: (main package)
error: Summary field must be present in package: (main package)
error: Group field must be present in package: (main package)
error: License field must be present in package: (main package)

And it creates a file called "tar: Pattern matching characters used in file n
ames. Please," in my ~/rpmbuild/SPECS directory.  It does not put gaim.spec
in my ~/rpmbuild/SPECS directory, and it does not put anything in
~/rpmbuild/BUILD or ~/rpmbuild/SOURCES, either

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-09-22 17:03:54 UTC (rev 17339)
+++ trunk/gaim.spec.in	2006-09-23 19:04:03 UTC (rev 17340)
@@ -14,7 +14,7 @@
 %define gaimver @VERSION@
 %endif
 
-Summary:    A Gtk+ based multiprotocol instant messaging client
+Summary:    A GTK+ based multiprotocol instant messaging client
 Name:       @PACKAGE@
 Version:    %gaimver
 Release:    0%{?beta:.beta%{beta}}
@@ -39,22 +39,21 @@
 %{?_with_sasl:BuildRequires: cyrus-sasl-devel >= 2}
 %{?_with_silc:BuildRequires: /usr/include/silc/silcclient.h}
 %{?_with_tcl:BuildRequires: tcl, tk, /usr/include/tcl.h}
-# For some reason perl isn't always automatically detected as a requirement :(
-Requires: perl
+%{!?_without_text:BuildRequires: ncurses-devel}
 
 # Mandrake 10.1 and lower || Mandrake 10.2 (and higher?)
 %if "%{_vendor}" == "MandrakeSoft" || "%{_vendor}" == "Mandrakesoft" || "%{_vendor}" == "Mandriva"
-# Mandrake/Mandriva requirements
+# For Mandrake/Mandriva:
 BuildRequires: libgtk+2.0_0-devel, libnss3-devel, perl-devel
 Obsoletes:  libgaim-remote0
 %else
-
-# SuSE & Red Hat / Fedora requirements
+# For SuSE, Red Hat, Fedora and others:
 BuildRequires: gtk2-devel
-
 %if "%{_vendor}" == "suse"
+# For SuSE:
 BuildRequires: gnutls-devel
 %else
+# For Red Hat, Fedora and others:
 # let's assume RH & FC1 are the only brain-dead distros missing the
 # perl-XML-Parser dependency on intltool and that other RH/FC releases
 # don't care if we specify it here
@@ -63,6 +62,9 @@
 %endif
 %endif
 
+# For some reason perl isn't always automatically detected as a requirement :(
+Requires: perl
+
 %package devel
 Summary:    Development headers, documentation, and libraries for Gaim.
 Group:      Applications/Internet
@@ -110,37 +112,45 @@
 Requires:   gaim = %{epoch}:%{version}
 %endif
 
+%if 0%{!?_without_text:1}
+%package text
+Summary:    A text-based user interface for Gaim
+Group:      Applications/Internet
+Requires:   gaim = %{epoch}:%{version}
+%endif
+
 %description
 Gaim allows you to talk to anyone using a variety of messaging
-protocols, including AIM, ICQ, IRC, Yahoo!, Novell Groupwise, MSN
-Messenger, Jabber, Gadu-Gadu, Lotus Sametime and Zephyr.
-These protocols are implemented using a modular, easy to use design.
-To use a protocol, just add an account using the account editor.
+protocols including AIM, MSN, Yahoo!, Jabber, Bonjour, Gadu-Gadu,
+ICQ, IRC, Novell Groupwise, QQ, Lotus Sametime, SILC, Simple and
+Zephyr.  These protocols are implemented using a modular, easy to
+use design.  To use a protocol, just add an account using the
+account editor.
 
 Gaim supports many common features of other clients, as well as many
 unique features, such as perl scripting, TCL scripting and C plugins.
 
-Gaim is NOT affiliated with or endorsed by America Online, Inc.,
+Gaim is not affiliated with or endorsed by America Online, Inc.,
 Microsoft Corporation, Yahoo! Inc., or ICQ Inc.
 
 %description devel
 The gaim-devel package contains the header files, developer
-documentation, and libraries required for development of gaim scripts
+documentation, and libraries required for development of Gaim scripts
 and plugins.
 
 %if 0%{?_with_howl:1} || 0%{?_with_avahi:1}
 %description bonjour
-Bonjour plugin for Gaim
+Bonjour plugin for Gaim.
 %endif
 
 %if 0%{?_with_gadugadu:1}
 %description gadugadu
-Gadu-Gadu plugin for Gaim using the libgadu library
+Gadu-Gadu plugin for Gaim using the libgadu library.
 %endif
 
 %if 0%{?_with_meanwhile:1}
 %description meanwhile
-Lotus Sametime plugin for Gaim using the Meanwhile library
+Lotus Sametime plugin for Gaim using the Meanwhile library.
 %endif
 
 %if 0%{?_with_mono:1}
@@ -151,9 +161,17 @@
 
 %if 0%{?_with_silc:1}
 %description silc
-SILC (Secure Internet Live Conferencing) plugin for Gaim
+SILC (Secure Internet Live Conferencing) plugin for Gaim.
 %endif
 
+%if 0%{!?without_text:1}
+%description text
+A text-based user interface for Gaim.  This can be run from a
+standard text console or from a terminal within X Windows.  It
+uses ncurses and our homegrown gnt library for drawing windows
+and text.
+%endif
+
 %if 0%{?_with_tcl:1}
 %description tcl
 Tcl plugin loader for Gaim.  This package will allow you to write or
@@ -232,12 +250,15 @@
 
 find $RPM_BUILD_ROOT%{_libdir}/gaim -type f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
-        grep -v libbonjour.so | \
-        grep -v libsilcgaim.so | \
-        grep -v libsametime.so | \
-        grep -v libgg.so | \
-        grep -v tcl.so | \
-        grep -v mono.so | \
+        grep -v /gntgf.so | \
+        grep -v /gnthistory.so | \
+        grep -v /libbonjour.so | \
+        grep -v /libgg.so | \
+        grep -v /libsilcgaim.so | \
+        grep -v /libsametime.so | \
+        grep -v /mono.so | \
+        grep -v /s.so | \
+        grep -v /tcl.so | \
         grep -v ".dll$" | \
         grep -v ".tcl$" > %{name}-%{version}-coreplugins
 
@@ -260,21 +281,25 @@
 %doc README.SVN
 %doc doc/FAQ
 %doc doc/the_penguin.txt
-%doc %{_mandir}/man1/*
+%doc %{_mandir}/man1/gaim.*
 %doc %{_mandir}/man3*/*
 
 %dir %{_libdir}/gaim
 %attr(755, root, root) %{perl_vendorarch}/Gaim*
 %attr(755, root, root) %{perl_vendorarch}/auto/Gaim
 
-%{_bindir}/*
+%{_bindir}/gaim
+%{_bindir}/gaim-client-example
+%{_bindir}/gaim-remote
+%{_bindir}/gaim-send
+%{_bindir}/gaim-send-async
+%{_bindir}/gaim-url-handler
 %{_datadir}/locale/*/*/*
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/sounds/gaim
 %{_datadir}/sounds/gaim/*
 %{_datadir}/applications/*
 %{_libdir}/libgaim.so.*
-%{_libdir}/libgnt.so.*
 %{_sysconfdir}/gconf/schemas/gaim.schemas
 
 %if 0%{?_with_dbus:1}
@@ -350,6 +375,18 @@
 %{_libdir}/gaim/tcl.so
 %endif
 
+%if 0%{!?without_text:1}
+%files text
+%defattr(-, root, root)
+
+%doc %{_mandir}/man1/gaim-text.*
+%{_bindir}/gaim-text
+%{_libdir}/gaim/gntgf.so
+%{_libdir}/gaim/gnthistory.so
+%{_libdir}/gaim/s.so
+%{_libdir}/libgnt.so.*
+%endif
+
 %changelog
 * Sun Aug 20 2006 Stu Tomlinson <st...@no...>
 - Make the gstreamer-devel dependency overridable with '--without-gstreamer'


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17418] trunk/gaim.spec.in

From: <nos...@us...> - 2006-10-01 16:11:44

Revision: 17418
          http://svn.sourceforge.net/gaim/?rev=17418&view=rev
Author:   nosnilmot
Date:     2006-10-01 09:11:39 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
Spec file updates:
 - We can build with internal gadugadu again now, so bring it back into
   the main package
 - Uninstall gconf schemas as necessary when upgrading or uninstalling
 - Fix building without text
 - Use %find_lang for locale files

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-01 15:16:21 UTC (rev 17417)
+++ trunk/gaim.spec.in	2006-10-01 16:11:39 UTC (rev 17418)
@@ -28,9 +28,8 @@
 
 # Generic build requirements
 BuildRequires: libtool, pkgconfig, intltool, gettext
-%{?_with_avahi:BuildRequires: avahi-compat-howl avahi-compat-howl-devel}
+%{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
-%{?_with_gadugadu:BuildRequires: libgadu-devel}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
@@ -64,6 +63,8 @@
 
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
+# Gadu-Gadu support was split out temporarily
+Provides: gaim-gadugadu = %{epoch}:%{version}-%{release}
 
 %package devel
 Summary:    Development headers, documentation, and libraries for Gaim.
@@ -77,13 +78,6 @@
 Requires:   gaim = %{epoch}:%{version}
 %endif
 
-%if 0%{?_with_gadugadu:1}
-%package gadugadu
-Summary:    Gadu-Gadu plugin for Gaim using the libgadu library
-Group:      Applications/Internet
-Requires:   gaim = %{epoch}:%{version}
-%endif
-
 %if 0%{?_with_meanwhile:1}
 %package meanwhile
 Summary:    Lotus Sametime plugin for Gaim using the Meanwhile library
@@ -143,11 +137,6 @@
 Bonjour plugin for Gaim.
 %endif
 
-%if 0%{?_with_gadugadu:1}
-%description gadugadu
-Gadu-Gadu plugin for Gaim using the libgadu library.
-%endif
-
 %if 0%{?_with_meanwhile:1}
 %description meanwhile
 Lotus Sametime plugin for Gaim using the Meanwhile library.
@@ -199,13 +188,14 @@
                                     %{?_with_sasl:--enable-cyrus-sasl} \
                                     %{?_with_silc:--with-silc-includes=%{_includedir}/silc} \
                                     %{?_with_silc:--with-silc-libs=%{_libdir}/silc} \
-                                    %{!?_with_tcl:--disable-tcl}
+                                    %{!?_with_tcl:--disable-tcl} \
+                                    %{?_without_text:--disable-consoleui}
 
 make %{?_smp_mflags}
 
 %install
 rm -rf %{buildroot}
-%if 0%{?_with_perlmakehack}
+%if 0%{?_with_perlmakehack:1}
 make prefix=%{buildroot}%{_prefix} bindir=%{buildroot}%{_bindir} \
      datadir=%{buildroot}%{_datadir} includedir=%{buildroot}%{_includedir} \
      libdir=%{buildroot}%{_libdir} mandir=%{buildroot}%{_mandir} \
@@ -222,10 +212,6 @@
 find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';'
 
-%if 0%{!?_with_gadugadu:1}
-rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libgg.so
-%endif
-
 %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/libbonjour.so
 %endif
@@ -247,13 +233,22 @@
 rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/tcl.so
 %endif
 
+%if 0%{?_without_text:1}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/gaim-text.*
+rm -f $RPM_BUILD_ROOT%{_bindir}/gaim-text
+rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/gntgf.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/gnthistory.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/gaim/s.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/libgnt.so.*
+%endif
 
+%find_lang %{name}
+
 find $RPM_BUILD_ROOT%{_libdir}/gaim -type f -print | \
         sed "s@^$RPM_BUILD_ROOT@@g" | \
         grep -v /gntgf.so | \
         grep -v /gnthistory.so | \
         grep -v /libbonjour.so | \
-        grep -v /libgg.so | \
         grep -v /libsilcgaim.so | \
         grep -v /libsametime.so | \
         grep -v /mono.so | \
@@ -262,13 +257,36 @@
         grep -v ".dll$" | \
         grep -v ".tcl$" > %{name}-%{version}-coreplugins
 
+# files -f file can only take one filename :(
+cat %{name}.lang >> %{name}-%{version}-coreplugins
+
 %clean
 rm -rf %{buildroot}
 
+%pre
+if [ "$1" -gt 1 -a -n "`which gconftool-2 2>/dev/null`" ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+        %{_sysconfdir}/gconf/schemas/gaim.schemas >/dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
 %post
-# Modified from the sample at: http://www.gnome.org/projects/gconf/
-[ -n "`which gconftool-2 2>/dev/null`" ] && GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null
+if [ -n "`which gconftool-2 2>/dev/null`" ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-install-rule \
+        %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
 
+%preun
+if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
+    killall -HUP gconfd-2 || :
+fi
+
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)
 
@@ -289,12 +307,6 @@
 %attr(755, root, root) %{perl_vendorarch}/auto/Gaim
 
 %{_bindir}/gaim
-%{_bindir}/gaim-client-example
-%{_bindir}/gaim-remote
-%{_bindir}/gaim-send
-%{_bindir}/gaim-send-async
-%{_bindir}/gaim-url-handler
-%{_datadir}/locale/*/*/*
 %{_datadir}/pixmaps/*
 %dir %{_datadir}/sounds/gaim
 %{_datadir}/sounds/gaim/*
@@ -303,6 +315,11 @@
 %{_sysconfdir}/gconf/schemas/gaim.schemas
 
 %if 0%{?_with_dbus:1}
+%{_bindir}/gaim-client-example
+%{_bindir}/gaim-remote
+%{_bindir}/gaim-send
+%{_bindir}/gaim-send-async
+%{_bindir}/gaim-url-handler
 %{_libdir}/libgaim-client.so.*
 %{_datadir}/dbus-1/services/gaim.service
 %doc README.dbus
@@ -339,13 +356,6 @@
 %{_libdir}/gaim/libbonjour.*
 %endif
 
-%if 0%{?_with_gadugadu:1}
-%files gadugadu
-%defattr(-, root, root)
-
-%{_libdir}/gaim/libgg.*
-%endif
-
 %if 0%{?_with_meanwhile:1}
 %files meanwhile
 %defattr(-, root, root)
@@ -375,7 +385,7 @@
 %{_libdir}/gaim/tcl.so
 %endif
 
-%if 0%{!?without_text:1}
+%if 0%{!?_without_text:1}
 %files text
 %defattr(-, root, root)
 
@@ -388,6 +398,11 @@
 %endif
 
 %changelog
+* Sun Oct  1 2006 Stu Tomlinson <st...@no...>
+- We can build with internal gadu gadu again, so bring it back into the
+  main package
+- Deal with gconf schame uninstallation on package upgrade and removal
+
 * Sun Aug 20 2006 Stu Tomlinson <st...@no...>
 - Make the gstreamer-devel dependency overridable with '--without-gstreamer'
   to allow building on older distributions without suitable gstreamer


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17465] trunk/gaim.spec.in

From: <nos...@us...> - 2006-10-12 02:51:59

Revision: 17465
          http://svn.sourceforge.net/gaim/?rev=17465&view=rev
Author:   nosnilmot
Date:     2006-10-11 19:51:52 -0700 (Wed, 11 Oct 2006)

Log Message:
-----------
When installing libraries in system lib dirs, be sure to run ldconfig as required

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-12 01:08:28 UTC (rev 17464)
+++ trunk/gaim.spec.in	2006-10-12 02:51:52 UTC (rev 17465)
@@ -278,6 +278,7 @@
         %{_sysconfdir}/gconf/schemas/gaim.schemas > /dev/null || :
     killall -HUP gconfd-2 || :
 fi
+/sbin/ldconfig
 
 %preun
 if [ "$1" -eq 0 -a -n "`which gconftool-2 2>/dev/null`" ]; then
@@ -287,6 +288,8 @@
     killall -HUP gconfd-2 || :
 fi
 
+%postun -p /sbin/ldconfig
+
 %files -f %{name}-%{version}-coreplugins
 %defattr(-, root, root)
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17532] trunk/gaim.spec.in

From: <nos...@us...> - 2006-10-18 19:36:47

Revision: 17532
          http://svn.sourceforge.net/gaim/?rev=17532&view=rev
Author:   nosnilmot
Date:     2006-10-18 12:36:36 -0700 (Wed, 18 Oct 2006)

Log Message:
-----------
libxml2-devel is compulsory now

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-18 19:03:10 UTC (rev 17531)
+++ trunk/gaim.spec.in	2006-10-18 19:36:36 UTC (rev 17532)
@@ -27,7 +27,7 @@
 BuildRoot:  %{_tmppath}/%{name}-%{version}-root
 
 # Generic build requirements
-BuildRequires: libtool, pkgconfig, intltool, gettext
+BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
 %{!?_without_gstreamer:BuildRequires: gstreamer-devel}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17574] trunk/gaim.spec.in

From: <ebl...@us...> - 2006-10-24 15:29:27

Revision: 17574
          http://svn.sourceforge.net/gaim/?rev=17574&view=rev
Author:   eblanton
Date:     2006-10-24 08:29:19 -0700 (Tue, 24 Oct 2006)

Log Message:
-----------
I am under the impression that our gstreamer support requires 0.10 or
newer; someone in #gaim was bit by building a src.rpm into a binary
that was happy, but then failing to have sound support.  Someone
(nosnilmot?) correct this if it's wrong.

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-10-24 03:37:46 UTC (rev 17573)
+++ trunk/gaim.spec.in	2006-10-24 15:29:19 UTC (rev 17574)
@@ -30,7 +30,7 @@
 BuildRequires: libtool, pkgconfig, intltool, gettext, libxml2-devel
 %{?_with_avahi:BuildRequires: avahi-compat-howl-devel}
 %{?_with_dbus:BuildRequires: dbus-devel >= 0.35}
-%{!?_without_gstreamer:BuildRequires: gstreamer-devel}
+%{!?_without_gstreamer:BuildRequires: gstreamer-devel >= 0.10}
 %{!?_without_gtkspell:BuildRequires: gtkspell-devel}
 %{?_with_howl:BuildRequires: howl-devel}
 %{?_with_meanwhile:BuildRequires: meanwhile-devel}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [17722] trunk/gaim.spec.in

From: <the...@us...> - 2006-11-10 06:37:07

Revision: 17722
          http://svn.sourceforge.net/gaim/?rev=17722&view=rev
Author:   thekingant
Date:     2006-11-09 22:37:06 -0800 (Thu, 09 Nov 2006)

Log Message:
-----------
Preparation for beta 5

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2006-11-10 06:36:24 UTC (rev 17721)
+++ trunk/gaim.spec.in	2006-11-10 06:37:06 UTC (rev 17722)
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-%define beta 4
+%define beta 5
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Gaim-commits] SF.net SVN: gaim: [18160] trunk/gaim.spec.in

From: <the...@us...> - 2007-01-19 03:31:05

Revision: 18160
          http://svn.sourceforge.net/gaim/?rev=18160&view=rev
Author:   thekingant
Date:     2007-01-18 19:31:04 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Getting ready for beta 6

Modified Paths:
--------------
    trunk/gaim.spec.in

Modified: trunk/gaim.spec.in
===================================================================
--- trunk/gaim.spec.in	2007-01-19 01:57:56 UTC (rev 18159)
+++ trunk/gaim.spec.in	2007-01-19 03:31:04 UTC (rev 18160)
@@ -6,7 +6,7 @@
 # When not doing betas comment this out
 # NOTE: %defines in spec files are evaluated in comments so the correct
 #       way to comment it out is to replace the % with #
-#%define beta 6
+%define beta 6
 
 %if 0%{?beta}
 %define gaimver %(echo "@VERSION@"|sed -e 's/dev//; s/beta.*//')


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.