switch packaging from .yaml to .spec

The .spec file is now the the which gets edited. Besides being more
aligned with current practices in Tizen, this is also potentially more
flexible.

The goal was to mark the COPYING file as %license, as indicated by
rpmlint. But it did not become entirely clear to me how rpmbuild picks
up the doc files in the first place (part of lang-find perhaps?), so
simply adding "%license COPYING" was not enough and led to errors
about that file being a duplicate. Therefore I have left packaging as it
was, without fixing the license file warning.

diff --git a/packaging/Makefile b/packaging/Makefile
deleted file mode 100644 (file)
index c0df2f0..0000000
--- a/packaging/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-PKGNAME = syncevolution
-
-all: ${PKGNAME}.spec
-
-${PKGNAME}.spec: ${PKGNAME}.yaml
-       specify
-
-clean:
-       rm -f ${PKGNAME}.spec
-
-build: ${PKGNAME}.spec
-       cd .. && gbs --verbose build  -A i586 --clean --include-all
-
-quickbuild: ${PKGNAME}.spec
-       cd .. && gbs --verbose build  -A i586 --include-all

diff --git a/packaging/syncevolution.changes b/packaging/syncevolution.changes
index c90b1f3..8ddc095 100644 (file)
--- a/packaging/syncevolution.changes
+++ b/packaging/syncevolution.changes
@@ -1,4 +1,8 @@
-* Tue Jul 09 2013 Patrick Ohly <patrick.ohly@intel.com>
+* Fri Aug 02 2013 Patrick Ohly <patrick.ohly@intel.com> 1.3.99.4
+- switch packaging from .yaml to .spec
+- PBAP: add support for obexd 0.48
+
+* Tue Jul 09 2013 Patrick Ohly <patrick.ohly@intel.com> 1.3.99.4
 - initial packaging
 - autotools: cppunit is optional
 

diff --git a/packaging/syncevolution.spec b/packaging/syncevolution.spec
index 7e55cfb..130f176 100644 (file)
--- a/packaging/syncevolution.spec
+++ b/packaging/syncevolution.spec
@@ -1,19 +1,11 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.22
-# 
-# >> macros
-# << macros
-
 Name:       syncevolution
 Summary:    SyncML Client
 Version:    1.3.99.4
 Release:    1
 Group:      Social & Content/Service
-License:    LGPLv2+
+License:    LGPL-2.1+
 URL:        http://syncevolution.org
 Source0:    %{name}-%{version}.tar.gz
-Source100:  syncevolution.yaml
 Requires:   ca-certificates
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -44,7 +36,7 @@ SyncEvolution, a PIM data synchronization solution.
 
 
 %package synccompare
-Summary:    optional data comparison for SyncEvolution
+Summary:    Optional data comparison tool for SyncEvolution
 Group:      Social & Content/Service
 Requires:   %{name} = %{version}-%{release}
 
@@ -79,7 +71,7 @@ with existing templates.
 
 %package devel
 Summary:    Development files for %{name}
-Group:      Development/Libraries
+Group:      Social & Content/Service
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
@@ -116,18 +108,11 @@ Requires:   %{name} = %{version}-%{release}
 The %{name}-pbap package contains a backend which reads/writes
 contacts via PBAP.
 
-
-
 %prep
 %setup -q -n %{name}-%{version}
 
-# >> setup
-# << setup
-
 %build
-# >> build pre
 ./autogen.sh
-# << build pre
 
 %configure --disable-static \
     'PHONENUMBERS_LIBS=-lphonenumber -lboost_thread' \
@@ -142,19 +127,13 @@ contacts via PBAP.
 
 make %{?jobs:-j%jobs}
 
-# >> build post
-# << build post
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
 
-# >> install post
 rm %{buildroot}/%{_bindir}/synclog2html
 rm %{buildroot}/%{_libdir}/syncevolution/backends/platformgnome.so
 rm %{buildroot}/%{_libdir}/syncevolution/backends/platformkde.so
-# << install post
 %find_lang syncevolution
 
 
