Author: glen Date: Sun Dec 5 18:52:40 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 1.69
---- Files affected:
packages/libpurple-protocol-facebookchat:
Makefile (1.1 -> 1.2) , libpurple-protocol-facebookchat.spec (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/libpurple-protocol-facebookchat/Makefile
diff -u packages/libpurple-protocol-facebookchat/Makefile:1.1
packages/libpurple-protocol-facebookchat/Makefile:1.2
--- packages/libpurple-protocol-facebookchat/Makefile:1.1 Sun Dec 5
14:29:42 2010
+++ packages/libpurple-protocol-facebookchat/Makefile Sun Dec 5 19:52:34 2010
@@ -1,29 +1,33 @@
PREFIX=/usr
LIBDIR=$(PREFIX)/lib
ICONDIR=$(PREFIX)/share/pixmaps/pidgin/protocols
-SOURCES = \
- fb_friendlist.h \
- fb_friendlist.c \
- fb_util.h \
- fb_util.c \
- fb_conversation.c \
- fb_conversation.h \
- libfacebook.h \
- libfacebook.c \
- fb_blist.h \
- fb_blist.c \
- fb_connection.h \
- fb_connection.c \
- fb_info.h \
- fb_info.c \
- fb_managefriends.h \
- fb_managefriends.c \
- fb_messages.h \
- fb_messages.c \
- fb_notifications.h \
- fb_notifications.c \
- fb_search.h \
- fb_search.c
+FACEBOOK_SOURCES = \
+ libfacebook.c \
+ fb_blist.c \
+ fb_connection.c \
+ fb_conversation.c \
+ fb_info.c \
+ fb_managefriends.c \
+ fb_messages.c \
+ fb_notifications.c \
+ fb_search.c \
+ fb_util.c \
+ fb_friendlist.c \
+ fb_json.c \
+ fb_chat.c \
+ libfacebook.h \
+ fb_blist.h \
+ fb_connection.h \
+ fb_conversation.h \
+ fb_info.h \
+ fb_managefriends.h \
+ fb_messages.h \
+ fb_notifications.h \
+ fb_search.h \
+ fb_util.h \
+ fb_friendlist.h \
+ fb_json.h \
+ fb_chat.h
PURPLE_CFLAGS := $(shell pkg-config --cflags --libs purple)
PURPLE_CFLAGS += -DPURPLE_PLUGINS -DENABLE_NLS -fPIC -DPIC -DNO_ZLIB -shared
$(CFLAGS)
@@ -36,20 +40,17 @@
install: libfacebook.so
mkdir -p $(DESTDIR)$(LIBDIR)/purple-2
- cp libfacebook.so $(DESTDIR)$(LIBDIR)/purple-2
+ install -p libfacebook.so $(DESTDIR)$(LIBDIR)/purple-2
mkdir -p $(DESTDIR)$(ICONDIR)/{16,22,48}
- cp facebook16.png $(DESTDIR)$(ICONDIR)/16/facebook.png
- cp facebook22.png $(DESTDIR)$(ICONDIR)/22/facebook.png
- cp facebook48.png $(DESTDIR)$(ICONDIR)/48/facebook.png
+ cp -p facebook16.png $(DESTDIR)$(ICONDIR)/16/facebook.png
+ cp -p facebook22.png $(DESTDIR)$(ICONDIR)/22/facebook.png
+ cp -p facebook48.png $(DESTDIR)$(ICONDIR)/48/facebook.png
clean:
rm -f *.so *~
-libfacebook.so: ${SOURCES}
- ${CC} ${PURPLE_CFLAGS} -I. -I/usr/include/json-glib-1.0 -ljson-glib-1.0
-pipe ${SOURCES} -o libfacebook.so
+libfacebook.so: ${FACEBOOK_SOURCES}
+ ${CC} ${PURPLE_CFLAGS} -I. -I/usr/include/json-glib-1.0 -ljson-glib-1.0
-pipe ${FACEBOOK_SOURCES} -o $@
-sourcepackage: *.c *.h Makefile facebook16.png facebook22.png facebook48.png
COPYING facebook.nsi
+sourcepackage: *.c *.h Makefile facebook16.png facebook22.png facebook48.png
COPYING facebook.nsi
tar --bzip2 -cf pidgin-facebookchat-source.tar.bz2 $^
-
-
-
================================================================
Index:
packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec
diff -u
packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec:1.1
packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec:1.2
---
packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec:1.1
Sun Dec 5 14:29:42 2010
+++
packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec
Sun Dec 5 19:52:34 2010
@@ -1,14 +1,14 @@
# $Revision$, $Date$
Summary: Libpurple plug-in supporting facebook IM
Name: libpurple-protocol-facebookchat
-Version: 1.67
+Version: 1.69
Release: 1
License: GPL v3+
Group: Applications/Networking
URL: http://code.google.com/p/pidgin-facebookchat/
-Source0:
http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-%{version}-1.tar.bz2
-# Source0-md5: ae9d1f59e5185bf27b3ed1c0fee3fdc3
-Source3: Makefile
+Source0:
http://pidgin-facebookchat.googlecode.com/files/pidgin-facebookchat-source-%{version}.tar.bz2
+# Source0-md5: e6855197f9cb3fc6540039b6d42841f6
+Source1: Makefile
BuildRequires: json-glib-devel
BuildRequires: libpurple-devel >= 2.5.8
Obsoletes: pidgin-facebookchat < 1.35-3
@@ -30,13 +30,12 @@
%setup -q -n pidgin-facebookchat
# Upstream Makefile is totally horrible, use our own instead.
mv Makefile Makefile.orig
-install -p %{SOURCE3} Makefile
+install -p %{SOURCE1} Makefile
%build
%{__make} \
CC="%{__cc}" \
- CFLAGS="%{rpmcflags}" \
- LIBDIR=%{_libdir}
+ CFLAGS="%{rpmcflags}"
%install
rm -rf $RPM_BUILD_ROOT
@@ -44,14 +43,12 @@
LIBDIR=%{_libdir} \
DESTDIR=$RPM_BUILD_ROOT
-chmod a+rx $RPM_BUILD_ROOT%{_libdir}/purple-2/libfacebook.so
-
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%{_libdir}/purple-2/*.so
+%attr(755,root,root) %{_libdir}/purple-2/libfacebook.so
%{_pixmapsdir}/pidgin/protocols/*/facebook.png
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -60,5 +57,8 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.2 2010/12/05 18:52:34 glen
+- up to 1.69
+
Revision 1.1 2010/12/05 13:29:42 glen
- new, based on fc package
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpurple-protocol-facebookchat/Makefile?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libpurple-protocol-facebookchat/libpurple-protocol-facebookchat.spec?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
