[packages/synce-vdccm] - added errors patch (disable -pedantic-errors since used C++ standard has no long long type) - verb

qboosh qboosh at pld-linux.org
Sun Feb 1 18:55:04 CET 2015


commit 5581504686fb46a24e580b904926c380c80344d1
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Feb 1 18:57:10 2015 +0100

    - added errors patch (disable -pedantic-errors since used C++ standard has no long long type)
    - verbose files, added deprecation note

 synce-vdccm-errors.patch | 11 +++++++++++
 synce-vdccm.spec         | 37 ++++++++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 9 deletions(-)
---
diff --git a/synce-vdccm.spec b/synce-vdccm.spec
index 44ee9b3..da1d5da 100644
--- a/synce-vdccm.spec
+++ b/synce-vdccm.spec
@@ -1,9 +1,10 @@
+# NOTE: deprecated in favour of generic dccm support in synce-core
 # TODO:
 # - remove in favor of synce-core?
 # - update init script
-# - fix Group (Applications/Networking, Applications/System?)
 #
-%bcond_with	hal	# build without HAL support
+# Conditional build:
+%bcond_with	hal	# HAL support
 
 Summary:	Serial connection daemon for Pocket PC devices
 Summary(pl.UTF-8):	Demon połączenia szeregowego dla urządzeń Pocket PC
@@ -11,7 +12,7 @@ Name:		synce-vdccm
 Version:	0.10.1
 Release:	2
 License:	MIT
-Group:		Libraries
+Group:		Applications/Networking
 Source0:	http://dl.sourceforge.net/synce/vdccm-%{version}.tar.gz
 # Source0-md5:	43bca4c2fdb658f99b07549fa03832e0
 Patch0:		%{name}-dont-chown.patch
@@ -19,13 +20,24 @@ Patch1:		%{name}-includes.patch
 Patch2:		%{name}-uint16_t.patch
 Patch3:		gcc.patch
 Patch4:		%{name}-gcc47.patch
+Patch5:		%{name}-errors.patch
 URL:		http://synce.sourceforge.net/
-%{?with_hal:BuildRequires:	dbus-glib-devel >= 0.61}
-BuildRequires:	glib2-devel >= 1:2.4
-%{?with_hal:BuildRequires:	hal-devel}
+BuildRequires:	autoconf >= 2.59
+BuildRequires:	automake
 BuildRequires:	libstdc++-devel
+BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	synce-libsynce-devel >= %{version}
+%if %{with hal}
+BuildRequires:	dbus-devel >= 0.61
+BuildRequires:	dbus-glib-devel >= 0.61
+BuildRequires:	glib2-devel >= 1:2.4
+BuildRequires:	hal-devel
+Requires:	dbus >= 0.61
+Requires:	dbus-glib >= 0.61
+Requires:	glib2 >= 1:2.4
+%endif
+Requires:	synce-libsynce >= %{version}
 Conflicts:	synce-kde < 0.9.1-4
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -46,10 +58,15 @@ vdccm dołączanego do SynCE-KDE.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
-	--with-libsynce=%{_prefix} \
 	%{?with_hal:--enable-desktop-integration}
 
 %{__make}
@@ -65,5 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog NEWS README TODO
-%attr(755,root,root) %{_bindir}/*
-%{_mandir}/man1/*
+%attr(755,root,root) %{_bindir}/triggerconnection
+%attr(755,root,root) %{_bindir}/vdccm
+%{_mandir}/man1/triggerconnection.1*
+%{_mandir}/man1/vdccm.1*
diff --git a/synce-vdccm-errors.patch b/synce-vdccm-errors.patch
new file mode 100644
index 0000000..ebbc6ee
--- /dev/null
+++ b/synce-vdccm-errors.patch
@@ -0,0 +1,11 @@
+--- vdccm-0.10.1/src/Makefile.am.orig	2015-02-01 16:27:05.073196454 +0100
++++ vdccm-0.10.1/src/Makefile.am	2015-02-01 17:35:08.719691747 +0100
+@@ -36,7 +36,7 @@
+ endif
+ 
+ AM_CFLAGS = -Wall
+-AM_CXXFLAGS = -pedantic-errors -Wall
++AM_CXXFLAGS = -Wall
+ 
+ install-exec-hook:
+ 	chown root $(DESTDIR)$(bindir)/vdccm || :
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/synce-vdccm.git/commitdiff/5581504686fb46a24e580b904926c380c80344d1



More information about the pld-cvs-commit mailing list