# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1189784391 0
# Node ID 1691f4c9b6a82379294a9108fa5334c9a5814c96
# Parent  b88747698e968053c08d25a00ef7c4a9d3507a24# Parent  ba649e93098b3fb38079a8618e7879b2fef9f616
merge of '507542b421b5b1da79e4b5a2624a5f768e2683e3'
     and 'ef6f42907128e792c95b8f7d47c90105f35f20c2'

diff -r b88747698e96 -r 1691f4c9b6a8 configure.ac
--- a/configure.ac	Fri Sep 14 13:19:08 2007 +0000
+++ b/configure.ac	Fri Sep 14 15:39:51 2007 +0000
@@ -46,8 +46,8 @@
 m4_define([purple_lt_current], [2])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [2])
-m4_define([purple_micro_version], [0])
-m4_define([purple_version_suffix], [])
+m4_define([purple_micro_version], [1])
+m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
 m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix]))
@@ -55,8 +55,8 @@
 m4_define([gnt_lt_current], [2])
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [2])
-m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_micro_version], [1])
+m4_define([gnt_version_suffix], [devel])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
@@ -352,13 +352,19 @@
 	dnl #######################################################################
 	if test "x$with_x" = "xyes" ; then
 		PKG_CHECK_MODULES(X11, x11,
-			[AC_DEFINE(HAVE_X, 1, [Define to 1 if you have X11])],
+			[AC_DEFINE(HAVE_X11, 1, [Define to 1 if you have X11])],
 			[AC_MSG_RESULT(no)
-			with_x=no])
+				if test "x$x_incpath_add" != "x" -a "x$x_libpath_add" != "x"; then
+					X11_LIBS="$x_libpath_add"
+					X11_CFLAGS="$x_incpath_add"
+				else
+					with_x=no
+				fi
+			])
 		AC_SUBST(X11_LIBS)
 		AC_SUBST(X11_CFLAGS)
 	fi
-	
+
 	dnl #######################################################################
 	dnl # Check for XScreenSaver
 	dnl #######################################################################
diff -r b88747698e96 -r 1691f4c9b6a8 libpurple/protocols/myspace/Makefile.am
--- a/libpurple/protocols/myspace/Makefile.am	Fri Sep 14 13:19:08 2007 +0000
+++ b/libpurple/protocols/myspace/Makefile.am	Fri Sep 14 15:39:51 2007 +0000
@@ -2,7 +2,7 @@
 
 pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION)
 
-SOURCES = markup.c \
+MSIMSOURCES = markup.c \
 	  markup.h \
 	  message.c \
 	  message.h \
@@ -24,14 +24,14 @@
 
 st = -DPURPLE_STATIC_PRPL
 noinst_LIBRARIES     = libmyspace.a
-libmyspace_a_SOURCES = $(SOURCES)
+libmyspace_a_SOURCES = $(MSIMSOURCES)
 libmyspace_a_CFLAGS  = $(AM_CFLAGS)
 
 else
 
 st =
 pkg_LTLIBRARIES       = libmyspace.la
-libmyspace_la_SOURCES = $(SOURCES)
+libmyspace_la_SOURCES = $(MSIMSOURCES)
 libmyspace_la_LIBADD  = $(GLIB_LIBS)
 
 endif
diff -r b88747698e96 -r 1691f4c9b6a8 pidgin.spec.in
--- a/pidgin.spec.in	Fri Sep 14 13:19:08 2007 +0000
+++ b/pidgin.spec.in	Fri Sep 14 15:39:51 2007 +0000
@@ -363,8 +363,6 @@
 %{_bindir}/pidgin
 %{_datadir}/pixmaps/pidgin
 %{_datadir}/icons/hicolor/*/apps/pidgin.*
-%dir %{_datadir}/sounds/pidgin
-%{_datadir}/sounds/pidgin/*
 %{_datadir}/applications/*
 %{_sysconfdir}/gconf/schemas/purple.schemas
 
@@ -374,6 +372,8 @@
 
 %{_libdir}/libpurple.so.*
 %dir %{_libdir}/purple-2
+%{_datadir}/purple
+%{_datadir}/sounds/purple
 %attr(755, root, root) %{perl_vendorarch}/Purple.pm
 %attr(755, root, root) %{perl_vendorarch}/auto/Purple
 
@@ -427,7 +427,7 @@
 %endif
 
 %if 0%{?_with_mono:1}
-%files libpurple-mono
+%files -n libpurple-mono
 %defattr(-, root, root)
 
 %{_libdir}/purple-2/mono.so
@@ -457,6 +457,9 @@
 %endif
 
 %changelog
+* Fri Sep 14 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Fix spec file for moved sounds & new CA certificates
+
 * Thu Jul 12 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Don't hardcode silc header locations, rely on pkg-config for those,
   because I think I broke non-pkg-config detection of older silc