packages: syncevolution/syncevolution.spec, syncevolution/syncevolution-lin...

[baggins]

Author: baggins                      Date: Thu Oct 21 16:57:12 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- fixed unresolved symbols in lib
- fixed duplicate files listing

---- Files affected:
packages/syncevolution:
   syncevolution.spec (1.18 -> 1.19) , syncevolution-link.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/syncevolution/syncevolution.spec
diff -u packages/syncevolution/syncevolution.spec:1.18 packages/syncevolution/syncevolution.spec:1.19
--- packages/syncevolution/syncevolution.spec:1.18	Fri Oct 15 10:28:40 2010
+++ packages/syncevolution/syncevolution.spec	Thu Oct 21 18:57:07 2010
@@ -4,11 +4,12 @@
 Summary(pl.UTF-8):	Synchronizacja kontaktów i kalendarzy dla Evolution
 Name:		syncevolution
 Version:	1.0.1
-Release:	1
+Release:	2
 License:	GPL v2+ + OpenSSL exception
 Group:		Applications
 Source0:	http://downloads.syncevolution.org/syncevolution/sources/%{name}-%{version}.tar.gz
 # Source0-md5:	e8cc1293ea3b9beea501333fdba8cb7a
+Patch0:		%{name}-link.patch
 URL:		http://www.estamos.de/projects/SyncML/SyncEvolution.html
 BuildRequires:	boost-devel >= 1.34
 BuildRequires:	curl-devel
@@ -76,9 +77,25 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
-%configure  --enable-evolution-compatibility
+%{__libtoolize}
+%{__aclocal} -I m4 -I m4-repo
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd src/synthesis
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../..
+%configure \
+	--enable-shared \
+	--enable-evolution-compatibility
+
 %{__make}
 
 %install
@@ -107,13 +124,16 @@
 %dir %{_datadir}/syncevolution/templates/servers
 %{_datadir}/syncevolution/templates/servers/*
 %dir %{_datadir}/syncevolution/xml
-%dir %{_datadir}/syncevolution/xml/*
+%{_datadir}/syncevolution/xml/*.xml
+%attr(755,root,root) %{_datadir}/syncevolution/xml/*.pl
 %dir %{_datadir}/syncevolution/xml/datatypes
 %{_datadir}/syncevolution/xml/datatypes/*
 %dir %{_datadir}/syncevolution/xml/debug
 %{_datadir}/syncevolution/xml/debug/*
 %dir %{_datadir}/syncevolution/xml/remoterules
-%{_datadir}/syncevolution/xml/remoterules/*
+%{_datadir}/syncevolution/xml/remoterules/*.xml
+%dir %{_datadir}/syncevolution/xml/remoterules/client
+%{_datadir}/syncevolution/xml/remoterules/client/*
 %dir %{_datadir}/syncevolution/xml/remoterules/server
 %{_datadir}/syncevolution/xml/remoterules/server/*
 %dir %{_datadir}/syncevolution/xml/scripting
@@ -147,6 +167,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19  2010/10/21 16:57:07  baggins
+- rel 2
+- fixed unresolved symbols in lib
+- fixed duplicate files listing
+
 Revision 1.18  2010/10/15 08:28:40  tiwek
 md5 update
 

================================================================
Index: packages/syncevolution/syncevolution-link.patch
diff -u /dev/null packages/syncevolution/syncevolution-link.patch:1.1
--- /dev/null	Thu Oct 21 18:57:12 2010
+++ packages/syncevolution/syncevolution-link.patch	Thu Oct 21 18:57:07 2010
@@ -0,0 +1,40 @@
+--- 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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/syncevolution/syncevolution.spec?r1=1.18&r2=1.19&f=u