commit 0a419797318bcad2fb479cde19399ab10e02944b
Author: Artur Frysiak <[email protected]>
Date: Mon Sep 24 19:36:44 2012 +0200
Start update to 1.3
- new URL
- link.patch obsoleted
- more verbose file list
syncevolution-link.patch | 40 --------------------------
syncevolution.spec | 73 ++++++++++++++++++++++++++++++++++--------------
2 files changed, 52 insertions(+), 61 deletions(-)
---
diff --git a/syncevolution.spec b/syncevolution.spec
index 1bd17fc..ea623d8 100644
--- a/syncevolution.spec
+++ b/syncevolution.spec
@@ -2,24 +2,24 @@
Summary: Synchronization for contacts and calendars for Evolution
Summary(pl.UTF-8): Synchronizacja kontaktów i kalendarzy dla Evolution
Name: syncevolution
-Version: 1.1.1
-Release: 5
+Version: 1.3
+Release: 0.1
License: GPL v2+ + OpenSSL exception
Group: Applications
-Source0:
http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}a.tar.gz
-# Source0-md5: 78f73c51e5f16283eb5cf3ed306ccb1f
-Patch0: %{name}-link.patch
-URL: http://www.estamos.de/projects/SyncML/SyncEvolution.html
+Source0:
http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
+# Source0-md5: db25bf5b95ce2125cbde17344377203f
+URL: https://syncevolution.org/
BuildRequires: boost-devel >= 1.34
BuildRequires: curl-devel
BuildRequires: docutils
BuildRequires: evolution-data-server-devel
#BuildRequires: funambol-devel - currently uses bundled copy
BuildRequires: glib2-devel
-BuildRequires: libsoup-gnome-devel
BuildRequires: libgdata-devel
BuildRequires: libproxy-devel
+BuildRequires: libsoup-gnome-devel
BuildRequires: libstdc++-devel
+BuildRequires: pcre-cxx-devel
BuildRequires: pkgconfig
BuildRequires: sqlite3-devel
Requires: %{name}-libs = %{version}-%{release}
@@ -76,8 +76,7 @@ Header files for Syncevolution libraries
Pliki nagłówkowe bibliotek Syncevolution.
%prep
-%setup -q
-%patch0 -p1
+%setup -q
%build
%{__libtoolize}
@@ -87,7 +86,7 @@ Pliki nagłówkowe bibliotek Syncevolution.
%{__automake}
cd src/synthesis
%{__libtoolize}
-%{__aclocal} -I m4
+%{__aclocal} -I m4 -I ../../m4-repo
%{__autoconf}
%{__autoheader}
%{__automake}
@@ -104,9 +103,10 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/syncevolution/backends/*.la
-rm -f $RPM_BUILD_ROOT%{_datadir}/syncevolution/templates/README
-rm -rf $RPM_BUILD_ROOT%{_docdir}/syncevolution
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/syncevolution/backends/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/syncevolution/templates/README
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/syncevolution
%post -p /sbin/ldconfig
@@ -121,6 +121,8 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_datadir}/syncevolution/templates
%dir %{_datadir}/syncevolution/templates/clients
%{_datadir}/syncevolution/templates/clients/*
+%dir %{_datadir}/syncevolution/templates/contexts
+%{_datadir}/syncevolution/templates/contexts/*
%dir %{_datadir}/syncevolution/templates/servers
%{_datadir}/syncevolution/templates/servers/*
%dir %{_datadir}/syncevolution/xml
@@ -141,23 +143,52 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/synccompare
%attr(755,root,root) %{_bindir}/syncevolution
%attr(755,root,root) %{_bindir}/syncevo-phone-config
+%attr(755,root,root) %{_bindir}/synclog2html
+%attr(755,root,root) %{_libdir}/syncevo-local-sync
%{_mandir}/man1/*.1*
%files libs
%defattr(644,root,root,755)
-%attr(755,root,root) %ghost %{_libdir}/lib*.so.0
-%attr(755,root,root) %{_libdir}/lib*.so.0.*
+%attr(755,root,root) %ghost %{_libdir}/libgdbussyncevo.so.0
+%attr(755,root,root) %ghost %{_libdir}/libsmltk.so.0
+%attr(755,root,root) %ghost %{_libdir}/libsyncevolution.so.0
+%attr(755,root,root) %ghost %{_libdir}/libsynthesis.so.0
+%attr(755,root,root) %{_libdir}/libgdbussyncevo.so.0.*
+%attr(755,root,root) %{_libdir}/libsmltk.so.0.*
+%attr(755,root,root) %{_libdir}/libsyncevolution.so.0.*
+%attr(755,root,root) %{_libdir}/libsynthesis.so.0.*
%dir %{_libdir}/syncevolution
%dir %{_libdir}/syncevolution/backends
-%attr(755,root,root) %{_libdir}/syncevolution/backends/*.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/platformgnome.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/platformkde.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncactivesync.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncaddressbook.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncakonadi.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncdav.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncebook.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncecal.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncfile.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/synckcalextended.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncmaemocal.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncqtcontacts.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncsqlite.so
+%attr(755,root,root) %{_libdir}/syncevolution/backends/syncxmlrpc.so
%files devel
%defattr(644,root,root,755)
-%{_libdir}/lib*.la
-%{_libdir}/lib*.so
-%{_includedir}/*
-%{_pkgconfigdir}/*
+%{_libdir}/libgdbussyncevo.so
+%{_libdir}/libsmltk.so
+%{_libdir}/libsyncevolution.so
+%{_libdir}/libsynthesis.so
+%{_includedir}/syncevo
+%{_includedir}/synthesis
+%{_pkgconfigdir}/syncevolution.pc
+%{_pkgconfigdir}/synthesis-sdk.pc
+%{_pkgconfigdir}/synthesis.pc
%files static
%defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libgdbussyncevo.a
+%{_libdir}/libsmltk.a
+%{_libdir}/libsyncevolution.a
+%{_libdir}/libsynthesis.a
diff --git a/syncevolution-link.patch b/syncevolution-link.patch
deleted file mode 100644
index 858d131..0000000
--- a/syncevolution-link.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- syncevolution-1.0.1/src/synthesis/src/Makefile.am~ 2010-07-16
22:13:33.000000000 +0200
-+++ syncevolution-1.0.1/src/synthesis/src/Makefile.am 2010-10-21
14:26:44.252436380 +0200
-@@ -77,8 +77,8 @@
- $(LIBICAL_CFLAGS) \
- $(LIBECAL_CFLAGS)
- libsynthesis_la_CXXFLAGS = $(libsynthesis_la_CFLAGS)
--libsynthesis_la_LIBADD = $(PCRE_LIBS) $(SQLITE3_LIBS) $(XMLPARSE_LIBS)
$(LIBICAL_LIBS) $(LIBECAL_LIBS) libsmltk.la -lz
--libsynthesis_la_LDFLAGS = -version-info
$(ENGINE_CURRENT):$(ENGINE_REVISION):$(ENGINE_AGE) \
-+libsynthesis_la_LIBADD = $(PCRE_LIBS) $(SQLITE3_LIBS) $(XMLPARSE_LIBS)
$(LIBICAL_LIBS) $(LIBECAL_LIBS) libsmltk.la -lz -ldl
-+libsynthesis_la_LDFLAGS = -pthread -version-info
$(ENGINE_CURRENT):$(ENGINE_REVISION):$(ENGINE_AGE) \
- -Wl,--version-script=$(srcdir)/synthesis-linker.map
- libsynthesis_la_DEPENDENCIES = $(srcdir)/synthesis-linker.map libsmltk.la
-
-@@ -180,4 +180,4 @@
- if COND_DOXYGEN
- all: doxygen
- clean-local: clean-doxygen
--endif
-\ No newline at end of file
-+endif
---- syncevolution-1.0.1/src/synthesis/src/Makefile.am.in~ 2010-06-17
14:17:44.000000000 +0200
-+++ syncevolution-1.0.1/src/synthesis/src/Makefile.am.in 2010-10-21
14:27:16.069436380 +0200
-@@ -77,8 +77,8 @@
- $(LIBICAL_CFLAGS) \
- $(LIBECAL_CFLAGS)
- libsynthesis_la_CXXFLAGS = $(libsynthesis_la_CFLAGS)
--libsynthesis_la_LIBADD = $(PCRE_LIBS) $(SQLITE3_LIBS) $(XMLPARSE_LIBS)
$(LIBICAL_LIBS) $(LIBECAL_LIBS) libsmltk.la -lz
--libsynthesis_la_LDFLAGS = -version-info
$(ENGINE_CURRENT):$(ENGINE_REVISION):$(ENGINE_AGE) \
-+libsynthesis_la_LIBADD = $(PCRE_LIBS) $(SQLITE3_LIBS) $(XMLPARSE_LIBS)
$(LIBICAL_LIBS) $(LIBECAL_LIBS) libsmltk.la -lz -ldl
-+libsynthesis_la_LDFLAGS = -pthread -version-info
$(ENGINE_CURRENT):$(ENGINE_REVISION):$(ENGINE_AGE) \
- -Wl,--version-script=$(srcdir)/synthesis-linker.map
- libsynthesis_la_DEPENDENCIES = $(srcdir)/synthesis-linker.map libsmltk.la
-
-@@ -180,4 +180,4 @@
- if COND_DOXYGEN
- all: doxygen
- clean-local: clean-doxygen
--endif
-\ No newline at end of file
-+endif
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/syncevolution.git/commitdiff/0a419797318bcad2fb479cde19399ab10e02944b
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
