[meego-commits] 6073: Changes to Trunk:Testing/pidgin-sipe

[Jian-feng Ding]

Hi,
I have made the following changes to pidgin-sipe in project Trunk:Testing. Please review and accept ASAP.

Thank You,
Jian-feng Ding

[This message was auto-generated]

---

Request #6073:

  submit:   home:jfding:branches:Trunk:Testing/pidgin-sipe(r7)(cleanup) -> Trunk:Testing/pidgin-sipe


Message:
    upgrade to latest 1.10.1 and fixed build errors

State:   new          2010-07-28T14:59:57 jfding
Comment: None



changes files:
--------------
--- pidgin-sipe.changes
+++ pidgin-sipe.changes
@@ -0,0 +1,3 @@
+* Thu Jul 29 2010 Jian-feng Ding <jian-feng.ding at intel.com> 1.10.1
+- Upgrade to latest 1.10.1 and enable spectacle
+

old:
----
  pidgin-sipe-1.7.1.tar.bz2

new:
----
  Makefile
  pidgin-sipe-1.10.1.tar.bz2
  pidgin-sipe.yaml

spec files:
-----------
--- pidgin-sipe.spec
+++ pidgin-sipe.spec
@@ -1,16 +1,25 @@
+# 
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.18
+# 
+# >> macros
+# << macros
+
 Name:           pidgin-sipe
-Version:        1.7.1
-Release:        1
 Summary:        Pidgin plugin for connecting to MS Communications Server
-
+Version:    1.10.1
+Release:    1
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://sipe.sourceforge.net/
-Source0:        http://download.sourceforge.net/pidgin-sipe/pidgin-sipe-%{version}.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-BuildRequires:  zlib-devel, libpurple-devel, e2fsprogs-devel, intltool
-BuildRequires:  krb5-devel, gettext
+Source0:    http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-%{version}/pidgin-sipe-%{version}.tar.bz2
+Source100:  pidgin-sipe.yaml
+BuildRequires:  pkgconfig(glib-2.0) >= 2.12.0
+BuildRequires:  pkgconfig(purple) >= 2.4.0
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  krb5-devel
+BuildRequires:  intltool
+BuildRequires:  gettext
 
 
 %description
@@ -18,60 +27,48 @@
 Live Communications Server 2003/2005 and Office Communications Server 2007.
 
 
+
+
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
 
+# >> setup
+# << setup
 
 %build
-%configure --with-krb5
-make %{?_smp_mflags}
+# >> build pre
+# << build pre
+
+%configure --disable-static \
+    --with-krb5
 
+make %{?jobs:-j%jobs}
 
+# >> build post
+# << build post
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+# >> install pre
+# << install pre
+%make_install 
+
+# >> install post
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
+# << install post
 %find_lang %{name}
 
 
-%clean
-rm -rf $RPM_BUILD_ROOT
+
+
 
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
+# >> files
 %doc AUTHORS ChangeLog HACKING COPYING NEWS README TODO
 %{_libdir}/purple-2/libsipe.so
 %{_datadir}/pixmaps/pidgin/protocols/*/sipe.png
+%{_datadir}/pixmaps/pidgin/protocols/*/sipe.svg
+# << files
 
 
-%changelog
-* Mon Nov 23 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.7.1-1
-- Upstream 1.7.1 (bugfixes)
-
-* Tue Nov 03 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.7.0-1
-- Upstream 1.7.0
-
-* Mon Sep 28 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6.3-1
-- Upstream 1.6.3
-
-* Tue Sep 08 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6.2-1
-- Upstream 1.6.2
-- Drop obsoleted ppc fix patch
-
-* Fri Jul 31 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6.0-2
-- Add BR: gettext to build on EPEL
-
-* Thu Jul 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6.0-2
-- Another attempt at ppc build fix (patch from Stefan Becker)
-
-* Tue Jul 28 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.6.0-1
-- Upstream 1.6.0
-- Build on ppc, but pass --enable-quality-check=no to configure
-
-* Thu Jul 16 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-2
-- Build --with-krb5
-
-* Tue Jun 30 2009 Konstantin Ryabitsev <icon at fedoraproject.org> - 1.5.0-1
-- Initial packaging.
-

other changes:
--------------

++++++ Makefile (new)
--- Makefile
+++ Makefile
+PKG_NAME := pidgin-sipe
+SPECFILE = $(addsuffix .spec, $(PKG_NAME))
+YAMLFILE = $(addsuffix .yaml, $(PKG_NAME))
+
+include /usr/share/packaging-tools/Makefile.common
+

++++++ pidgin-sipe-1.7.1.tar.bz2 -> pidgin-sipe-1.10.1.tar.bz2
78694 lines of diff (skipped)

++++++ pidgin-sipe.yaml (new)
--- pidgin-sipe.yaml
+++ pidgin-sipe.yaml
+Name: pidgin-sipe
+Summary: Pidgin plugin for connecting to MS Communications Server
+Version: 1.10.1
+Release: 1
+Group: Applications/Internet
+License: GPLv2+
+URL: http://sipe.sourceforge.net/
+Sources:
+    - http://downloads.sourceforge.net/project/sipe/sipe/pidgin-sipe-%{version}/pidgin-sipe-%{version}.tar.bz2
+SourcePrefix: "%{name}-%{version}"
+Description: |
+    Provides an Open Implementation of SIP/Simple protocol for connecting Pidgin to
+    Live Communications Server 2003/2005 and Office Communications Server 2007.
+
+PkgConfigBR:
+    - glib-2.0 >= 2.12.0
+    - purple >= 2.4.0
+    - libxml-2.0
+PkgBR:
+    - krb5-devel
+    - intltool
+    - gettext
+Configure: configure
+ConfigOptions:
+    - --with-krb5
+Builder: make
+LocaleName: "%{name}"