Hello community, here is the log from the commit of package ckermit for openSUSE:Factory checked in at 2014-02-12 20:28:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ckermit (Old) and /work/SRC/openSUSE:Factory/.ckermit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ckermit" Changes: -------- --- /work/SRC/openSUSE:Factory/ckermit/ckermit.changes 2012-10-11 10:41:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ckermit.new/ckermit.changes 2014-02-12 20:28:20.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 12 10:37:57 UTC 2014 - [email protected] + +- decl-definition-conflict.patch: Fix conflicting declarations + +------------------------------------------------------------------- New: ---- decl-definition-conflict.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ckermit.spec ++++++ --- /var/tmp/diff_new_pack.pIBQg6/_old 2014-02-12 20:28:21.000000000 +0100 +++ /var/tmp/diff_new_pack.pIBQg6/_new 2014-02-12 20:28:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ckermit # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,6 +35,7 @@ Release: 0.0 Url: http://www.kermitproject.org/ Source: cku302.tar.bz2 +Patch: decl-definition-conflict.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -55,6 +56,7 @@ %prep %setup -q -c +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" ++++++ decl-definition-conflict.patch ++++++ Index: ckermit-9.0.302/ckcpro.c =================================================================== --- ckermit-9.0.302.orig/ckcpro.c +++ ckermit-9.0.302/ckcpro.c @@ -173,7 +173,9 @@ _PROTOTYP( int cmdsrc, (void) ); extern int wslots, success, xitsta, rprintf, discard, cdtimo, keep, fdispla; extern int timef, stdinf, rscapu, sendmode, epktflg, epktrcvd, epktsent; extern int binary, fncnv; - extern long speed, ffc, crc16, calibrate, dest; + extern long speed, crc16; + extern CK_OFF_T ffc, calibrate; + extern int dest; #ifdef COMMENT extern char *TYPCMD, *DIRCMD, *DIRCM2; #endif /* COMMENT */ Index: ckermit-9.0.302/ckcpro.w =================================================================== --- ckermit-9.0.302.orig/ckcpro.w +++ ckermit-9.0.302/ckcpro.w @@ -152,7 +152,9 @@ _PROTOTYP( int cmdsrc, (void) ); extern int wslots, success, xitsta, rprintf, discard, cdtimo, keep, fdispla; extern int timef, stdinf, rscapu, sendmode, epktflg, epktrcvd, epktsent; extern int binary, fncnv; - extern long speed, ffc, crc16, calibrate, dest; + extern long speed, crc16; + extern CK_OFF_T ffc, calibrate; + extern int dest; #ifdef COMMENT extern char *TYPCMD, *DIRCMD, *DIRCM2; #endif /* COMMENT */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
