Mercurial > pidgin.yaz
changeset 16288:83bef7e6c410
merge of '8ec6be1457d557abe192a5fc4690884c2c98e164'
and 'd24e16e3173478c79b4b4bdc13e6546b9e778141'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sat, 21 Apr 2007 14:00:19 +0000 |
| parents | 776bf7979b4f (current diff) 7125eda8fe22 (diff) |
| children | 5f536fc60d14 |
| files | |
| diffstat | 23 files changed, 22 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -232,7 +232,7 @@ AM_CPPFLAGS = \ -DBR_PTHREADS=0 \ -DDATADIR=\"$(datadir)\" \ - -DLIBDIR=\"$(libdir)/libpurple/\" \ + -DLIBDIR=\"$(libdir)/purple/\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DSYSCONFDIR=\"$(sysconfdir)\" \ $(GLIB_CFLAGS) \
--- a/libpurple/plugins/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -22,7 +22,7 @@ ssl \ $(TCL_DIR) -plugindir = $(libdir)/libpurple +plugindir = $(libdir)/purple autoaccept_la_LDFLAGS = -module -avoid-version buddynote_la_LDFLAGS = -module -avoid-version
--- a/libpurple/plugins/mono/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/mono/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -5,7 +5,7 @@ EXTRA_DIST = $(mono_sources) -monodir = $(libdir)/libpurple +monodir = $(libdir)/purple mono_SCRIPTS = MPlugin.dll GetBuddyBack.dll mono_build_sources = $(addprefix $(srcdir)/, $(mono_sources))
--- a/libpurple/plugins/mono/api/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/mono/api/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,4 +1,4 @@ -monodir=$(libdir)/libpurple +monodir=$(libdir)/purple mono_sources = \ BlistNode.cs \
--- a/libpurple/plugins/mono/loader/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/mono/loader/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/libpurple +plugindir = $(libdir)/purple plugin_LTLIBRARIES = mono.la
--- a/libpurple/plugins/perl/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/perl/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/libpurple +plugindir = $(libdir)/purple hackdir = $(plugindir)/private perl_dirs = common
--- a/libpurple/plugins/ssl/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/ssl/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -plugindir = $(libdir)/libpurple +plugindir = $(libdir)/purple ssl_la_LDFLAGS = -module -avoid-version ssl_gnutls_la_LDFLAGS = -module -avoid-version
--- a/libpurple/plugins/tcl/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/plugins/tcl/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,4 +1,4 @@ -plugindir = $(libdir)/libpurple +plugindir = $(libdir)/purple tcl_la_LDFLAGS = -module -avoid-version
--- a/libpurple/protocols/bonjour/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/bonjour/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple BONJOURSOURCES = \ bonjour.c \
--- a/libpurple/protocols/gg/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/gg/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -13,7 +13,7 @@ lib/pubdir50.c \ lib/pubdir.c -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple if USE_INTERNAL_LIBGADU INTGGSOURCES = \
--- a/libpurple/protocols/irc/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/irc/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,6 +1,6 @@ EXTRA_DIST = PROTOCOL Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple IRCSOURCES = irc.c parse.c cmds.c msgs.c irc.h dcc_send.c
--- a/libpurple/protocols/jabber/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/jabber/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -3,7 +3,7 @@ win32/posix.uname.c \ win32/utsname.h -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple JABBERSOURCES = auth.c \ auth.h \
--- a/libpurple/protocols/msn/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/msn/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple MSNSOURCES = \ cmdproc.c \
--- a/libpurple/protocols/novell/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/novell/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple NOVELLSOURCES = \ nmfield.h \
--- a/libpurple/protocols/oscar/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/oscar/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -3,7 +3,7 @@ AUTHORS \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple OSCARSOURCES = \ bstream.c \
--- a/libpurple/protocols/qq/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/qq/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple QQSOURCES = \ buddy_info.c \
--- a/libpurple/protocols/sametime/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/sametime/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -2,7 +2,7 @@ EXTRA_DIST = Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple noinst_HEADERS = sametime.h
--- a/libpurple/protocols/silc/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/silc/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,6 +1,6 @@ EXTRA_DIST = README TODO Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple SILCSOURCES = silc.c silcpurple.h buddy.c chat.c ft.c ops.c pk.c util.c wb.c wb.h
--- a/libpurple/protocols/simple/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/simple/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple SIMPLESOURCES = \ simple.c \
--- a/libpurple/protocols/toc/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/toc/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -2,7 +2,7 @@ PROTOCOL \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple TOCSOURCES = toc.c
--- a/libpurple/protocols/yahoo/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/yahoo/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,7 +1,7 @@ EXTRA_DIST = \ Makefile.mingw -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple YAHOOSOURCES = \ util.c \
--- a/libpurple/protocols/zephyr/Makefile.am Sat Apr 21 13:59:28 2007 +0000 +++ b/libpurple/protocols/zephyr/Makefile.am Sat Apr 21 14:00:19 2007 +0000 @@ -1,4 +1,4 @@ -pkgdir = $(libdir)/libpurple +pkgdir = $(libdir)/purple ZEPHYRSOURCES = \ ZAsyncLocate.c \
--- a/pidgin.spec.in Sat Apr 21 13:59:28 2007 +0000 +++ b/pidgin.spec.in Sat Apr 21 14:00:19 2007 +0000 @@ -231,7 +231,6 @@ rm -f $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' -rm -f $RPM_BUILD_ROOT%{_datadir}/pixmaps/gaim.svg %if 0%{!?_with_howl:1} && 0%{!?_with_avahi:1} rm -f $RPM_BUILD_ROOT%{_libdir}/libpurple/libbonjour.so