[meego-commits] 6739: Changes to Trunk:Testing/syncevolution

[Patrick Ohly]

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

Thank You,
Patrick Ohly

[This message was auto-generated]

---

Request #6739:

  submit:   home:pohly/syncevolution(r22) -> Trunk:Testing/syncevolution


Message:
    None

State:   new          2010-08-16T21:52:38 pohly
Comment: None



changes files:
--------------
--- syncevolution.changes
+++ syncevolution.changes
@@ -0,0 +1,4 @@
+* Tue Aug 17 2010 Patrick Ohly <patrick.ohly at intel.com> - 1.0.99.3
+- avoid Bluez gdbus <-> glib conflict by renaming Bluez symbols
+- minor memory leak fixed
+

old:
----
  syncevolution-1.1+20100716+SE+88ea231+SYSYNC+a68a360.tar.gz

new:
----
  syncevolution-1.1+20100817+SE+4e87e50+SYSYNC+4cec205.tar.gz
  syncevolution-rpmlintrc

spec files:
-----------
--- syncevolution.spec
+++ syncevolution.spec
@@ -1,18 +1,19 @@
 # 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.18
+# Do not Edit! Generated by:
+# spectacle version 0.14
 # 
 # >> macros
 # << macros
 
 Name:       syncevolution
 Summary:    SyncML Client
-Version:    1.0.99.2
+Version:    1.0.99.3
 Release:    1
 Group:      Applications/Productivity
 License:    LGPLv2+
 URL:        http://www.estamos.de/projects/SyncML/
-Source0:    syncevolution-1.1+20100716+SE+88ea231+SYSYNC+a68a360.tar.gz
+Source0:    syncevolution-1.1+20100817+SE+4e87e50+SYSYNC+4cec205.tar.gz
+Source1:    syncevolution-rpmlintrc
 Source100:  syncevolution.yaml
 Requires:   ca-certificates
 Requires(post): /sbin/ldconfig
@@ -42,7 +43,6 @@
 BuildRequires:  intltool
 BuildRequires:  python
 
-
 %description
 The %{name} package contains the core files required to use
 SyncEvolution, a PIM data synchronization solution. A GTK GUI and the
@@ -55,6 +55,8 @@
 Summary:    Evolution Data Server backend for %{name}
 Group:      Applications/Productivity
 Requires:   %{name} = %{version}-%{release}
+Requires(post):  /sbin/ldconfig
+Requires(postun):  /sbin/ldconfig
 
 %description evolution
 The %{name}-evolution package contains a %{name} backend for
@@ -65,6 +67,8 @@
 Summary:    QtContacts backend for %{name}
 Group:      Applications/Productivity
 Requires:   %{name} = %{version}-%{release}
+Requires(post):  /sbin/ldconfig
+Requires(postun):  /sbin/ldconfig
 
 %description qtcontacts
 The %{name}-evolution package contains a %{name} backend for
@@ -75,6 +79,8 @@
 Summary:    KCalExtended backend for %{name}
 Group:      Applications/Productivity
 Requires:   %{name} = %{version}-%{release}
+Requires(post):  /sbin/ldconfig
+Requires(postun):  /sbin/ldconfig
 
 %description kcalextended
 The %{name}-evolution package contains a %{name} backend for
@@ -103,7 +109,7 @@
 
 
 %prep
-%setup -q -n %{name}-1.1+20100716+SE+88ea231+SYSYNC+a68a360
+%setup -q -n %{name}-1.1+20100817+SE+4e87e50+SYSYNC+4cec205
 
 # >> setup
 # << setup
@@ -142,19 +148,15 @@
 
 %postun -p /sbin/ldconfig
 
+%post evolution -p /sbin/ldconfig
 
+%postun evolution -p /sbin/ldconfig
+%post qtcontacts -p /sbin/ldconfig
 
+%postun qtcontacts -p /sbin/ldconfig
+%post kcalextended -p /sbin/ldconfig
 
-
-
-
-
-
-
-
-
-
-
+%postun kcalextended -p /sbin/ldconfig
 
 
 
@@ -173,6 +175,7 @@
 %{_libdir}/syncevolution/backends/syncaddressbook.so
 %{_libdir}/syncevolution/backends/syncsqlite.so
 %{_libdir}/syncevolution/backends/syncmaemocal.so
+%{_libdir}/syncevolution/libgdbus.*
 %{_libexecdir}/syncevo-dbus-server
 %{_libexecdir}/syncevo-dbus-server-startup.sh
 %{_datadir}/syncevolution
@@ -208,9 +211,6 @@
 %dir %{_includedir}/synthesis
 %{_includedir}/synthesis/*.h
 %{_includedir}/syncevo/*.h
-%{_includedir}/gdbus-cxx-bridge.h
-%{_includedir}/gdbus-cxx.h
-%{_includedir}/gdbus.h
 %{_libdir}/libsynthesis.so
 %{_libdir}/libsmltk.so
 %{_libdir}/libsyncevolution.so

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

++++++ syncevolution-1.1+20100817+SE+4e87e50+SYSYNC+4cec205.tar.gz (new)

++++++ syncevolution-rpmlintrc (new)
--- syncevolution-rpmlintrc
+++ syncevolution-rpmlintrc
+addFilter("devel-file-in-non-devel-package .*/usr/lib/syncevolution/libgdbus.so")

++++++ syncevolution.yaml
--- syncevolution.yaml
+++ syncevolution.yaml
@@ -1,12 +1,13 @@
 Name: syncevolution
 Summary: SyncML Client
-Version: 1.0.99.2
+Version: 1.0.99.3
 Release: 1
 Group: Applications/Productivity
 License: LGPLv2+
 URL: http://www.estamos.de/projects/SyncML/
 Sources:
-    - "syncevolution-1.1+20100716+SE+88ea231+SYSYNC+a68a360.tar.gz"
+    - "syncevolution-1.1+20100817+SE+4e87e50+SYSYNC+4cec205.tar.gz"
+    - syncevolution-rpmlintrc
 Description: |
     The %{name} package contains the core files required to use
     SyncEvolution, a PIM data synchronization solution. A GTK GUI and the
@@ -39,6 +40,7 @@
     - libpcre
     - libsoup-gnome-2.4
     - openobex
+#   - libmkcal
     - sqlite3
 Configure: configure
 ConfigOptions:
@@ -50,6 +52,7 @@
     - --with-expat=system
     - --disable-gnome-bluetooth-panel-plugin
     - --enable-qtcontacts
+#    - --enable-kcalextended
 SubPackages:
     - Name: evolution
       Summary: Evolution Data Server backend for %{name}

++++++ deleted files:
--- syncevolution-1.1+20100716+SE+88ea231+SYSYNC+a68a360.tar.gz