From dc380e521c70bc5e6a3a2f034aa7965fc59bd375 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Jul 28 2012 08:44:07 +0000
Subject: 1.2.99.3


---

diff --git a/sources b/sources
index 4927abe..54790bb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0f58a4adf0ff034d7ae7f6c8589ed5b0  syncevolution-1.2.2.tar.gz
+c02be29b6ca888cde47f087b19259368  syncevolution-1.2.99.3.tar.gz
diff --git a/syncevolution.spec b/syncevolution.spec
index 119273c..09bd4dc 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -1,17 +1,12 @@
 Summary:       SyncML client for evolution
 Name:          syncevolution
-Version:       1.2.2
-Release:       2%{?dist}
+Version:       1.2.99.3
+Release:       1%{?dist}
 Epoch:         1
 License:       LGPLv2+
 Group:         Applications/Productivity
 URL:           http://syncevolution.org/
 Source:        http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz
-# link statically against internal libgdbus to avoid crashing
-# basically re-apply upstream ec7eb74366a9d1b2d5390c75a8ab2716d579e0cc
-# which was reverted (prematurely) - AdamW 2011/03
-# https://bugzilla.redhat.com/show_bug.cgi?id=640750
-Patch1:	       syncevolution-1.1.1-gdbus_static.patch
 
 BuildRequires: bluez-libs-devel
 BuildRequires: boost-devel
@@ -68,16 +63,6 @@ Requires: %{name} = %{epoch}:%{version}-%{release}
 %description gtk
 GTK+ GUI for use with %{name}.
 
-%package meego
-Summary: MeeGo GUI for %{name}
-Group: Applications/Productivity
-Requires: %{name} = %{epoch}:%{version}-%{release}
-Obsoletes: syncevolution-moblin < 1:1.1
-Provides: %{name}-moblin = %{version}
-
-%description meego
-MeeGo GUI for use with %{name}.
-
 %package perl
 Summary: Perl utils for %{name}
 Group: Development/Libraries
@@ -88,7 +73,6 @@ Perl utils for use with %{name}.
 
 %prep
 %setup -q
-%patch1 -p1 -b .gdbus
 
 # use the ac macros in Makefile.am
 sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
@@ -96,16 +80,16 @@ sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am
 %build
 intltoolize --automake --copy --force
 autoreconf -fiv
-./autogen.sh
 (cd src/synthesis && autoreconf -fi && ./autogen.sh)
 
 %configure --enable-libsoup --enable-dbus-service --enable-shared \
-    --with-expat=system --disable-static --enable-gui=all \
+    --with-expat=system --disable-static --enable-gui --with-gio-gdbus \
 %ifnarch s390 s390x
     --enable-bluetooth
 %else
     --disable-bluetooth
 %endif
+
 sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g
 	s|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 
@@ -122,12 +106,9 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %find_lang %{name}
 
 # fix the in the desktop files
-sed -i 's/sync-ui/sync-ui-gtk/' %{buildroot}/%{_datadir}/applications/sync-gtk.desktop
-sed -i 's/sync-ui/sync-ui-moblin/' %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
-# sed -i 's#Categories=Office;PDA;GTK#Categories=Office;PDA;GTK;#' %{buildroot}/%{_datadir}/applications/sync-gtk.desktop
+sed -i 's/sync-ui/sync-ui-gtk/' %{buildroot}/%{_datadir}/applications/sync.desktop
 
-desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-gtk.desktop
-desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/sync.desktop
 
 %post -p /sbin/ldconfig
 
@@ -137,12 +118,15 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %defattr(-,root,root,-)
 %doc AUTHORS NEWS README HACKING README.html README.rst
 %{_sysconfdir}/xdg/autostart/syncevo-dbus-server.desktop
+%{_bindir}/synccompare
 %{_bindir}/syncevolution
 %{_bindir}/syncevo-http-server
 %{_bindir}/syncevo-phone-config
-%{_bindir}/syncevo-webdav-lookup
+%{_bindir}/synclog2html
+%{_libexecdir}/syncevo-dbus-helper
 %{_libexecdir}/syncevo-dbus-server
 %{_libexecdir}/syncevo-dbus-server-startup.sh
+%{_libexecdir}/syncevo-local-sync
 %{_datadir}/syncevolution
 %{_datadir}/dbus-1/services/org.syncevolution.service
 %{_datadir}/man/man1/syncevolution.1.gz
@@ -167,13 +151,8 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 
 %files gtk
 %defattr(-,root,root,-)
-%{_bindir}/sync-ui-gtk
-%{_datadir}/applications/sync-gtk.desktop
-
-%files meego
-%defattr(-,root,root,-)
-%{_bindir}/sync-ui-moblin
-%{_datadir}/applications/sync-moblin.desktop
+%{_bindir}/sync-ui
+%{_datadir}/applications/sync.desktop
 
 %files perl
 %defattr(-,root,root,-)
@@ -181,6 +160,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync-moblin.desktop
 %{_datadir}/syncevolution/xml/*.pl
 
 %changelog
+* Sat Jul 28 2012 Peter Robinson <pbrobinson@fedoraproject.org> - 1:1.2.99.3-1
+- Update to 1.2.99.3 devel release
+- Drop MeeGo sub package
+- Drop gdbus patch as it's now fixed upstream
+
 * Fri Feb 10 2012 Petr Pisar <ppisar@redhat.com> - 1:1.2.2-2
 - Rebuild against PCRE 8.30