# # old_revision [4fae60ab6fcb0873a74ac61e577ac3551ebe1b14] # # rename "libpurple/version.h" # to "libpurple/version.h.in" # # add_file "libpurple/version.c" # content [7b354705d05011f6f0774ad7168f469f05bc254d] # # patch "configure.ac" # from [b1e077dafe581c1223dcfe01f5da93241439105c] # to [2810f14bcd577b8823fa6aed5678c342aef82f54] # # patch "libpurple/Makefile.am" # from [5042d55a2f8e0ae7478dca89c1aebda5722c91ae] # to [d43bf5f70a4452fee9afb2607d2a446e6ebb6466] # # patch "libpurple/example/Makefile.am" # from [4ef4024d76a3c9ce2186a508da00287bc0c000d6] # to [bcf4795baef7a0e4cc5393a9a065a7cef42ac0fc] # # patch "libpurple/plugins/Makefile.am" # from [8a4ecbf40e775014442c69dbc4bca666ed1fb9ab] # to [58dc6557c88eca4694aae18fd6e179d9b152c50e] # # patch "libpurple/plugins/mono/Makefile.am" # from [ec50f748282079937808b6bba375207b62887328] # to [fed260e71d7bef763540c4295229868ab0e35713] # # patch "libpurple/plugins/mono/api/Makefile.am" # from [8cba0799eeee3f816a9e7010b4d8ad97fcf0e581] # to [9c95a983a73576e0de0c87c1d512ab58f4fdf9bd] # # patch "libpurple/plugins/mono/loader/Makefile.am" # from [b003a76e88daf6d25939a44c6734700f03ad2446] # to [d71e4e5aa10cc6e4bfd63e3140ce84ea536113a7] # # patch "libpurple/plugins/perl/Makefile.am" # from [daa2e554cd6ec3ebe9567fbd809f3e33019ecde2] # to [d4ec44a556bb9f338a19bd26bf044d5bf86709f6] # # patch "libpurple/plugins/ssl/Makefile.am" # from [955e11c33154c7a6c65bc7feff97ef588007f1cd] # to [df1751c06ae0db1a12251e674d69b3aef1c52806] # # patch "libpurple/plugins/tcl/Makefile.am" # from [252dc13472cec788c0190549782d371046997ba2] # to [5ac4a19af2d84de3d5c2a60a76e018d183879bc9] # # patch "libpurple/protocols/bonjour/Makefile.am" # from [5ce60eeb3029e0e5a8f09440df3b33a5b580e9a0] # to [d10ddba9c8d3fe7e2ebc5c04599243bea9c8e5aa] # # patch "libpurple/protocols/gg/Makefile.am" # from [b6f0aadb6c596d635a44138167985ada9b0cd8dc] # to [59f22aedb30ecb970a3da02d789d14507e0bf24a] # # patch "libpurple/protocols/irc/Makefile.am" # from [6244b5a87fe1ec781e6c6b990fafdd33ca0e46d8] # to [b06c6060e8d18f82eabd118cbbfe64ebea609558] # # patch "libpurple/protocols/jabber/Makefile.am" # from [ed69bbb1dcdee5e29d8cd483e4c70dec179fa898] # to [6b22a4fe4a444c91ad880b7347665fed916469f2] # # patch "libpurple/protocols/msn/Makefile.am" # from [60426d9bab124db35088c3770359bc9172b36097] # to [2b69eecae169c9b9ac276b8dadc77310b906601f] # # patch "libpurple/protocols/msn/slp.c" # from [0a72bac31cd684d58ff96bf331f980b304167635] # to [da62546b7a544ebc944a1423f2e59da7828bc721] # # patch "libpurple/protocols/novell/Makefile.am" # from [488f644c7631451a91fe8b0115d850d57a4174ac] # to [5979049df46d9bb1587d65159c0df0f18ce18b60] # # patch "libpurple/protocols/oscar/Makefile.am" # from [b0eb4e581cd6a5d1bcc0e35c62f9de75f199b10f] # to [41c5060cc2df632d02fdbac3983e8ef4b500df84] # # patch "libpurple/protocols/qq/Makefile.am" # from [4646cc533d1e9b20ba504f797d806a659d13402e] # to [5272a48622bcfda8d3eb8e6c08dae2139e751c61] # # patch "libpurple/protocols/sametime/Makefile.am" # from [bc1ee337d5a585795ce462936a0d8f368fb5f5b8] # to [d596c4db74ccb84d7986ae5fe59b60cc4bd854de] # # patch "libpurple/protocols/silc/Makefile.am" # from [27af6697bd18e8295d5fcaee2b62ca59c1efaab5] # to [7b3e36ee0be9a97cafe6d2da7ef925ae0cf6393a] # # patch "libpurple/protocols/simple/Makefile.am" # from [d49d94aacb67ae2ae0d07d27d3ddb5e015e89eab] # to [c434da409f05757980e1352d6e75349a2bd4ec38] # # patch "libpurple/protocols/toc/Makefile.am" # from [85faea5f55b5c4a58c4fc90462a88bb9ed4cb08e] # to [8e6b8cfb08d61a929b4c0a0bc5c306d854127fb0] # # patch "libpurple/protocols/yahoo/Makefile.am" # from [8692ca46bf9c545a9917fbf7d494313c5dff62da] # to [a552d357fcc3426faa0b45fdb381d0da7bd70434] # # patch "libpurple/protocols/zephyr/Makefile.am" # from [c657088a5161bfc79ff4171e0fdfe59b5077d56d] # to [1143090215c636b86be84e16d3f3ed8a7cd3cad6] # # patch "libpurple/purple.pc.in" # from [f61c3eaba527dabb82da87b38bc0c894f2a78a59] # to [48b1cb56d092b91cd7cef9b81ccadad883ec7c11] # # patch "libpurple/version.h.in" # from [19f26267eddcefc3dc59fbe84813c181d8bee187] # to [0a7f1bde784aaabc2bfae59b09074feb8c3c6494] # # patch "pidgin.spec.in" # from [675721bd3b4795566ca3aae2c79e6f64c33f596f] # to [79542890def951395147807f5f0d2642929eac7e] # ============================================================ --- libpurple/version.c 7b354705d05011f6f0774ad7168f469f05bc254d +++ libpurple/version.c 7b354705d05011f6f0774ad7168f469f05bc254d @@ -0,0 +1,43 @@ +/* + * @file version.c Version Functions + * @ingroup core + * + * Purple is the legal property of its developers, whose names are too numerous + * to list here. Please refer to the COPYRIGHT file distributed with this + * source distribution. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include "internal.h" + +#include "version.h" + +const guint purple_major_version = PURPLE_MAJOR_VERSION; +const guint purple_minor_version = PURPLE_MINOR_VERSION; +const guint purple_micro_version = PURPLE_MICRO_VERSION; + +const char *purple_version_check(guint required_major, guint required_minor, guint required_micro) +{ + if (required_major > PURPLE_MAJOR_VERSION) + return "libpurple version too old (major mismatch)"; + if (required_major < PURPLE_MAJOR_VERSION) + return "libpurple version too new (major mismatch)"; + if (required_minor > PURPLE_MINOR_VERSION) + return "libpurple version too old (minor mismatch)"; + if ((required_minor == PURPLE_MINOR_VERSION) && (required_micro > PURPLE_MICRO_VERSION)) + return "libpurple version too old (micro mismatch)"; + return NULL; +} ============================================================ --- configure.ac b1e077dafe581c1223dcfe01f5da93241439105c +++ configure.ac 2810f14bcd577b8823fa6aed5678c342aef82f54 @@ -1,12 +1,51 @@ dnl Process this file with autoconf to p dnl Process this file with autoconf to produce a configure script. -AC_INIT([pidgin], [2.0.0beta7devel], [devel@pidgin.im]) +AC_PREREQ([2.50]) + +# Making releases: +# purple_micro_version += 1 +# if any functions have been added: +# purple_micro_version = 0 +# purple_minor_version += 1 +# if backwards compatibility has been broken +# purple_minor_version = 0 +# purple_micro_version = 0 +# purple_major_version += 1; +# +# purple_is_release = 1 *only* for the release +# +m4_define([purple_major_version], [2]) +m4_define([purple_minor_version], [0]) +m4_define([purple_micro_version], [0]) +m4_define([purple_version_suffix], [devel]) +m4_define([purple_version], + [purple_major_version.purple_minor_version.purple_micro_version]) +dnl m4_define([purple_display_version], purple_version[]m4_if(purple_beta,[7],[beta[]purple_beta])) +dnl m4_define([purple_display_version], purple_version[]m4_ifdef(purple_suffix[],[purple_suffix])) +m4_define([purple_display_version], purple_version[]m4_ifdef([purple_version_suffix],[purple_version_suffix])) + +AC_INIT([pidgin], [purple_display_version], [devel@pidgin.im]) + AC_CANONICAL_SYSTEM AM_CONFIG_HEADER(config.h) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) #AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AC_PREREQ([2.50]) +PURPLE_MAJOR_VERSION=purple_major_version +PURPLE_MINOR_VERSION=purple_minor_version +PURPLE_MICRO_VERSION=purple_micro_version +PURPLE_VERSION=[purple_display_version] +AC_SUBST(PURPLE_MAJOR_VERSION) +AC_SUBST(PURPLE_MINOR_VERSION) +AC_SUBST(PURPLE_MICRO_VERSION) +AC_SUBST(PURPLE_VERSION) +m4_define([lt_current], [m4_eval(100 * purple_major_version + purple_minor_version)]) +m4_define([lt_age], [purple_minor_version]) +m4_define([lt_revision], [purple_micro_version]) +LT_VERSION_INFO="lt_current:lt_revision:lt_age" +AC_SUBST(LT_VERSION_INFO) + + AC_DEFINE(PIDGIN_NAME, "Pidgin", [The user-visible application name]) AC_PATH_PROG(sedpath, sed) @@ -2013,6 +2052,7 @@ AC_OUTPUT([Makefile libpurple/protocols/yahoo/Makefile libpurple/protocols/zephyr/Makefile libpurple/tests/Makefile + libpurple/version.h finch/Makefile finch/libgnt/Makefile finch/libgnt/gnt.pc ============================================================ --- libpurple/Makefile.am 5042d55a2f8e0ae7478dca89c1aebda5722c91ae +++ libpurple/Makefile.am d43bf5f70a4452fee9afb2607d2a446e6ebb6466 @@ -8,6 +8,7 @@ EXTRA_DIST = \ purple-url-handler \ purple.pc.in \ purple-uninstalled.pc.in \ + version.h.in \ Makefile.mingw \ win32/global.mak \ win32/libc_interface.c \ @@ -75,6 +76,7 @@ purple_coresources = \ upnp.c \ util.c \ value.c \ + version.c \ xmlnode.c \ whiteboard.c @@ -219,7 +221,7 @@ libpurple_la_DEPENDENCIES = $(STATIC_LIN $(dbus_headers) libpurple_la_DEPENDENCIES = $(STATIC_LINK_LIBS) -libpurple_la_LDFLAGS = -export-dynamic +libpurple_la_LDFLAGS = -export-dynamic -version-info $(LT_VERSION_INFO) -no-undefined libpurple_la_LIBADD = \ $(DBUS_LIBS) \ $(GLIB_LIBS) \ @@ -232,7 +234,7 @@ AM_CPPFLAGS = \ AM_CPPFLAGS = \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)/purple/\" \ + -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ $(GLIB_CFLAGS) \ ============================================================ --- libpurple/example/Makefile.am 4ef4024d76a3c9ce2186a508da00287bc0c000d6 +++ libpurple/example/Makefile.am bcf4795baef7a0e4cc5393a9a065a7cef42ac0fc @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ -DSTANDALONE \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)/libpurple/\" \ + -DLIBDIR=\"$(libdir)/purple-$(PURPLE_MAJOR_VERSION)/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ -I$(top_srcdir)/libpurple/ \ ============================================================ --- libpurple/plugins/Makefile.am 8a4ecbf40e775014442c69dbc4bca666ed1fb9ab +++ libpurple/plugins/Makefile.am 58dc6557c88eca4694aae18fd6e179d9b152c50e @@ -22,7 +22,7 @@ SUBDIRS = \ ssl \ $(TCL_DIR) -plugindir = $(libdir)/purple +plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) autoaccept_la_LDFLAGS = -module -avoid-version buddynote_la_LDFLAGS = -module -avoid-version ============================================================ --- libpurple/plugins/mono/Makefile.am ec50f748282079937808b6bba375207b62887328 +++ libpurple/plugins/mono/Makefile.am fed260e71d7bef763540c4295229868ab0e35713 @@ -5,7 +5,7 @@ EXTRA_DIST = $(mono_sources) EXTRA_DIST = $(mono_sources) -monodir = $(libdir)/purple +monodir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) mono_SCRIPTS = MPlugin.dll GetBuddyBack.dll mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources)) ============================================================ --- libpurple/plugins/mono/api/Makefile.am 8cba0799eeee3f816a9e7010b4d8ad97fcf0e581 +++ libpurple/plugins/mono/api/Makefile.am 9c95a983a73576e0de0c87c1d512ab58f4fdf9bd @@ -1,4 +1,4 @@ -monodir=$(libdir)/purple +monodir=$(libdir)/purple-$(PURPLE_MAJOR_VERSION) mono_sources = \ BlistNode.cs \ ============================================================ --- libpurple/plugins/mono/loader/Makefile.am b003a76e88daf6d25939a44c6734700f03ad2446 +++ libpurple/plugins/mono/loader/Makefile.am d71e4e5aa10cc6e4bfd63e3140ce84ea536113a7 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/purple +plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) plugin_LTLIBRARIES = mono.la ============================================================ --- libpurple/plugins/perl/Makefile.am daa2e554cd6ec3ebe9567fbd809f3e33019ecde2 +++ libpurple/plugins/perl/Makefile.am d4ec44a556bb9f338a19bd26bf044d5bf86709f6 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/purple +plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) perl_dirs = common ============================================================ --- libpurple/plugins/ssl/Makefile.am 955e11c33154c7a6c65bc7feff97ef588007f1cd +++ libpurple/plugins/ssl/Makefile.am df1751c06ae0db1a12251e674d69b3aef1c52806 @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -plugindir = $(libdir)/purple +plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) ssl_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version ============================================================ --- libpurple/plugins/tcl/Makefile.am 252dc13472cec788c0190549782d371046997ba2 +++ libpurple/plugins/tcl/Makefile.am 5ac4a19af2d84de3d5c2a60a76e018d183879bc9 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/purple +plugindir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) tcl_la_LDFLAGS = -module -avoid-version ============================================================ --- libpurple/protocols/bonjour/Makefile.am 5ce60eeb3029e0e5a8f09440df3b33a5b580e9a0 +++ libpurple/protocols/bonjour/Makefile.am d10ddba9c8d3fe7e2ebc5c04599243bea9c8e5aa @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) BONJOURSOURCES = \ bonjour.c \ ============================================================ --- libpurple/protocols/gg/Makefile.am b6f0aadb6c596d635a44138167985ada9b0cd8dc +++ libpurple/protocols/gg/Makefile.am 59f22aedb30ecb970a3da02d789d14507e0bf24a @@ -13,7 +13,7 @@ EXTRA_DIST = \ lib/pubdir50.c \ lib/pubdir.c -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) if USE_INTERNAL_LIBGADU INTGGSOURCES = \ ============================================================ --- libpurple/protocols/irc/Makefile.am 6244b5a87fe1ec781e6c6b990fafdd33ca0e46d8 +++ libpurple/protocols/irc/Makefile.am b06c6060e8d18f82eabd118cbbfe64ebea609558 @@ -1,6 +1,6 @@ EXTRA_DIST = PROTOCOL Makefile.mingw EXTRA_DIST = PROTOCOL Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c ============================================================ --- libpurple/protocols/jabber/Makefile.am ed69bbb1dcdee5e29d8cd483e4c70dec179fa898 +++ libpurple/protocols/jabber/Makefile.am 6b22a4fe4a444c91ad880b7347665fed916469f2 @@ -1,9 +1,9 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw \ win32/posix.uname.c \ win32/utsname.h -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) JABBERSOURCES = auth.c \ auth.h \ ============================================================ --- libpurple/protocols/msn/Makefile.am 60426d9bab124db35088c3770359bc9172b36097 +++ libpurple/protocols/msn/Makefile.am 2b69eecae169c9b9ac276b8dadc77310b906601f @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) MSNSOURCES = \ cmdproc.c \ ============================================================ --- libpurple/protocols/msn/slp.c 0a72bac31cd684d58ff96bf331f980b304167635 +++ libpurple/protocols/msn/slp.c da62546b7a544ebc944a1423f2e59da7828bc721 @@ -955,7 +955,7 @@ msn_queue_buddy_icon_request(MsnUser *us if (obj == NULL) { - purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); +/* purple_buddy_icons_set_for_user(account, user->passport, NULL, 0, NULL); */ return; } ============================================================ --- libpurple/protocols/novell/Makefile.am 488f644c7631451a91fe8b0115d850d57a4174ac +++ libpurple/protocols/novell/Makefile.am 5979049df46d9bb1587d65159c0df0f18ce18b60 @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) NOVELLSOURCES = \ nmfield.h \ ============================================================ --- libpurple/protocols/oscar/Makefile.am b0eb4e581cd6a5d1bcc0e35c62f9de75f199b10f +++ libpurple/protocols/oscar/Makefile.am 41c5060cc2df632d02fdbac3983e8ef4b500df84 @@ -1,9 +1,9 @@ EXTRA_DIST = \ EXTRA_DIST = \ COPYING \ AUTHORS \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) OSCARSOURCES = \ bstream.c \ ============================================================ --- libpurple/protocols/qq/Makefile.am 4646cc533d1e9b20ba504f797d806a659d13402e +++ libpurple/protocols/qq/Makefile.am 5272a48622bcfda8d3eb8e6c08dae2139e751c61 @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) QQSOURCES = \ buddy_info.c \ ============================================================ --- libpurple/protocols/sametime/Makefile.am bc1ee337d5a585795ce462936a0d8f368fb5f5b8 +++ libpurple/protocols/sametime/Makefile.am d596c4db74ccb84d7986ae5fe59b60cc4bd854de @@ -1,8 +1,8 @@ EXTRA_DIST = Makefile.mingw EXTRA_DIST = Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) noinst_HEADERS = sametime.h ============================================================ --- libpurple/protocols/silc/Makefile.am 27af6697bd18e8295d5fcaee2b62ca59c1efaab5 +++ libpurple/protocols/silc/Makefile.am 7b3e36ee0be9a97cafe6d2da7ef925ae0cf6393a @@ -1,6 +1,6 @@ EXTRA_DIST = README TODO Makefile.mingw EXTRA_DIST = README TODO Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) SILCSOURCES = silc.c silcpurple.h buddy.c chat.c ft.c ops.c pk.c util.c wb.c wb.h ============================================================ --- libpurple/protocols/simple/Makefile.am d49d94aacb67ae2ae0d07d27d3ddb5e015e89eab +++ libpurple/protocols/simple/Makefile.am c434da409f05757980e1352d6e75349a2bd4ec38 @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) SIMPLESOURCES = \ simple.c \ ============================================================ --- libpurple/protocols/toc/Makefile.am 85faea5f55b5c4a58c4fc90462a88bb9ed4cb08e +++ libpurple/protocols/toc/Makefile.am 8e6b8cfb08d61a929b4c0a0bc5c306d854127fb0 @@ -1,8 +1,8 @@ EXTRA_DIST = \ EXTRA_DIST = \ PROTOCOL \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) TOCSOURCES = toc.c ============================================================ --- libpurple/protocols/yahoo/Makefile.am 8692ca46bf9c545a9917fbf7d494313c5dff62da +++ libpurple/protocols/yahoo/Makefile.am a552d357fcc3426faa0b45fdb381d0da7bd70434 @@ -1,7 +1,7 @@ EXTRA_DIST = \ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) YAHOOSOURCES = \ util.c \ ============================================================ --- libpurple/protocols/zephyr/Makefile.am c657088a5161bfc79ff4171e0fdfe59b5077d56d +++ libpurple/protocols/zephyr/Makefile.am 1143090215c636b86be84e16d3f3ed8a7cd3cad6 @@ -1,4 +1,4 @@ -pkgdir = $(libdir)/purple +pkgdir = $(libdir)/purple-$(PURPLE_MAJOR_VERSION) ZEPHYRSOURCES = \ ZAsyncLocate.c \ ============================================================ --- libpurple/purple.pc.in f61c3eaba527dabb82da87b38bc0c894f2a78a59 +++ libpurple/purple.pc.in 48b1cb56d092b91cd7cef9b81ccadad883ec7c11 @@ -11,4 +11,3 @@ Libs: -L${libdir} -lpurple Requires: glib-2.0 Cflags: -I${includedir}/libpurple Libs: -L${libdir} -lpurple - ============================================================ --- libpurple/version.h 19f26267eddcefc3dc59fbe84813c181d8bee187 +++ libpurple/version.h.in 0a7f1bde784aaabc2bfae59b09074feb8c3c6494 @@ -24,16 +24,35 @@ #ifndef _PURPLE_VERSION_H_ #define _PURPLE_VERSION_H_ -#define PURPLE_MAJOR_VERSION 2 -#define PURPLE_MINOR_VERSION 0 -#define PURPLE_MICRO_VERSION 0 +#define PURPLE_MAJOR_VERSION (@PURPLE_MAJOR_VERSION@) +#define PURPLE_MINOR_VERSION (@PURPLE_MINOR_VERSION@) +#define PURPLE_MICRO_VERSION (@PURPLE_MICRO_VERSION@) -#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && ((y) < PURPLE_MINOR_VERSION || ((y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) +#define PURPLE_VERSION_CHECK(x,y,z) ((x) == PURPLE_MAJOR_VERSION && \ + ((y) < PURPLE_MINOR_VERSION || \ + ((y) == PURPLE_MINOR_VERSION && (z) <= PURPLE_MICRO_VERSION))) #ifdef __cplusplus extern "C" { #endif +const guint purple_major_version; +const guint purple_minor_version; +const guint purple_micro_version; + +/** + * Checks that the libpurple version is compatible with the requested + * version + * + * @param required_major: the required major version. + * @param required_minor: the required minor version. + * @param required_micro: the required micro version. + * + * @return NULL if the versions are compatible, or a string describing + * the version mismatch if not compatible. + */ +const char *purple_version_check(guint required_major, guint required_minor, guint required_micro); + #ifdef __cplusplus } #endif ============================================================ --- pidgin.spec.in 675721bd3b4795566ca3aae2c79e6f64c33f596f +++ pidgin.spec.in 79542890def951395147807f5f0d2642929eac7e @@ -350,7 +350,7 @@ fi %defattr(-, root, root) %{_libdir}/libpurple.so.* -%dir %{_libdir}/purple +%dir %{_libdir}/purple-2 %attr(755, root, root) %{perl_vendorarch}/Purple.pm %dir %{perl_vendorarch}/auto/Purple %attr(755, root, root) %{perl_vendorarch}/auto/Purple/Purple.so