@@ -163,28 +142,6 @@ rm %{buildroot}/%{_libdir}/syncevolution/backends/platformkde.so
 
 %postun -p /sbin/ldconfig
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 %files -f syncevolution.lang
 %defattr(-,root,root,-)
 %{_bindir}/syncevolution
@@ -212,31 +169,22 @@ rm %{buildroot}/%{_libdir}/syncevolution/backends/platformkde.so
 %{_datadir}/dbus-1/services/org.syncevolution.service
 %{_datadir}/dbus-1/services/org._01.pim.contacts.service
 %{_sysconfdir}/xdg/autostart/syncevo-dbus-server.desktop
-# >> files
-# << files
 
 
 %files synccompare
 %defattr(-,root,root,-)
 %{_bindir}/synccompare
-# >> files synccompare
-# << files synccompare
 
 %files http-server
 %defattr(-,root,root,-)
 %{_bindir}/syncevo-http-server
-# >> files http-server
-# << files http-server
 
 %files phone-config
 %defattr(-,root,root,-)
 %{_bindir}/syncevo-phone-config
-# >> files phone-config
-# << files phone-config
 
 %files devel
 %defattr(-,root,root,-)
-%doc
 %dir %{_includedir}/synthesis
 %{_includedir}/synthesis/*.h
 %{_includedir}/syncevo/*.h
@@ -246,24 +194,15 @@ rm %{buildroot}/%{_libdir}/syncevolution/backends/platformkde.so
 %{_libdir}/pkgconfig/syncevolution.pc
 %{_libdir}/pkgconfig/synthesis.pc
 %{_libdir}/pkgconfig/synthesis-sdk.pc
-# >> files devel
-# << files devel
 
 %files ebook
 %defattr(-,root,root,-)
 %{_libdir}/syncevolution/backends/syncebook.so
-# >> files ebook
-# << files ebook
 
 %files ecal
 %defattr(-,root,root,-)
 %{_libdir}/syncevolution/backends/syncecal.so
-# >> files ecal
-# << files ecal
 
 %files pbap
 %defattr(-,root,root,-)
 %{_libdir}/syncevolution/backends/syncpbap.so
-# >> files pbap
-# << files pbap
-

diff --git a/packaging/syncevolution.yaml b/packaging/syncevolution.yaml
deleted file mode 100644 (file)
index 8843da3..0000000
--- a/packaging/syncevolution.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-Name: syncevolution
-Summary: SyncML Client
-Version: 1.3.99.4
-Release: 1
-Group: Social & Content/Service
-License: LGPLv2+
-URL: http://syncevolution.org
-Sources:
-    - "%{name}-%{version}.tar.gz"
-Description: |
-    The %{name} package contains the core files required to use
-    SyncEvolution, a PIM data synchronization solution.
-Requires:
-    - ca-certificates
-PkgBR:
-    - boost-devel
-    - expat-devel
-    - intltool
-    - autoconf
-    - automake
-    - libtool
-    - python
-    - libxslt-tools
-    - libphonenumber-devel
-PkgConfigBR:
-    - bluez
-    - dbus-glib-1
-    - gio-2.0
-    - glib-2.0
-    - libpcre
-# TODO: libsoup-gnome-2.4 and proxy settings
-    - libsoup-2.4
-# for PIM D-Bus service:
-    - icu-i18n
-    - folks
-    - folks-eds
-
-Configure: configure
-ConfigOptions:
-# Must add -lboost_thread because -lphonenumber can be used with or without real threading.
-# We pick real thread-safety.
-    - "'PHONENUMBERS_LIBS=-lphonenumber -lboost_thread'"
-    - --enable-dbus-service
-    - --enable-dbus-service-pim
-    - --enable-shared
-    - --with-expat=system
-    - --enable-release-mode
-    - --disable-unit-tests
-    - --disable-integration-tests
-# for libsynthesis
-    - --disable-sqlite
-
-Files:
-    - "%{_bindir}/syncevolution"
-    - "%{_bindir}/syncevo-webdav-lookup"
-    - "%{_libdir}/libsynthesis.so.*"
-    - "%{_libdir}/libsmltk.so.*"
-    - "%{_libdir}/libsyncevolution.so.*"
-    # explicitly list all disabled backends; all enabled
-    # ones must be packaged separately
-    - "%{_libdir}/syncevolution/backends/syncactivesync.so"
-    - "%{_libdir}/syncevolution/backends/syncfile.so"
-    - "%{_libdir}/syncevolution/backends/syncxmlrpc.so"
-    - "%{_libdir}/syncevolution/backends/syncaddressbook.so"
-    - "%{_libdir}/syncevolution/backends/syncsqlite.so"
-    - "%{_libdir}/syncevolution/backends/syncmaemocal.so"
-    - "%{_libdir}/syncevolution/backends/syncakonadi.so"
-    - "%{_libdir}/libgdbussyncevo.*"
-    - "%{_libdir}/syncevolution/backends/syncqtcontacts.so"
-    - "%{_libdir}/syncevolution/backends/synckcalextended.so"
-    - "%{_libdir}/syncevolution/backends/syncdav.so"
-    - "%{_libexecdir}/syncevo-dbus-server"
-    - "%{_libexecdir}/syncevo-dbus-server-startup.sh"
-    - "%{_libexecdir}/syncevo-dbus-helper"
-    - "%{_libexecdir}/syncevo-local-sync"
-    - "%{_datadir}/syncevolution"
-    - "%{_datadir}/doc/syncevolution/*"
-    - "%{_datadir}/dbus-1/services/org.syncevolution.service"
-    - "%{_datadir}/dbus-1/services/org._01.pim.contacts.service"
-    - "%{_sysconfdir}/xdg/autostart/syncevo-dbus-server.desktop"
-
-SubPackages:
-    - Name: synccompare
-      Summary: optional data comparison for SyncEvolution
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-synccompare package contains a perl script used in
-          SyncEvolution command line mode for data comparison. It is optional
-          and not normally called when using a GUI.
-      Files:
-          - "%{_bindir}/synccompare"
-
-    - Name: http-server
-      Summary: SyncEvolution HTTP SyncML server
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-http-server package contains a HTTP SyncML server
-          based on the Python Twisted framework.
-      Files:
-          - "%{_bindir}/syncevo-http-server"
-      Requires:
-          - python-twisted-web
-
-    - Name: phone-config
-      Summary: SyncEvolution phone configuration tool
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-http-server package contains a Python script
-          which determines via trial-and-error the correct parameters
-          for an unknown phone. Not normally needed, most phones work
-          with existing templates.
-      Files:
-          - "%{_bindir}/syncevo-phone-config"
-
-    - Name: devel
-      Summary: Development files for %{name}
-      Group: Development/Libraries
-      Description: |
-          The %{name}-devel package contains libraries and header files for
-          developing applications that use %{name}.
-      Files:
-         - "%doc"
-         - "%dir %{_includedir}/synthesis"
-         - "%{_includedir}/synthesis/*.h"
-         - "%{_includedir}/syncevo/*.h"
-         - "%{_libdir}/libsynthesis.so"
-         - "%{_libdir}/libsmltk.so"
-         - "%{_libdir}/libsyncevolution.so"
-         - "%{_libdir}/pkgconfig/syncevolution.pc"
-         - "%{_libdir}/pkgconfig/synthesis.pc"
-         - "%{_libdir}/pkgconfig/synthesis-sdk.pc"
-
-    - Name: ebook
-      Summary: SyncEvolution backend for EDS contacts
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-ebook package contains a backend which reads/writes
-          contacts in EDS.
-      Files:
-         - "%{_libdir}/syncevolution/backends/syncebook.so"
-
-    - Name: ecal
-      Summary: SyncEvolution backend for EDS events/tasks/memos
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-ecal package contains a backend which reads/writes
-          contacts in EDS.
-      Files:
-         - "%{_libdir}/syncevolution/backends/syncecal.so"
-
-    - Name: pbap
-      Summary: SyncEvolution backend for contact caching via PBAP
-      Group: Social & Content/Service
-      Description: |
-          The %{name}-pbap package contains a backend which reads/writes
-          contacts via PBAP.
-      Files:
-         - "%{_libdir}/syncevolution/backends/syncpbap.so"