rpms/syncevolution/devel syncevolution-build.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 syncevolution.spec, 1.11, 1.12 syncevolution-0.8.1a-build.patch, 1.1, NONE

Wed Aug 5 11:11:40 UTC 2009

Author: mcepl

Update of /cvs/pkgs/rpms/syncevolution/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19348

Modified Files:
	.cvsignore sources syncevolution.spec 
Added Files:
	syncevolution-build.patch 
Removed Files:
	syncevolution-0.8.1a-build.patch 
Log Message:
Working on upgrade, but FTBFS momentarily

syncevolution-build.patch:
 syncevo-dbus-server.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE syncevolution-build.patch ---
diff -up syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp.Fedora-build syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp
--- syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp.Fedora-build	2009-07-21 16:38:28.000000000 +0200
+++ syncevolution-0.8.1+0.9+beta3+20090723/src/syncevo-dbus-server.cpp	2009-08-05 12:36:29.410272268 +0200
@@ -475,7 +475,7 @@ need_password (const char *username,
                gpointer data)
 {
 	char *password = NULL;
-	char *server = NULL;
+	const char *server = NULL;
 	GnomeKeyringResult res;
 
 	server = strstr (server_url, "://");


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	23 Mar 2009 15:05:39 -0000	1.4
+++ .cvsignore	5 Aug 2009 11:11:38 -0000	1.5
@@ -1 +1,2 @@
 syncevolution-0.8.1a.tar.gz
+syncevolution-0.8.1+0.9+beta3+20090723.tar.gz


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	23 Mar 2009 15:05:39 -0000	1.4
+++ sources	5 Aug 2009 11:11:39 -0000	1.5
@@ -1 +1 @@
-a4bb354520530da4846f3c216d50d42f  syncevolution-0.8.1a.tar.gz
+5c84744312f10fa93195c711434b6a0c  syncevolution-0.8.1+0.9+beta3+20090723.tar.gz


Index: syncevolution.spec
===================================================================
RCS file: /cvs/pkgs/rpms/syncevolution/devel/syncevolution.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- syncevolution.spec	27 Jul 2009 05:17:58 -0000	1.11
+++ syncevolution.spec	5 Aug 2009 11:11:39 -0000	1.12
@@ -1,56 +1,94 @@
 Summary: SyncML client for evolution
 Name: syncevolution
-Version: 0.8.1a
-Release: 2%{?dist}
-License: GPLv2+
+Version: 0.8.1+0.9+beta3+20090723
+Release: 1.0.1%{?dist}
+License: LGPLv2+
 Group: Applications/Productivity
-URL: http://www.estamos.de/projects/SyncML/
-Source0: http://www.estamos.de/download/syncevolution/sources/%{name}-%{version}.tar.gz
-# Patch filed upstream at
-# https://sourceforge.net/tracker/index.php\
-#     ?func=detail&aid=2707496&group_id=146288&atid=764733
-Patch0: syncevolution-0.8.1a-build.patch
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Requires: evolution
-Requires: curl
-BuildRequires: evolution-data-server-devel
-BuildRequires: curl-devel
+URL: http://syncevolution.org/
+Source: http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
+Patch0: syncevolution-build.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires: boost-devel
 BuildRequires: cppunit-devel
-BuildRequires: gcc-c++
+BuildRequires: evolution-data-server-devel
+BuildRequires: expat-devel
+BuildRequires: glib2-devel
+BuildRequires: libsoup-devel
+BuildRequires: libical-devel
+BuildRequires: pcre-devel
+BuildRequires: intltool automake libtool autoconf
 
 %description
 syncevolution is designed to provide a SyncML client that can
 connect to and sync with various SyncML-based servers
 
+%package devel
+Summary: Development package for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Requires: pkgconfig
+
+%description devel
+Files for development with %{name}.
+
 %prep
 %setup -q
-%patch0 -p1 -b .build
-%configure --enable-unit-tests
+%patch0 -p1 -b .Fedora-build
 
 %build
+aclocal --force
+libtoolize --copy --force --automake
+intltoolize --automake --copy --force
+autoconf --force
+automake --copy --add-missing
+%configure --enable-unit-tests --enable-libsoup  \
+    --enable-dbus-service --enable-shared --with-expat=system \
+    --disable-static
+#sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+#sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 make %{?_smp_mflags}
 find . -type d -perm 02755 -exec chmod 0755 '{}' \;
 
-%check
-# FIXME: currently doesn't work at all, all tests fail; need to be
-# discussed with upstream.
-#make check
-
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_docdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/share
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/testcases
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/%{name}
+
+#Remove libtool archives and static libs
+find %{buildroot} -name '*.la' -exec rm -f {} ';'
+find %{buildroot} -name '*.a' -exec rm -f {} ';'
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%check
+#make test
+
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS NEWS README COPYING HACKING
+%doc AUTHORS NEWS README COPYING HACKING LICENSE.LGPL-21 LICENSE.txt
+%{_sysconfdir}/default/syncevolution
 %{_bindir}/*
+%{_libdir}/*so.0*
+%{_libdir}/syncevolution/*so.0*
+%{_libexecdir}/syncevo-dbus-server
+%{_datadir}/dbus-1/services/org.Moblin.SyncEvolution.service
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/syncevo-dbus
+%{_includedir}/synthesis
+%{_libdir}/pkgconfig/syncevo-dbus.pc
+%{_libdir}/pkgconfig/synthesis.pc
+%{_libdir}/*so
+%{_libdir}/syncevolution/*so
 
 %changelog
+* Wed Aug  5 2009 Matěj Cepl <mcepl at redhat.com> - 0.8.1+0.9+beta3+20090723-1.0.1
+- fixing rpath, currently FTBFS!!!
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.1a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 


--- syncevolution-0.8.1a-build.patch DELETED ---


