March 2013 - openSUSE Commits - openSUSE Mailing Lists

commit libstorage for openSUSE:12.3
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libstorage for openSUSE:12.3 checked in at 2013-03-01 07:25:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/libstorage (Old) and /work/SRC/openSUSE:12.3/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/libstorage/libstorage.changes 2013-02-22 16:53:56.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.libstorage.new/libstorage.changes 2013-03-01 07:25:46.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 27 18:19:47 CET 2013 - fehr(a)suse.de + +- version 2.23.8 +- fix handling of inactive raid devices (bnc#798275) + +------------------------------------------------------------------- @@ -13 +19 @@ - /dev/mapper/<dm> + /dev/mapper/<dm> (bnc#805169) Old: ---- libstorage-2.23.7.tar.bz2 New: ---- libstorage-2.23.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.XV5svc/_old 2013-03-01 07:25:46.000000000 +0100 +++ /var/tmp/diff_new_pack.XV5svc/_new 2013-03-01 07:25:46.000000000 +0100 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.23.7 +Version: 2.23.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.23.7.tar.bz2 -> libstorage-2.23.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/VERSION new/libstorage-2.23.8/VERSION --- old/libstorage-2.23.7/VERSION 2013-02-21 16:25:43.000000000 +0100 +++ new/libstorage-2.23.8/VERSION 2013-02-28 15:36:33.000000000 +0100 @@ -1 +1 @@ -2.23.7 +2.23.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/bindings/python/libstorage.py new/libstorage-2.23.8/bindings/python/libstorage.py --- old/libstorage-2.23.7/bindings/python/libstorage.py 2013-02-21 19:20:06.000000000 +0100 +++ new/libstorage-2.23.8/bindings/python/libstorage.py 2013-02-28 15:44:59.000000000 +0100 @@ -856,6 +856,9 @@ __swig_setmethods__["spares"] = _libstorage.MdInfo_spares_set __swig_getmethods__["spares"] = _libstorage.MdInfo_spares_get if _newclass:spares = _swig_property(_libstorage.MdInfo_spares_get, _libstorage.MdInfo_spares_set) + __swig_setmethods__["inactive"] = _libstorage.MdInfo_inactive_set + __swig_getmethods__["inactive"] = _libstorage.MdInfo_inactive_get + if _newclass:inactive = _swig_property(_libstorage.MdInfo_inactive_get, _libstorage.MdInfo_inactive_set) __swig_destroy__ = _libstorage.delete_MdInfo __del__ = lambda self : None; MdInfo_swigregister = _libstorage.MdInfo_swigregister diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.cc new/libstorage-2.23.8/storage/Md.cc --- old/libstorage-2.23.7/storage/Md.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.cc 2013-02-27 18:26:33.000000000 +0100 @@ -43,7 +43,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, MdType Type, const list<string>& devices, const list<string>& spares) : Volume(c, name, device), md_type(Type), md_parity(PAR_DEFAULT), chunk_k(0), - sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false) + sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false), inactive(false) { y2deb("constructed Md " << dev << " on " << cont->device()); @@ -61,7 +61,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, SystemInfo& systeminfo) : Volume(c, name, device, systeminfo), md_type(RAID_UNK), md_parity(PAR_DEFAULT), - chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false) + chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false), inactive(false) { y2deb("constructed Md " << device << " on " << cont->device()); @@ -86,6 +86,8 @@ devs = entry.devices; spare = entry.spares; + inactive = entry.inactive; + if (entry.readonly) setReadonly(); @@ -130,7 +132,8 @@ chunk_k(v.chunk_k), md_uuid(v.md_uuid), md_name(v.md_name), sb_ver(v.sb_ver), destrSb(v.destrSb), devs(v.devs), spare(v.spare), udev_id(udev_id), - has_container(v.has_container), parent_container(v.parent_container), + has_container(v.has_container), inactive(v.inactive), + parent_container(v.parent_container), parent_uuid(v.parent_uuid), parent_md_name(v.parent_md_name), parent_metadata(v.parent_metadata), parent_member(v.parent_member) { @@ -543,6 +546,7 @@ info.sb_ver = sb_ver; info.chunkSizeK = chunk_k; info.parity = md_parity; + info.inactive = inactive; info.devices = boost::join(devs, " "); info.spares = boost::join(spare, " "); @@ -561,6 +565,8 @@ s << " Parity:" << toString(m.md_parity); if( !m.sb_ver.empty() ) s << " SbVer:" << m.sb_ver; + if (m.inactive) + s << " inactive"; if (!m.md_uuid.empty()) s << " md_uuid:" << m.md_uuid; if (!m.md_name.empty()) @@ -579,7 +585,8 @@ return( Volume::equalContent(rhs) && md_type==rhs.md_type && md_parity==rhs.md_parity && chunk_k==rhs.chunk_k && md_uuid==rhs.md_uuid && sb_ver==rhs.sb_ver && - destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare ); + destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare && + inactive==rhs.inactive ); } @@ -592,6 +599,7 @@ logDiffEnum(log, "md_parity", md_parity, rhs.md_parity); logDiff(log, "chunk_k", chunk_k, rhs.chunk_k); logDiff(log, "sb_ver", sb_ver, rhs.sb_ver); + logDiff(log, "inactive", inactive, rhs.inactive); logDiff(log, "md_uuid", md_uuid, rhs.md_uuid); logDiff(log, "md_name", md_name, rhs.md_name); logDiff(log, "destrSb", destrSb, rhs.destrSb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.h new/libstorage-2.23.8/storage/Md.h --- old/libstorage-2.23.7/storage/Md.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.h 2013-02-27 18:26:33.000000000 +0100 @@ -109,6 +109,7 @@ // In case of IMSM and DDF raids there is 'container'. bool has_container; + bool inactive; string parent_container; string parent_uuid; string parent_md_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.cc new/libstorage-2.23.8/storage/ProcMdstat.cc --- old/libstorage-2.23.7/storage/ProcMdstat.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.cc 2013-02-27 18:26:33.000000000 +0100 @@ -82,6 +82,7 @@ if( tmp=="(read-only)" || tmp=="(auto-read-only)" || tmp=="inactive" ) { entry.readonly = true; + entry.inactive = tmp=="inactive"; line.erase( 0, pos ); boost::trim_left(line, locale::classic()); } @@ -106,7 +107,7 @@ if( (pos=line.find_first_not_of( app_ws ))!=string::npos && pos!=0 ) line.erase( 0, pos ); } - else + else if( !entry.inactive ) { entry.is_container = true; } @@ -276,6 +277,9 @@ if (entry.readonly) s << " readonly"; + if (entry.inactive) + s << " inactive"; + s << " devices:" << entry.devices; if (!entry.spares.empty()) s << " spares:" << entry.spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.h new/libstorage-2.23.8/storage/ProcMdstat.h --- old/libstorage-2.23.7/storage/ProcMdstat.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.h 2013-02-27 18:26:33.000000000 +0100 @@ -36,7 +36,7 @@ struct Entry { Entry() : md_type(RAID_UNK), md_parity(PAR_DEFAULT), size_k(0), chunk_k(0), - readonly(false), is_container(false), has_container(false) {} + readonly(false), inactive(false), is_container(false), has_container(false) {} MdType md_type; MdParity md_parity; @@ -47,6 +47,7 @@ unsigned long chunk_k; bool readonly; + bool inactive; list<string> devices; list<string> spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/StorageInterface.h new/libstorage-2.23.8/storage/StorageInterface.h --- old/libstorage-2.23.7/storage/StorageInterface.h 2013-02-15 10:16:33.000000000 +0100 +++ new/libstorage-2.23.8/storage/StorageInterface.h 2013-02-27 18:26:33.000000000 +0100 @@ -479,6 +479,7 @@ unsigned long chunkSizeK; string devices; string spares; + bool inactive; }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/gen_md5sum.cc new/libstorage-2.23.8/storage/gen_md5sum.cc --- old/libstorage-2.23.7/storage/gen_md5sum.cc 2013-02-21 19:17:13.000000000 +0100 +++ new/libstorage-2.23.8/storage/gen_md5sum.cc 2013-02-27 18:32:07.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "66906e7171bb8538b582a4361d69826e" -#define SOURCES_MD5_DATE " Thu Feb 21 19:17:13 CET 2013 " +#define SOURCES_MD5SUM "34042be9aa2311c3032b075cfe2fb472" +#define SOURCES_MD5_DATE " Wed Feb 27 18:32:07 CET 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libstorage for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libstorage for openSUSE:Factory checked in at 2013-03-01 07:25:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libstorage (Old) and /work/SRC/openSUSE:Factory/.libstorage.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libstorage", Maintainer is "ASchnell(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libstorage/libstorage.changes 2013-02-22 16:53:53.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libstorage.new/libstorage.changes 2013-03-01 07:25:43.000000000 +0100 @@ -1,0 +2,6 @@ +Wed Feb 27 18:19:47 CET 2013 - fehr(a)suse.de + +- version 2.23.8 +- fix handling of inactive raid devices (bnc#798275) + +------------------------------------------------------------------- @@ -13 +19 @@ - /dev/mapper/<dm> + /dev/mapper/<dm> (bnc#805169) Old: ---- libstorage-2.23.7.tar.bz2 New: ---- libstorage-2.23.8.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libstorage.spec ++++++ --- /var/tmp/diff_new_pack.qs5nFl/_old 2013-03-01 07:25:44.000000000 +0100 +++ /var/tmp/diff_new_pack.qs5nFl/_new 2013-03-01 07:25:44.000000000 +0100 @@ -17,7 +17,7 @@ Name: libstorage -Version: 2.23.7 +Version: 2.23.8 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: libstorage-%{version}.tar.bz2 ++++++ libstorage-2.23.7.tar.bz2 -> libstorage-2.23.8.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/VERSION new/libstorage-2.23.8/VERSION --- old/libstorage-2.23.7/VERSION 2013-02-21 16:25:43.000000000 +0100 +++ new/libstorage-2.23.8/VERSION 2013-02-28 15:36:33.000000000 +0100 @@ -1 +1 @@ -2.23.7 +2.23.8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/bindings/python/libstorage.py new/libstorage-2.23.8/bindings/python/libstorage.py --- old/libstorage-2.23.7/bindings/python/libstorage.py 2013-02-21 19:20:06.000000000 +0100 +++ new/libstorage-2.23.8/bindings/python/libstorage.py 2013-02-28 15:44:59.000000000 +0100 @@ -856,6 +856,9 @@ __swig_setmethods__["spares"] = _libstorage.MdInfo_spares_set __swig_getmethods__["spares"] = _libstorage.MdInfo_spares_get if _newclass:spares = _swig_property(_libstorage.MdInfo_spares_get, _libstorage.MdInfo_spares_set) + __swig_setmethods__["inactive"] = _libstorage.MdInfo_inactive_set + __swig_getmethods__["inactive"] = _libstorage.MdInfo_inactive_get + if _newclass:inactive = _swig_property(_libstorage.MdInfo_inactive_get, _libstorage.MdInfo_inactive_set) __swig_destroy__ = _libstorage.delete_MdInfo __del__ = lambda self : None; MdInfo_swigregister = _libstorage.MdInfo_swigregister diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.cc new/libstorage-2.23.8/storage/Md.cc --- old/libstorage-2.23.7/storage/Md.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.cc 2013-02-27 18:26:33.000000000 +0100 @@ -43,7 +43,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, MdType Type, const list<string>& devices, const list<string>& spares) : Volume(c, name, device), md_type(Type), md_parity(PAR_DEFAULT), chunk_k(0), - sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false) + sb_ver("01.00.00"), destrSb(false), devs(devices), spare(spares), has_container(false), inactive(false) { y2deb("constructed Md " << dev << " on " << cont->device()); @@ -61,7 +61,7 @@ Md::Md(const MdCo& c, const string& name, const string& device, SystemInfo& systeminfo) : Volume(c, name, device, systeminfo), md_type(RAID_UNK), md_parity(PAR_DEFAULT), - chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false) + chunk_k(0), sb_ver("01.00.00"), destrSb(false), has_container(false), inactive(false) { y2deb("constructed Md " << device << " on " << cont->device()); @@ -86,6 +86,8 @@ devs = entry.devices; spare = entry.spares; + inactive = entry.inactive; + if (entry.readonly) setReadonly(); @@ -130,7 +132,8 @@ chunk_k(v.chunk_k), md_uuid(v.md_uuid), md_name(v.md_name), sb_ver(v.sb_ver), destrSb(v.destrSb), devs(v.devs), spare(v.spare), udev_id(udev_id), - has_container(v.has_container), parent_container(v.parent_container), + has_container(v.has_container), inactive(v.inactive), + parent_container(v.parent_container), parent_uuid(v.parent_uuid), parent_md_name(v.parent_md_name), parent_metadata(v.parent_metadata), parent_member(v.parent_member) { @@ -543,6 +546,7 @@ info.sb_ver = sb_ver; info.chunkSizeK = chunk_k; info.parity = md_parity; + info.inactive = inactive; info.devices = boost::join(devs, " "); info.spares = boost::join(spare, " "); @@ -561,6 +565,8 @@ s << " Parity:" << toString(m.md_parity); if( !m.sb_ver.empty() ) s << " SbVer:" << m.sb_ver; + if (m.inactive) + s << " inactive"; if (!m.md_uuid.empty()) s << " md_uuid:" << m.md_uuid; if (!m.md_name.empty()) @@ -579,7 +585,8 @@ return( Volume::equalContent(rhs) && md_type==rhs.md_type && md_parity==rhs.md_parity && chunk_k==rhs.chunk_k && md_uuid==rhs.md_uuid && sb_ver==rhs.sb_ver && - destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare ); + destrSb==rhs.destrSb && devs == rhs.devs && spare==rhs.spare && + inactive==rhs.inactive ); } @@ -592,6 +599,7 @@ logDiffEnum(log, "md_parity", md_parity, rhs.md_parity); logDiff(log, "chunk_k", chunk_k, rhs.chunk_k); logDiff(log, "sb_ver", sb_ver, rhs.sb_ver); + logDiff(log, "inactive", inactive, rhs.inactive); logDiff(log, "md_uuid", md_uuid, rhs.md_uuid); logDiff(log, "md_name", md_name, rhs.md_name); logDiff(log, "destrSb", destrSb, rhs.destrSb); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/Md.h new/libstorage-2.23.8/storage/Md.h --- old/libstorage-2.23.7/storage/Md.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/Md.h 2013-02-27 18:26:33.000000000 +0100 @@ -109,6 +109,7 @@ // In case of IMSM and DDF raids there is 'container'. bool has_container; + bool inactive; string parent_container; string parent_uuid; string parent_md_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.cc new/libstorage-2.23.8/storage/ProcMdstat.cc --- old/libstorage-2.23.7/storage/ProcMdstat.cc 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.cc 2013-02-27 18:26:33.000000000 +0100 @@ -82,6 +82,7 @@ if( tmp=="(read-only)" || tmp=="(auto-read-only)" || tmp=="inactive" ) { entry.readonly = true; + entry.inactive = tmp=="inactive"; line.erase( 0, pos ); boost::trim_left(line, locale::classic()); } @@ -106,7 +107,7 @@ if( (pos=line.find_first_not_of( app_ws ))!=string::npos && pos!=0 ) line.erase( 0, pos ); } - else + else if( !entry.inactive ) { entry.is_container = true; } @@ -276,6 +277,9 @@ if (entry.readonly) s << " readonly"; + if (entry.inactive) + s << " inactive"; + s << " devices:" << entry.devices; if (!entry.spares.empty()) s << " spares:" << entry.spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/ProcMdstat.h new/libstorage-2.23.8/storage/ProcMdstat.h --- old/libstorage-2.23.7/storage/ProcMdstat.h 2013-01-22 11:28:07.000000000 +0100 +++ new/libstorage-2.23.8/storage/ProcMdstat.h 2013-02-27 18:26:33.000000000 +0100 @@ -36,7 +36,7 @@ struct Entry { Entry() : md_type(RAID_UNK), md_parity(PAR_DEFAULT), size_k(0), chunk_k(0), - readonly(false), is_container(false), has_container(false) {} + readonly(false), inactive(false), is_container(false), has_container(false) {} MdType md_type; MdParity md_parity; @@ -47,6 +47,7 @@ unsigned long chunk_k; bool readonly; + bool inactive; list<string> devices; list<string> spares; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/StorageInterface.h new/libstorage-2.23.8/storage/StorageInterface.h --- old/libstorage-2.23.7/storage/StorageInterface.h 2013-02-15 10:16:33.000000000 +0100 +++ new/libstorage-2.23.8/storage/StorageInterface.h 2013-02-27 18:26:33.000000000 +0100 @@ -479,6 +479,7 @@ unsigned long chunkSizeK; string devices; string spares; + bool inactive; }; /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libstorage-2.23.7/storage/gen_md5sum.cc new/libstorage-2.23.8/storage/gen_md5sum.cc --- old/libstorage-2.23.7/storage/gen_md5sum.cc 2013-02-21 19:17:13.000000000 +0100 +++ new/libstorage-2.23.8/storage/gen_md5sum.cc 2013-02-27 18:32:07.000000000 +0100 @@ -1,5 +1,5 @@ -#define SOURCES_MD5SUM "66906e7171bb8538b582a4361d69826e" -#define SOURCES_MD5_DATE " Thu Feb 21 19:17:13 CET 2013 " +#define SOURCES_MD5SUM "34042be9aa2311c3032b075cfe2fb472" +#define SOURCES_MD5_DATE " Wed Feb 27 18:32:07 CET 2013 " namespace storage { const char* GetSourceMd5() { return SOURCES_MD5SUM; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmemcache for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libmemcache for openSUSE:Factory checked in at 2013-03-01 07:25:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmemcache (Old) and /work/SRC/openSUSE:Factory/.libmemcache.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmemcache", Maintainer is "MRueckert(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libmemcache/libmemcache.changes 2012-02-16 10:06:00.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libmemcache.new/libmemcache.changes 2013-03-01 07:25:32.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 06:04:53 UTC 2013 - coolo(a)suse.com + +- update license to new format + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmemcache.spec ++++++ --- /var/tmp/diff_new_pack.bqNq0M/_old 2013-03-01 07:25:32.000000000 +0100 +++ /var/tmp/diff_new_pack.bqNq0M/_new 2013-03-01 07:25:32.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libmemcache # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -30,7 +30,7 @@ Patch2: libmemcache-1.4.0.rc2_preserve_cflags.patch # Summary: A client library for memcached -License: BSD-3-Clause ; MIT +License: BSD-3-Clause and MIT Group: Development/Libraries/C and C++ BuildRequires: libtool -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libksane for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libksane for openSUSE:Factory checked in at 2013-03-01 07:25:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksane (Old) and /work/SRC/openSUSE:Factory/.libksane.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libksane", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libksane/libksane.changes 2013-02-04 20:52:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libksane.new/libksane.changes 2013-03-01 07:25:22.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 14:56:59 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Drop all unneeded BuildRequires +- Utilize includedir macro from kde4-filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksane.spec ++++++ --- /var/tmp/diff_new_pack.NX0Rz0/_old 2013-03-01 07:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.NX0Rz0/_new 2013-03-01 07:25:22.000000000 +0100 @@ -17,20 +17,8 @@ Name: libksane -BuildRequires: chmlib-devel -BuildRequires: fribidi-devel -BuildRequires: libdjvulibre-devel -BuildRequires: libepub-devel -BuildRequires: libexiv2-devel -BuildRequires: libgphoto2-devel BuildRequires: libkde4-devel -BuildRequires: libpoppler-qt4-devel -BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel -BuildRequires: libspectre-devel BuildRequires: oxygen-icon-theme-large -BuildRequires: texlive-devel -BuildRequires: texlive-latex BuildRequires: xz %if 0%{?suse_version} > 1130 BuildRequires: sane-backends-devel @@ -105,7 +93,7 @@ %files devel %defattr(-,root,root) -/usr/include/libksane/ +%_kde4_includedir/libksane/ %_kde4_libdir/pkgconfig/libksane.pc %_kde4_libdir/libksane.so %_datadir/icons/hicolor/*/actions/*.png -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkolabxml for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libkolabxml for openSUSE:Factory checked in at 2013-03-01 07:25:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkolabxml (Old) and /work/SRC/openSUSE:Factory/.libkolabxml.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkolabxml", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libkolabxml/libkolabxml.changes 2013-01-17 13:18:20.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkolabxml.new/libkolabxml.changes 2013-03-01 07:25:13.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Feb 27 08:45:25 UTC 2013 - aj(a)ajaissle.de + +- New upstream version 0.8.3 + * adds capabilities to read/write a new XML format +- Update fix_php5_bindings.diff + +------------------------------------------------------------------- Old: ---- libkolabxml-0.8.1.tar.gz New: ---- libkolabxml-0.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkolabxml.spec ++++++ --- /var/tmp/diff_new_pack.mwMkTy/_old 2013-03-01 07:25:14.000000000 +0100 +++ /var/tmp/diff_new_pack.mwMkTy/_new 2013-03-01 07:25:14.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkolabxml # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -17,7 +17,7 @@ Name: libkolabxml -Version: 0.8.1 +Version: 0.8.3 Release: 0 %define soname 0 Summary: Kolab XML Format Schema Definitions Library ++++++ fix_php5_bindings.diff ++++++ --- /var/tmp/diff_new_pack.mwMkTy/_old 2013-03-01 07:25:14.000000000 +0100 +++ /var/tmp/diff_new_pack.mwMkTy/_new 2013-03-01 07:25:14.000000000 +0100 @@ -1,22 +1,22 @@ ---- src/php/CMakeLists.txt 2012-08-15 16:50:12.000000000 +0200 -+++ src/php/CMakeLists.txt 2012-12-24 01:04:29.812585496 +0100 -@@ -10,9 +10,8 @@ +--- src/php/CMakeLists.txt.orig 2013-02-26 12:31:37.000000000 +0100 ++++ src/php/CMakeLists.txt 2013-02-27 10:46:32.858763766 +0100 +@@ -10,8 +10,8 @@ add_custom_command(OUTPUT ${CMAKE_CURREN VERBATIM ) -SET_SOURCE_FILES_PROPERTIES(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES GENERATED 1) -ADD_CUSTOM_TARGET(generate_php_bindings ALL DEPENDS ${KOLAB_SWIG_PHP_SOURCE_FILE}) -- +set_source_files_properties(${KOLAB_SWIG_PHP_SOURCE_FILE} PROPERTIES GENERATED 1) +add_custom_target(generate_php_bindings ALL DEPENDS ${KOLAB_SWIG_PHP_SOURCE_FILE}) + #Compile PHP Bindings - # Since there is no php library we can't compile with -Wl,--no-undefined -@@ -20,25 +19,54 @@ +@@ -19,35 +19,57 @@ ADD_CUSTOM_TARGET(generate_php_bindings + if (APPLE) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined suppress" ) endif() - --find_package(PHP4 5.3 REQUIRED) ++set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-variable -Wno-unused-label -Wno-maybe-uninitialized -Wno-unused-function" ) ++ +# Try to find PHP5 +find_path(PHP_INCLUDE_DIR NAMES main/php.h PATH_SUFFIXES php php5) +find_program(PHP_EXECUTABLE NAMES php) @@ -44,27 +44,7 @@ + if(_PHP_VERSION_ID_MATCH) + string(REGEX REPLACE "#define PHP_VERSION_ID[ ]*([0-9]*)\n" "\\1" PHP_VERSION_ID ${_PHP_VERSION_ID_MATCH}) + endif() - --if (PHP4_FOUND) -- include_directories(${PHP4_INCLUDE_PATH}) -- add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE}) -- target_link_libraries(phpbindings kolabxml) -- SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat") -- SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "") -- -- configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) -- -- set(PHP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/phpbindings" CACHE STRING "Install directory for php bindings.") -- -- install(TARGETS phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR}) -- -- install( FILES -- ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php -- DESTINATION ${PHP_INSTALL_DIR} -- ) --else(PHP4_FOUND) -- message(WARNING "not building php bindings because php was not found") --endif (PHP4_FOUND) ++ + # Include the needed PHP5 subdirs + set(PHP_INCLUDE_DIRS ${PHP_INCLUDE_DIR} ${PHP_INCLUDE_DIR}/main ${PHP_INCLUDE_DIR}/TSRM ${PHP_INCLUDE_DIR}/Zend ) +endif() @@ -88,3 +68,35 @@ +else() + message(WARNING "not building php bindings because php was not found") +endif() + +-# Debian (Wheezy) won't be able to find PHP using find_package. In packaging libkolabxml +-# for it, we define the include path and executable during the build. +-if (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE) +- find_package(PHP4 5.3 REQUIRED) +-endif (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE) +- +-if (PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) +- include_directories(${PHP4_INCLUDE_PATH}) +- +- # In an additional twist on Debian (Wheezy) - the PHP headers are fubar. php.h is in main/, +- # TSRM/TSRM.h includes <tsrm_config.h> instead of "tsrm_config.h", and we require +- # Zend/zend.h (included, of course, as "zend.h" without -I/usr/include/php5/Zend) +- include_directories("${PHP4_INCLUDE_PATH}/Zend" "${PHP4_INCLUDE_PATH}/TSRM" "${PHP4_INCLUDE_PATH}/main") +- add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE}) +- target_link_libraries(phpbindings kolabxml) +- SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat") +- SET_TARGET_PROPERTIES(phpbindings PROPERTIES PREFIX "") +- +- configure_file(test.php ${CMAKE_CURRENT_BINARY_DIR} COPYONLY) +- +- set(PHP_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/phpbindings" CACHE STRING "Install directory for php bindings.") +- +- install(TARGETS phpbindings LIBRARY DESTINATION ${PHP_INSTALL_DIR}) +- +- install( FILES +- ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php +- DESTINATION ${PHP_INSTALL_DIR} +- ) +-else(PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) +- message(WARNING "not building php bindings because php was not found") +-endif (PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) ++++++ libkolabxml-0.8.1.tar.gz -> libkolabxml-0.8.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/CMakeLists.txt new/libkolabxml-0.8.3/CMakeLists.txt --- old/libkolabxml-0.8.1/CMakeLists.txt 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/CMakeLists.txt 2013-02-26 12:31:37.000000000 +0100 @@ -8,6 +8,7 @@ cmake_minimum_required(VERSION 2.6) option( BUILD_TESTS "Build the tests" TRUE ) +option( BUILD_UTILS "Build optional utils" FALSE ) option( DIST_ONLY "Build dist targets only (does not require a compiler)" FALSE ) option( PYTHON_BINDINGS "Build bindings for python" FALSE ) option( PHP_BINDINGS "Build bindings for php" FALSE ) @@ -42,7 +43,7 @@ set (Libkolabxml_VERSION_MAJOR 0) set (Libkolabxml_VERSION_MINOR 8) # Enable the full x.y.z version only for release versions -set (Libkolabxml_VERSION_PATCH 1) +set (Libkolabxml_VERSION_PATCH 3) set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}.${Libkolabxml_VERSION_PATCH}" ) # set (Libkolabxml_VERSION "${Libkolabxml_VERSION_MAJOR}.${Libkolabxml_VERSION_MINOR}" ) @@ -135,7 +136,7 @@ # --generate-inline --extern-xml-schema xml-schema.xsd # --cxx-suffix .cpp --hxx-suffix .h add_custom_command(OUTPUT ${SCHEMA_SOURCEFILES} - COMMAND ${XSDCXX} cxx-tree --generate-polymorphic --generate-serialization --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS} + COMMAND ${XSDCXX} cxx-tree --generate-polymorphic --generate-serialization --namespace-map http://kolab.org=KolabXSD --root-element icalendar --root-element vcards --root-element note --root-element configuration --root-element file --output-dir ${CMAKE_BINARY_DIR}/bindings ${SCHEMAS} COMMENT "Generating XSD bindings" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} DEPENDS ${SCHEMAS} @@ -179,6 +180,10 @@ add_subdirectory(src) +if (BUILD_UTILS) + add_subdirectory(utils) +endif() + if (BUILD_TESTS) enable_testing() add_subdirectory(tests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/schemas/kolabformat.xsd new/libkolabxml-0.8.3/schemas/kolabformat.xsd --- old/libkolabxml-0.8.1/schemas/kolabformat.xsd 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/schemas/kolabformat.xsd 2013-02-26 12:31:37.000000000 +0100 @@ -75,6 +75,26 @@ </xs:complexType> <xs:element name="note" type="Note"/> + + <xs:complexType name="File"> + <xs:complexContent mixed="false"> + <xs:extension base="KolabBase"> + <xs:sequence> + <xs:element name="uid" type="xs:string"/> + <xs:element name="prodid" type="xs:string"/> + <xs:element name="creation-date" type="xs:dateTime"/> + <xs:element name="last-modification-date" type="xs:dateTime"/> + <xs:element name="categories" type="xs:string" minOccurs="0" maxOccurs="unbounded"/> + <xs:element name="classification" type="classifcationPropType" minOccurs="0" /> + <xs:element name="file" type="attachmentPropType" /> + <xs:element name="note" type="xs:string" minOccurs="0" /> + <xs:element name="x-custom" type="CustomType" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:extension> + </xs:complexContent> + </xs:complexType> + + <xs:element name="file" type="File"/> <xs:simpleType name="ConfigurationType"> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/CMakeLists.txt new/libkolabxml-0.8.3/src/CMakeLists.txt --- old/libkolabxml-0.8.1/src/CMakeLists.txt 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/CMakeLists.txt 2013-02-26 12:31:37.000000000 +0100 @@ -15,6 +15,7 @@ containers/kolabcontact.cpp containers/kolabconfiguration.cpp containers/kolabfreebusy.cpp + containers/kolabfile.cpp utils.cpp base64.cpp uriencode.cpp ../compiled/XMLParserWrapper.cpp ../compiled/grammar-input-stream.cxx @@ -54,6 +55,7 @@ containers/kolabcontainers.h containers/kolabconfiguration.h containers/kolabfreebusy.h + containers/kolabfile.h global_definitions.h DESTINATION ${INCLUDE_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabevent.cpp new/libkolabxml-0.8.3/src/containers/kolabevent.cpp --- old/libkolabxml-0.8.1/src/containers/kolabevent.cpp 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/containers/kolabevent.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -300,15 +300,15 @@ return d->customProperties; } -// void Event::setExceptions(const std::vector< Event > &exceptions) -// { -// d->exceptions = exceptions; -// } -// -// std::vector< Event > Event::exceptions() const -// { -// return d->exceptions; -// } +void Event::setExceptions(const std::vector< Event > &exceptions) +{ + d->exceptions = exceptions; +} + +std::vector< Event > Event::exceptions() const +{ + return d->exceptions; +} void Event::setAlarms(const std::vector< Alarm > &alarms) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabevent.h new/libkolabxml-0.8.3/src/containers/kolabevent.h --- old/libkolabxml-0.8.1/src/containers/kolabevent.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/containers/kolabevent.h 2013-02-26 12:31:37.000000000 +0100 @@ -105,9 +105,9 @@ void setCustomProperties(const std::vector<CustomProperty> &); std::vector<CustomProperty> customProperties() const; -/* TODO what is this? Exceptions it is + void setExceptions(const std::vector<Event> &); - std::vector<Event> exceptions() const;*/ + std::vector<Event> exceptions() const; void setAlarms(const std::vector<Alarm> &); std::vector<Alarm> alarms() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabfile.cpp new/libkolabxml-0.8.3/src/containers/kolabfile.cpp --- old/libkolabxml-0.8.1/src/containers/kolabfile.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkolabxml-0.8.3/src/containers/kolabfile.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -0,0 +1,161 @@ +/* + * Copyright (C) 2012 Christian Mollekopf <mollekopf(a)kolabsys.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#include "kolabfile.h" + +namespace Kolab { + +struct File::Private +{ + Private() + : classification(ClassPublic){} + + std::string uid; + cDateTime created; + cDateTime lastModified; + std::vector< std::string > categories; + Classification classification; + + std::string note; + + Attachment attachment; + std::vector<CustomProperty> customProperties; +}; + +File::File() +: d(new File::Private()) +{ +} + +File::File(const File &other) +: d(new File::Private()) +{ + *d = *other.d; +} + +File::~File() +{ +} + +void File::operator=(const Kolab::File &other) +{ + *d = *other.d; +} + +bool File::operator==(const Kolab::File& other) const +{ + return ( d->uid == other.uid() && + d->created == other.created() && + d->lastModified == other.lastModified() && + d->categories == other.categories() && + d->classification == other.classification() && + d->note == other.note() && + d->attachment == other.file() && + d->customProperties == other.customProperties()); +} + +bool File::isValid() const +{ + return !d->uid.empty(); +} + +void File::setUid(const std::string &uid) +{ + d->uid = uid; +} + +std::string File::uid() const +{ + return d->uid; +} + +void File::setCreated(const Kolab::cDateTime &created) +{ + d->created = created; +} + +cDateTime File::created() const +{ + return d->created; +} + +void File::setLastModified(const Kolab::cDateTime &lastMod) +{ + d->lastModified = lastMod; +} + +cDateTime File::lastModified() const +{ + return d->lastModified; +} + +void File::setClassification(Classification class_) +{ + d->classification = class_; +} + +Classification File::classification() const +{ + return d->classification; +} + +void File::setCategories(const std::vector< std::string > &categories) +{ + d->categories = categories; +} + +void File::addCategory(const std::string &cat) +{ + d->categories.push_back(cat); +} + +std::vector< std::string > File::categories() const +{ + return d->categories; +} + +void File::setNote(const std::string &note) +{ + d->note = note; +} + +std::string File::note() const +{ + return d->note; +} + +void File::setFile(const Attachment &attach) +{ + d->attachment = attach; +} + +Attachment File::file() const +{ + return d->attachment; +} + +void File::setCustomProperties(const std::vector< CustomProperty > &prop) +{ + d->customProperties = prop; +} + +std::vector< CustomProperty > File::customProperties() const +{ + return d->customProperties; +} + +} //File diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabfile.h new/libkolabxml-0.8.3/src/containers/kolabfile.h --- old/libkolabxml-0.8.1/src/containers/kolabfile.h 1970-01-01 01:00:00.000000000 +0100 +++ new/libkolabxml-0.8.3/src/containers/kolabfile.h 2013-02-26 12:31:37.000000000 +0100 @@ -0,0 +1,69 @@ +/* + * Copyright (C) 2012 Christian Mollekopf <mollekopf(a)kolabsys.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef KOLABFILE_H +#define KOLABFILE_H + +#include <string> +#include <vector> +#include <boost/scoped_ptr.hpp> +#include "kolabcontainers.h" +namespace Kolab { + + class File { + public: + File(); + ~File(); + File(const File &); + void operator=(const File &); + bool operator==(const File &) const; + + bool isValid() const; + + void setUid(const std::string &); + std::string uid() const; + + void setCreated(const cDateTime &); + cDateTime created() const; + + void setLastModified(const cDateTime &); + cDateTime lastModified() const; + + void setClassification(Classification); + Classification classification() const; + + void setCategories(const std::vector<std::string> &); + void addCategory(const std::string &); + std::vector<std::string> categories() const; + + void setNote(const std::string &); + std::string note() const; + + void setFile(const Attachment &); + Attachment file() const; + + void setCustomProperties(const std::vector<CustomProperty> &); + std::vector<CustomProperty> customProperties() const; + private: + struct Private; + boost::scoped_ptr<Private> d; + }; + +} + +#endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabtodo.cpp new/libkolabxml-0.8.3/src/containers/kolabtodo.cpp --- old/libkolabxml-0.8.1/src/containers/kolabtodo.cpp 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/containers/kolabtodo.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -29,6 +29,7 @@ cDateTime due; int percentComplete; + std::vector< Todo > exceptions; }; Todo::Todo() @@ -314,6 +315,16 @@ return d->customProperties; } +void Todo::setExceptions(const std::vector< Todo > &exceptions) +{ + d->exceptions = exceptions; +} + +std::vector< Todo > Todo::exceptions() const +{ + return d->exceptions; +} + void Todo::setAlarms(const std::vector< Alarm > &alarms) { d->alarms = alarms; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/containers/kolabtodo.h new/libkolabxml-0.8.3/src/containers/kolabtodo.h --- old/libkolabxml-0.8.1/src/containers/kolabtodo.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/containers/kolabtodo.h 2013-02-26 12:31:37.000000000 +0100 @@ -108,6 +108,9 @@ void setCustomProperties(const std::vector<CustomProperty> &); std::vector<CustomProperty> customProperties() const; + void setExceptions(const std::vector<Todo> &); + std::vector<Todo> exceptions() const; + void setAlarms(const std::vector<Alarm> &); std::vector<Alarm> alarms() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/csharp/CMakeLists.txt new/libkolabxml-0.8.3/src/csharp/CMakeLists.txt --- old/libkolabxml-0.8.1/src/csharp/CMakeLists.txt 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/csharp/CMakeLists.txt 2013-02-26 12:31:37.000000000 +0100 @@ -31,6 +31,7 @@ ${CMAKE_CURRENT_BINARY_DIR}/Duration.cs ${CMAKE_CURRENT_BINARY_DIR}/ErrorSeverity.cs ${CMAKE_CURRENT_BINARY_DIR}/Event.cs + ${CMAKE_CURRENT_BINARY_DIR}/File.cs ${CMAKE_CURRENT_BINARY_DIR}/Geo.cs ${CMAKE_CURRENT_BINARY_DIR}/Journal.cs ${CMAKE_CURRENT_BINARY_DIR}/Key.cs @@ -44,6 +45,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/Role.cs ${CMAKE_CURRENT_BINARY_DIR}/Status.cs ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_Kolab__Freebusy.cs + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Event_t.cs + ${CMAKE_CURRENT_BINARY_DIR}/SWIGTYPE_p_std__vectorT_Kolab__Todo_t.cs ${CMAKE_CURRENT_BINARY_DIR}/Telephone.cs ${CMAKE_CURRENT_BINARY_DIR}/Todo.cs ${CMAKE_CURRENT_BINARY_DIR}/Url.cs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/kolabconversions.h new/libkolabxml-0.8.3/src/kolabconversions.h --- old/libkolabxml-0.8.1/src/kolabconversions.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/kolabconversions.h 2013-02-26 12:31:37.000000000 +0100 @@ -33,6 +33,7 @@ #include "kolabnote.h" #include "shared_conversions.h" #include "kolabconfiguration.h" +#include "kolabfile.h" #include "base64.h" namespace Kolab { @@ -269,6 +270,79 @@ return std::string(); } +template <> +std::string serializeObject <Kolab::File> (const Kolab::File &file, const std::string prod) +{ + clearErrors(); + try { + const std::string &uid = getUID(file.uid()); + setCreatedUid(uid); + + KolabXSD::File::creation_date_type created(0,0,0,0,0,0); + if (file.created().isValid()) { + created = fromDateTime(file.created()); + } else { + created = fromDateTime(timestamp()); + } + KolabXSD::File::last_modification_date_type lastModificationDate(0,0,0,0,0,0); + if (file.lastModified().isValid()) { + lastModificationDate = fromDateTime(file.lastModified()); + } else { +// WARNING("missing last_modification_date, fallback to current timestamp"); + lastModificationDate = fromDateTime(timestamp()); + } + if (file.file().label().empty()) { + ERROR("missing filename"); + } + + KolabXSD::File n(uid, getProductId(prod), created, lastModificationDate, fromAttachment(file.file())); + + if (!file.categories().empty()) { + KolabXSD::File::categories_sequence categories; + const std::vector<std::string> &l = file.categories(); + BOOST_FOREACH(const std::string &c, l) { + categories.push_back(c); + } + n.categories(categories); + } + switch (file.classification()) { + case Kolab::ClassPublic: + n.classification(KolabXSD::File::classification_type::PUBLIC); + break; + case Kolab::ClassPrivate: + n.classification(KolabXSD::File::classification_type::PRIVATE); + break; + case Kolab::ClassConfidential: + n.classification(KolabXSD::File::classification_type::CONFIDENTIAL); + break; + default: + ERROR("unknown classification"); + } + + n.note(file.note()); + + if (!file.customProperties().empty()) { + const std::vector<Kolab::CustomProperty> &l = file.customProperties(); + BOOST_FOREACH(const Kolab::CustomProperty &a, l) { + n.x_custom().push_back(KolabXSD::CustomType(a.identifier, a.value)); + } + } + + xml_schema::namespace_infomap map; + map[""].name = KOLAB_NAMESPACE; + + std::ostringstream ostringstream; + KolabXSD::file(ostringstream, n, map); + return ostringstream.str(); + } catch (const xml_schema::exception& e) { + std::cerr << e << std::endl; + } catch (...) { + CRITICAL("Unhandled exception"); + } + CRITICAL("Failed to write file!"); + return std::string(); +} + template <typename T> boost::shared_ptr<T> deserializeObject(const std::string& s, bool isUrl); @@ -428,6 +502,87 @@ CRITICAL("Failed to read configuration!"); return boost::shared_ptr<Kolab::Configuration>(); } + +template <> +boost::shared_ptr<Kolab::File> deserializeObject <Kolab::File> (const std::string& s, bool isUrl) +{ + clearErrors(); + try { + std::auto_ptr<KolabXSD::File> file; + if (isUrl) { + xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseFile(s); + if (doc.get()) { + file = KolabXSD::file(doc); + } + } else { + xsd::cxx::xml::dom::auto_ptr <xercesc::DOMDocument > doc = XMLParserWrapper::inst().parseString(s); + if (doc.get()) { + file = KolabXSD::file(doc); + } + } + + if (!file.get()) { + CRITICAL("failed to parse file!"); + return boost::shared_ptr<Kolab::File>(); + } + + boost::shared_ptr<Kolab::File> n = boost::shared_ptr<Kolab::File>(new Kolab::File); + n->setUid(file->uid()); + n->setCreated(*toDate(file->creation_date())); + n->setLastModified(*toDate(file->last_modification_date())); + std::vector<std::string> categories; + std::copy(file->categories().begin(), file->categories().end(), std::back_inserter(categories)); + n->setCategories(categories); + if (file->classification()) { + switch (*file->classification()) { + case KolabXSD::File::classification_type::PUBLIC: + n->setClassification(Kolab::ClassPublic); + break; + case KolabXSD::File::classification_type::PRIVATE: + n->setClassification(Kolab::ClassPrivate); + break; + case KolabXSD::File::classification_type::CONFIDENTIAL: + n->setClassification(Kolab::ClassConfidential); + break; + default: + ERROR("unknown classification"); + } + } + + const Kolab::Attachment &attachment = toAttachment(file->file()); + if (attachment.label().empty()) { + ERROR("Missing filename"); + } + if (!attachment.isValid()) { + ERROR("invalid attachment"); + } + n->setFile(attachment); + + if (file->note()) { + n->setNote(*file->note()); + } + + setProductId( file->prodid() ); + // setFormatVersion( vcards->vcard().version().text() ); + // global_xCardVersion = vcalendar.properties().version().text(); + setKolabVersion( file->version() ); + + if (!file->x_custom().empty()) { + std::vector<Kolab::CustomProperty> customProperties; + BOOST_FOREACH(const KolabXSD::CustomType &p, file->x_custom()) { + customProperties.push_back(CustomProperty(p.identifier(), p.value())); + } + n->setCustomProperties(customProperties); + } + return n; + } catch (const xml_schema::exception& e) { + std::cerr << e << std::endl; + } catch (...) { + CRITICAL("Unhandled exception"); + } + CRITICAL("Failed to read file!"); + return boost::shared_ptr<Kolab::File>(); +} }//Namespace } //Namespace diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/kolabformat.cpp new/libkolabxml-0.8.3/src/kolabformat.cpp --- old/libkolabxml-0.8.1/src/kolabformat.cpp 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/kolabformat.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -169,6 +169,20 @@ return Kolab::KolabObjects::serializeObject<Kolab::Note>(note, productId); } +File readFile(const std::string& s, bool isUrl) +{ + boost::shared_ptr <Kolab::File> ptr = Kolab::KolabObjects::deserializeObject<Kolab::File>(s, isUrl); + if (!ptr.get()) { + return Kolab::File(); + } + return *ptr; +} + +std::string writeFile(const File &file, const std::string& productId) +{ + return Kolab::KolabObjects::serializeObject<Kolab::File>(file, productId); +} + Configuration readConfiguration(const std::string& s, bool isUrl) { boost::shared_ptr <Kolab::Configuration> ptr = Kolab::KolabObjects::deserializeObject<Kolab::Configuration>(s, isUrl); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/kolabformat.h new/libkolabxml-0.8.3/src/kolabformat.h --- old/libkolabxml-0.8.1/src/kolabformat.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/kolabformat.h 2013-02-26 12:31:37.000000000 +0100 @@ -27,6 +27,7 @@ #include "kolabnote.h" #include "kolabconfiguration.h" #include "kolabfreebusy.h" +#include "kolabfile.h" #include "global_definitions.h" namespace Kolab { @@ -122,6 +123,9 @@ Kolab::Configuration readConfiguration(const std::string& s, bool isUrl); std::string writeConfiguration(const Kolab::Configuration &, const std::string& productId = std::string()); +Kolab::File readFile(const std::string& s, bool isUrl); +std::string writeFile(const Kolab::File &, const std::string& productId = std::string()); + } #endif // KOLABFORMAT_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/kolabformat.i new/libkolabxml-0.8.3/src/kolabformat.i --- old/libkolabxml-0.8.1/src/kolabformat.i 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/kolabformat.i 2013-02-26 12:31:37.000000000 +0100 @@ -14,6 +14,7 @@ #include "containers/kolabcontact.h" #include "containers/kolabnote.h" #include "containers/kolabconfiguration.h" + #include "containers/kolabfile.h" %} %include "std_string.i" @@ -37,8 +38,13 @@ %template(vectorurl) vector<Kolab::Url>; %template(vectorkey) vector<Kolab::Key>; %template(vectorcategorycolor) vector<Kolab::CategoryColor>; +/* %template(vectorevent) vector<Kolab::Event>;*/ +/* %template(vectorevent2) vector< vector<Kolab::Event> >;*/ }; +%rename(readKolabFile) Kolab::readFile; +%rename(writeKolabFile) Kolab::writeFile; + %include "global_definitions.h" %include "kolabformat.h" %include "containers/kolabcontainers.h" @@ -48,3 +54,4 @@ %include "containers/kolabcontact.h" %include "containers/kolabnote.h" %include "containers/kolabconfiguration.h" +%include "containers/kolabfile.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/php/CMakeLists.txt new/libkolabxml-0.8.3/src/php/CMakeLists.txt --- old/libkolabxml-0.8.1/src/php/CMakeLists.txt 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/php/CMakeLists.txt 2013-02-26 12:31:37.000000000 +0100 @@ -20,10 +20,19 @@ set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flat_namespace -undefined suppress" ) endif() -find_package(PHP4 5.3 REQUIRED) +# Debian (Wheezy) won't be able to find PHP using find_package. In packaging libkolabxml +# for it, we define the include path and executable during the build. +if (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE) + find_package(PHP4 5.3 REQUIRED) +endif (NOT PHP4_INCLUDE_PATH OR NOT PHP4_EXECUTABLE) -if (PHP4_FOUND) +if (PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) include_directories(${PHP4_INCLUDE_PATH}) + + # In an additional twist on Debian (Wheezy) - the PHP headers are fubar. php.h is in main/, + # TSRM/TSRM.h includes <tsrm_config.h> instead of "tsrm_config.h", and we require + # Zend/zend.h (included, of course, as "zend.h" without -I/usr/include/php5/Zend) + include_directories("${PHP4_INCLUDE_PATH}/Zend" "${PHP4_INCLUDE_PATH}/TSRM" "${PHP4_INCLUDE_PATH}/main") add_library(phpbindings SHARED ${KOLAB_SWIG_PHP_SOURCE_FILE}) target_link_libraries(phpbindings kolabxml) SET_TARGET_PROPERTIES(phpbindings PROPERTIES OUTPUT_NAME "kolabformat") @@ -39,6 +48,6 @@ ${CMAKE_CURRENT_BINARY_DIR}/kolabformat.php DESTINATION ${PHP_INSTALL_DIR} ) -else(PHP4_FOUND) +else(PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) message(WARNING "not building php bindings because php was not found") -endif (PHP4_FOUND) +endif (PHP4_FOUND OR (PHP4_INCLUDE_PATH AND PHP4_EXECUTABLE)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/src/xcalconversions.h new/libkolabxml-0.8.3/src/xcalconversions.h --- old/libkolabxml-0.8.1/src/xcalconversions.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/src/xcalconversions.h 2013-02-26 12:31:37.000000000 +0100 @@ -1527,6 +1527,26 @@ { return components.vevent().end(); } + + static IncidencePtr resolveExceptions(const std::vector<IncidencePtr> &list) + { + IncidencePtr incidence = *list.begin(); + std::vector<IncidenceType> exceptions; + for (std::vector < IncidencePtr >::const_iterator it = list.begin()+1; it != list.end(); it++) { + exceptions.push_back(**it); + } + incidence->setExceptions(exceptions); + return incidence; + } + + static void addExceptions(icalendar_2_0::VcalendarType::components_type &components, const Kolab::Event &event, KolabType::properties_type props) + { + BOOST_FOREACH(const Kolab::Event &exception, event.exceptions()) { + KolabType ex(props); + writeIncidence(ex, exception); + addIncidence(components, ex); + } + } }; @@ -1603,6 +1623,26 @@ return components.vtodo().end(); } + static IncidencePtr resolveExceptions(const std::vector<IncidencePtr> &list) + { + IncidencePtr incidence = *list.begin(); + std::vector<IncidenceType> exceptions; + for (std::vector < IncidencePtr >::const_iterator it = list.begin()+1; it != list.end(); it++) { + exceptions.push_back(**it); + } + incidence->setExceptions(exceptions); + return incidence; + } + + static void addExceptions(icalendar_2_0::VcalendarType::components_type &components, const Kolab::Todo &event, KolabType::properties_type props) + { + BOOST_FOREACH(const Kolab::Todo &exception, event.exceptions()) { + KolabType ex(props); + writeIncidence(ex, exception); + addIncidence(components, ex); + } + } + }; template < > struct IncidenceTrait <Kolab::Journal> @@ -1638,6 +1678,15 @@ return components.vjournal().end(); } + static IncidencePtr resolveExceptions(const std::vector<IncidencePtr> &list) + { + return *list.begin(); + } + + static void addExceptions(icalendar_2_0::VcalendarType::components_type &, const Kolab::Journal &, KolabType::properties_type) + { + } + }; template < > struct IncidenceTrait <Kolab::Freebusy> @@ -1785,6 +1834,15 @@ { return components.vfreebusy().end(); } + + static IncidencePtr resolveExceptions(const std::vector<IncidencePtr> &list) + { + return *list.begin(); + } + + static void addExceptions(icalendar_2_0::VcalendarType::components_type &, const Kolab::Freebusy &, KolabType::properties_type) + { + } }; @@ -1825,6 +1883,8 @@ VcalendarType::components_type components; T::addIncidence(components, inc); + + T::addExceptions(components, incidence, eventProps); VcalendarType::properties_type::prodid_type prodid(getProductId(productid)); VcalendarType::properties_type::version_type version(XCAL_VERSION); @@ -1893,17 +1953,11 @@ global_xCalVersion = vcalendar.properties().version().text(); setKolabVersion( vcalendar.properties().x_kolab_version().text() ); - - //TODO resolve events, exceptions can be identified based on the recurrence-id attribute -// foreach (KCalCore::Event * event, events) { -// if (!event->hasRecurrenceId()) { -// return event; -// } -// } - if (incidences.size() != 1) { - WARNING("wrong number of incidences: "+ incidences.size()); + if (incidences.empty()) { + CRITICAL("no incidence in object"); + return IncidencePtr(); } - return *incidences.begin(); + return T::resolveExceptions(incidences); } catch (const xml_schema::exception& e) { std::cerr << e << std::endl; } catch (...) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/tests/bindingstest.cpp new/libkolabxml-0.8.3/tests/bindingstest.cpp --- old/libkolabxml-0.8.1/tests/bindingstest.cpp 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/tests/bindingstest.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -116,6 +116,35 @@ QCOMPARE(re.attachments(), note.attachments()); } +void BindingsTest::fileCompletness() +{ + Kolab::File file; + file.setUid("UID"); + file.setCreated(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC + file.setLastModified(Kolab::cDateTime(2006,1,6,12,0,0,true)); //UTC + file.setClassification(Kolab::ClassConfidential); + file.addCategory("Category"); + file.setNote("summary"); + Kolab::Attachment attachment; + attachment.setData("data", "mimetype"); + attachment.setLabel("label"); + file.setFile(attachment); + + const std::string &result = Kolab::writeFile(file); + QCOMPARE(Kolab::error(), Kolab::NoError); +// std::cout << result << std::endl; + + const Kolab::File &re = Kolab::readFile(result, false); + QCOMPARE(Kolab::error(), Kolab::NoError); + QCOMPARE(re.uid(), file.uid()); + QCOMPARE(re.created(), file.created()); + QCOMPARE(re.lastModified(), file.lastModified()); + QCOMPARE(re.classification(), file.classification()); + QCOMPARE(re.categories(), file.categories()); + QCOMPARE(re.note(), file.note()); + QCOMPARE(re.file(), file.file()); +} + // void BindingsTest::eventCompletness_data() template <typename T> @@ -310,6 +339,37 @@ QCOMPARE(ev.duration(), e.duration()); } +void BindingsTest::eventExceptions() +{ + Kolab::Event ev; + ev.setUid("uid1"); + ev.setStart(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0)); + std::vector<Kolab::Event> exceptions; + Kolab::Event ex1; + ex1.setStart(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0)); + ex1.setUid("uid1"); + ex1.setRecurrenceID(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0), true); + exceptions.push_back(ex1); + Kolab::Event ex2; + ex2.setStart(Kolab::cDateTime("Europe/Zurich", 2006,1,8,12,0,0)); + ex2.setUid("uid1"); + ex2.setRecurrenceID(Kolab::cDateTime("Europe/Zurich", 2007,1,8,12,0,0), false); + exceptions.push_back(ex2); + ev.setExceptions(exceptions); + + const std::string result = Kolab::writeEvent(ev); + QVERIFY(Kolab::error() == Kolab::NoError); +// std::cout << result << endl; + const Kolab::Event e = Kolab::readEvent(result, false); + QVERIFY(Kolab::error() == Kolab::NoError); + QCOMPARE(e.exceptions().size(), std::size_t(2)); + QCOMPARE(ev.exceptions().at(0).uid(), e.exceptions().at(0).uid()); + QCOMPARE(ev.exceptions().at(0).recurrenceID(), e.exceptions().at(0).recurrenceID()); + QCOMPARE(ev.exceptions().at(1).uid(), e.exceptions().at(1).uid()); + QCOMPARE(ev.exceptions().at(1).recurrenceID(), e.exceptions().at(1).recurrenceID()); + +} + void BindingsTest::todoCompletness() { Kolab::Todo ev; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/tests/bindingstest.h new/libkolabxml-0.8.3/tests/bindingstest.h --- old/libkolabxml-0.8.1/tests/bindingstest.h 2012-08-15 16:50:12.000000000 +0200 +++ new/libkolabxml-0.8.3/tests/bindingstest.h 2013-02-26 12:31:37.000000000 +0100 @@ -25,8 +25,10 @@ void categorycolorConfigurationCompletness(); void dictionaryConfigurationCompletness(); void noteCompletness(); + void fileCompletness(); void eventCompletness(); void eventDuration(); + void eventExceptions(); void todoCompletness(); void dueDateDateOnly(); void journalCompletness(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/utils/CMakeLists.txt new/libkolabxml-0.8.3/utils/CMakeLists.txt --- old/libkolabxml-0.8.1/utils/CMakeLists.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/libkolabxml-0.8.3/utils/CMakeLists.txt 2013-02-26 12:31:37.000000000 +0100 @@ -0,0 +1,5 @@ + +find_package(Boost REQUIRED COMPONENTS program_options) + +add_executable(kolabformatchecker kolabformatchecker.cpp) +target_link_libraries(kolabformatchecker kolabxml ${Boost_LIBRARIES}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkolabxml-0.8.1/utils/kolabformatchecker.cpp new/libkolabxml-0.8.3/utils/kolabformatchecker.cpp --- old/libkolabxml-0.8.1/utils/kolabformatchecker.cpp 1970-01-01 01:00:00.000000000 +0100 +++ new/libkolabxml-0.8.3/utils/kolabformatchecker.cpp 2013-02-26 12:31:37.000000000 +0100 @@ -0,0 +1,99 @@ +/* + * Copyright (C) 2011 Christian Mollekopf <mollekopf(a)kolabsys.com> + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#include <boost/program_options.hpp> +#include <iostream> +#include <string> +#include <vector> +#include "src/kolabformat.h" + +namespace po = boost::program_options; +using namespace std; + +int main(int argc, char *argv[]) +{ + // Declare the supported options. + po::options_description desc("Allowed options"); + desc.add_options() + ("help", "produce help message") + ("contact", "parse contact") + ("distlist", "parse distlist") + ("event", "parse event") + ("todo", "parse todo") + ("journal", "parse journal") + ("freebusy", "parse freebusy") + ("note", "parse note") + ("configuration", "parse configuration") + ("file", "parse file") + ("input-file", po::value<std::vector<std::string> >(), "input files of given type") + ; + + po::positional_options_description p; + p.add("input-file", -1); + + po::variables_map vm; + po::store(po::command_line_parser(argc, argv). + options(desc).positional(p).run(), vm); + po::notify(vm); + + if (vm.count("help")) { + cout << desc << "\n"; + return 1; + } + + vector<string> inputFiles; + if (vm.count("input-file")) { + inputFiles = vm["input-file"].as< vector<string> >(); + } else { + cout << "Specify input-file"; + return -1; + } + + for(vector<string>::const_iterator it = inputFiles.begin(); + it != inputFiles.end(); it++){ + + if (vm.count("contact")) { + Kolab::readContact(*it, true); + } else if (vm.count("distlist")) { + Kolab::readDistlist(*it, true); + } else if (vm.count("event")) { + Kolab::readEvent(*it, true); + } else if (vm.count("todo")) { + Kolab::readTodo(*it, true); + } else if (vm.count("journal")) { + Kolab::readJournal(*it, true); + } else if (vm.count("freebusy")) { + Kolab::readFreebusy(*it, true); + } else if (vm.count("note")) { + Kolab::readNote(*it, true); + } else if (vm.count("configuration")) { + Kolab::readConfiguration(*it, true); + } else if (vm.count("file")) { + Kolab::readFile(*it, true); + } else { + cout << "Specify type"; + return -1; + } + if (Kolab::error()) { + cout << "Error: " << Kolab::errorMessage() << endl; + return -1; + } else { + cout << "Parsed message without error." << endl; + } + } + return 0; +} \ No newline at end of file -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkipi for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libkipi for openSUSE:Factory checked in at 2013-03-01 07:24:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkipi (Old) and /work/SRC/openSUSE:Factory/.libkipi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkipi", Maintainer is "kde-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libkipi/libkipi.changes 2013-02-04 19:06:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkipi.new/libkipi.changes 2013-03-01 07:24:59.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 14:35:21 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Drop all unneeded BuildRequires +- Utilize includedir macro from kde4-filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkipi.spec ++++++ --- /var/tmp/diff_new_pack.ledzDm/_old 2013-03-01 07:25:00.000000000 +0100 +++ /var/tmp/diff_new_pack.ledzDm/_new 2013-03-01 07:25:00.000000000 +0100 @@ -17,25 +17,8 @@ Name: libkipi -BuildRequires: OpenEXR-devel -BuildRequires: chmlib-devel -BuildRequires: fribidi-devel -BuildRequires: libdjvulibre-devel -BuildRequires: libepub-devel -BuildRequires: libexiv2-devel -BuildRequires: libgphoto2-devel BuildRequires: libkde4-devel -BuildRequires: libpoppler-qt4-devel -BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel -BuildRequires: libsoprano-devel -BuildRequires: libspectre-devel -BuildRequires: net-snmp-devel BuildRequires: oxygen-icon-theme-large -BuildRequires: soprano-backend-redland -BuildRequires: texlive -BuildRequires: texlive-devel -BuildRequires: texlive-latex BuildRequires: xz Summary: KDE Image Plugin Interface License: BSD-3-Clause and GPL-2.0+ and LGPL-2.1+ and MIT @@ -102,7 +85,7 @@ %defattr(-,root,root) %doc COPYING README %_kde4_libdir/libkipi.so -/usr/include/libkipi/ +%_kde4_includedir/libkipi/ %_kde4_libdir/pkgconfig/libkipi.pc %changelog -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libkdcraw for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libkdcraw for openSUSE:Factory checked in at 2013-03-01 07:24:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkdcraw (Old) and /work/SRC/openSUSE:Factory/.libkdcraw.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkdcraw", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libkdcraw/libkdcraw.changes 2013-02-04 19:06:03.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libkdcraw.new/libkdcraw.changes 2013-03-01 07:24:30.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 28 14:55:30 UTC 2013 - hrvoje.senjan(a)gmail.com + +- Drop all unneeded BuildRequires +- Add missing BuildRequires +- Enable lcms2 and rawspeed codec support +- Utilize includedir macro from kde4-filesystem + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkdcraw.spec ++++++ --- /var/tmp/diff_new_pack.3yNsSV/_old 2013-03-01 07:24:30.000000000 +0100 +++ /var/tmp/diff_new_pack.3yNsSV/_new 2013-03-01 07:24:30.000000000 +0100 @@ -25,27 +25,15 @@ Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz Patch1: libraw-disable-mosaic-packs.patch -BuildRequires: OpenEXR-devel -BuildRequires: chmlib-devel -BuildRequires: fribidi-devel -BuildRequires: libdjvulibre-devel -BuildRequires: libepub-devel -BuildRequires: libexiv2-devel -BuildRequires: libgphoto2-devel +BuildRequires: libjasper-devel +BuildRequires: libjpeg-devel BuildRequires: libkde4-devel -BuildRequires: libpoppler-qt4-devel -BuildRequires: libqca2-devel -BuildRequires: libqimageblitz-devel +BuildRequires: liblcms2-devel BuildRequires: libraw-devel -BuildRequires: libsoprano-devel -BuildRequires: libspectre-devel -BuildRequires: net-snmp-devel +BuildRequires: openmpi-devel BuildRequires: oxygen-icon-theme-large -BuildRequires: soprano-backend-redland -BuildRequires: texlive -BuildRequires: texlive-devel -BuildRequires: texlive-latex BuildRequires: xz +BuildRequires: pkgconfig(libxml-2.0) BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -65,7 +53,7 @@ rm -rf libraw/demosaic-pack-* %build - %cmake_kde4 -d build + %cmake_kde4 -d build -- -DENABLE_LCMS2=true -DENABLE_RAWSPEED=true %make_jobs %install @@ -116,7 +104,7 @@ %files devel %defattr(-,root,root) %doc COPYING README -%{_includedir}/libkdcraw/ +%{_kde4_includedir}/libkdcraw/ %_kde4_libdir/libkdcraw.so %_kde4_libdir/pkgconfig/libkdcraw.pc -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdrm for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libdrm for openSUSE:Factory checked in at 2013-03-01 07:24:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdrm (Old) and /work/SRC/openSUSE:Factory/.libdrm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdrm", Maintainer is "sndirsch(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libdrm/libdrm.changes 2013-02-07 10:33:22.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdrm.new/libdrm.changes 2013-03-01 07:24:17.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Feb 27 16:40:51 UTC 2013 - dmueller(a)suse.com + +- disable valgrind support for aarch64 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdrm.spec ++++++ --- /var/tmp/diff_new_pack.66201u/_old 2013-03-01 07:24:18.000000000 +0100 +++ /var/tmp/diff_new_pack.66201u/_new 2013-03-01 07:24:18.000000000 +0100 @@ -47,7 +47,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(pciaccess) >= 0.10 BuildRequires: pkgconfig(pthread-stubs) -%ifnarch armv5el armv5tel +%ifnarch armv5el armv5tel aarch64 BuildRequires: pkgconfig(valgrind) %endif -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libdc1394 for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package libdc1394 for openSUSE:Factory checked in at 2013-03-01 07:24:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdc1394 (Old) and /work/SRC/openSUSE:Factory/.libdc1394.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libdc1394", Maintainer is "sbrabec(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/libdc1394/libdc1394.changes 2012-03-11 20:04:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libdc1394.new/libdc1394.changes 2013-03-01 07:24:06.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Jan 29 14:27:01 UTC 2013 - matwey.kornilov(a)gmail.com + +- Drop support of libdc1394-1 (which is unused for a long time) + +------------------------------------------------------------------- +Mon Jan 28 07:17:50 UTC 2013 - matwey.kornilov(a)gmail.com + +- Update to 2.2.1 + - updated all licenses to LPGL2 (bnc#777083) + - misc fixes + - don't expose internal symbols + +------------------------------------------------------------------- Old: ---- libdc1394-1.2.2.tar.bz2 libdc1394-2.2.0.tar.bz2 libdc1394.raw1394_set_iso_handler.patch New: ---- libdc1394-2.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdc1394.spec ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:07.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libdc1394 # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 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 @@ -16,12 +16,7 @@ # -# if Build_12 is equal to 0 don't build version 1.2.2 -%define Build_12 0 - Name: libdc1394 -%define libdc1394_12_version 1.2.2 -%define libdc1394_version 2.2.0 BuildRequires: autoconf %if 0%{?suse_version} > 1110 BuildRequires: libSDL-devel @@ -38,21 +33,19 @@ %if 0%{?suse_version} >= 1210 BuildRequires: libv4l-devel >= 0.8.4 %endif -Version: %{libdc1394_version} +Version: 2.2.1 Release: 0 Summary: 1394-Based Digital Camera Control Library License: LGPL-2.1+ Group: Hardware/Camera Url: http://sourceforge.net/projects/libdc1394/ -Source1: libdc1394-%{libdc1394_12_version}.tar.bz2 -Source2: libdc1394-%{libdc1394_version}.tar.bz2 -Source3: %{name}-rpmlintrc +Source0: libdc1394-%{version}.tar.bz2 +Source1: %{name}-rpmlintrc Patch0: libdc1394.no-x11.patch Patch1: libdc1394.ac.patch Patch2: libdc1394-swab_fix.patch -Patch3: libdc1394.raw1394_set_iso_handler.patch -Patch4: libdc1394-v4l-2.6.38.patch -Patch5: libdc1394-visibility.patch +Patch3: libdc1394-v4l-2.6.38.patch +Patch4: libdc1394-visibility.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -61,38 +54,6 @@ the low-level functionality provided by libraw1394 to communicate with the camera. -%if %{Build_12} >= 1 - -%package -n libdc1394_control12 -Version: %{libdc1394_12_version} -Release: 0 -Summary: 1394-Based Digital Camera Control Library -Group: Hardware/Camera - -%description -n libdc1394_control12 -This library provides functionality for controlling any camera that -conforms to the 1394-Based Digital Camera Specification (which can be -found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). -It utilizes the low-level functionality provided by libraw1394 to -communicate with the camera. - -%package -n libdc1394_control12-devel -Version: %{libdc1394_12_version} -Release: 0 -Summary: 1394-Based Digital Camera Control Library -Group: Development/Libraries/C and C++ -Requires: libdc1394_control12 = %{libdc1394_12_version} -Requires: libraw1394-devel - -%description -n libdc1394_control12-devel -This library provides functionality for controlling any camera that -conforms to the 1394-Based Digital Camera Specification (which can be -found at http://www.1394ta.org/Download/Technology/Specifications/Camera120.pdf). -It utilizes the low-level functionality provided by libraw1394 to -communicate with the camera. - -%endif - %package 22 Summary: 1394-Based Digital Camera Control Library Group: Hardware/Camera @@ -107,8 +68,8 @@ %package devel Summary: Development libraries and header files for dc1394 Group: Development/Libraries/C and C++ -Requires: libdc1394 = %{libdc1394_version} -Requires: libdc1394-22 = %{libdc1394_version} +Requires: libdc1394 = %{version} +Requires: libdc1394-22 = %{version} Requires: libraw1394-devel %description devel @@ -116,61 +77,35 @@ programs using the dc1394 library. %prep -%setup -q -T -c -a 1 -a 2 -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%setup -q +%patch0 -p2 +%patch1 -p2 +%patch2 -p2 %if 0%{?suse_version} >= 1210 -%patch4 +%patch3 -p1 %endif -%patch5 +%patch4 -p1 %build -doit() { - if pushd "$1" ; then - autoreconf --force --install - export CFLAGS="%{optflags}" - %{configure} --disable-static --with-pic --disable-xv - make %{?_smp_mflags} - popd - fi -} -%if %{Build_12} >= 1 -doit libdc1394-%{libdc1394_12_version} -%endif -doit libdc1394-%{libdc1394_version} +autoreconf --force --install +export CFLAGS="%{optflags}" +%{configure} --disable-static --with-pic --disable-xv +make %{?_smp_mflags} %install -doit() { - if pushd "$1" ; then - make DESTDIR=%{buildroot} install - popd - fi -} -%if %{Build_12} >= 1 -doit libdc1394-%{libdc1394_12_version} -%endif -doit libdc1394-%{libdc1394_version} +make DESTDIR=%{buildroot} install rm -f %{buildroot}%{_bindir}/dc1394_vloopback %{buildroot}%{_mandir}/man1/dc1394_vloopback.1* rm -f %{buildroot}%{_mandir}/man1/dc1394_multiview.1* rm -f %{buildroot}%{_mandir}/man1/grab_*_image.1* rm -f %{buildroot}%{_libdir}/*.la -%if %{Build_12} >= 1 - -%post -n libdc1394_control12 -p /sbin/ldconfig - -%postun -n libdc1394_control12 -p /sbin/ldconfig -%endif - %post 22 -p /sbin/ldconfig %postun 22 -p /sbin/ldconfig %files %defattr(-,root,root) -%doc libdc1394-%{libdc1394_version}/{AUTHORS,COPYING,ChangeLog,NEWS,README} +%doc AUTHORS COPYING ChangeLog NEWS README %{_bindir}/dc1394_reset_bus %{_mandir}/man1/dc1394_reset_bus.1* @@ -178,18 +113,6 @@ %defattr(-,root,root) %{_libdir}/libdc1394.so.22* -%if %{Build_12} >= 1 - -%files -n libdc1394_control12 -%defattr(-,root,root) -%{_libdir}/libdc1394_control.so.* - -%files -n libdc1394_control12-devel -%defattr(-,root,root) -%{_includedir}/libdc1394 -%{_libdir}/libdc1394_control*.so -%endif - %files devel %defattr(-,root,root) %{_includedir}/dc1394 ++++++ libdc1394-1.2.2.tar.bz2 -> libdc1394-2.2.1.tar.bz2 ++++++ ++++ 113621 lines of diff (skipped) ++++++ libdc1394-swab_fix.patch ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:08.000000000 +0100 @@ -1,9 +1,5 @@ ---- - libdc1394-2.0.2/dc1394/conversions.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - ---- a/libdc1394-2.2.0/dc1394/conversions.c -+++ b/libdc1394-2.2.0/dc1394/conversions.c +--- a/libdc1394-2.2.1/dc1394/conversions.c ++++ b/libdc1394-2.2.1/dc1394/conversions.c @@ -22,11 +22,10 @@ #include <string.h> ++++++ libdc1394-v4l-2.6.38.patch ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:08.000000000 +0100 @@ -1,5 +1,5 @@ ---- libdc1394-2.2.0/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 -+++ libdc1394-2.2.0/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 +--- libdc1394-2.2.1/examples/dc1394_vloopback.c 2009-05-25 08:49:17.000000000 +0200 ++++ libdc1394-2.2.1/examples/dc1394_vloopback.c 2011-07-07 11:47:18.326089352 +0200 @@ -46,7 +46,7 @@ #include <signal.h> #define _LINUX_TIME_H ++++++ libdc1394-visibility.patch ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:08.000000000 +0100 @@ -1,6 +1,6 @@ -diff -urN libdc1394-2.2.0.orig/configure.in libdc1394-2.2.0/configure.in ---- libdc1394-2.2.0.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 -+++ libdc1394-2.2.0/configure.in 2011-08-29 10:01:52.563014990 +0200 +diff -urN libdc1394-2.2.1.orig/configure.in libdc1394-2.2.1/configure.in +--- libdc1394-2.2.1.orig/configure.in 2011-08-29 09:58:17.271211906 +0200 ++++ libdc1394-2.2.1/configure.in 2011-08-29 10:01:52.563014990 +0200 @@ -132,6 +132,23 @@ AC_FUNC_MMAP @@ -25,9 +25,9 @@ dnl --------------------------------------------------------------------------- dnl When making a release: dnl 1. If the library source code has changed at all since the last release, -diff -urN libdc1394-2.2.0.orig/dc1394/bayer.c libdc1394-2.2.0/dc1394/bayer.c ---- libdc1394-2.2.0.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.2.0/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/bayer.c libdc1394-2.2.1/dc1394/bayer.c +--- libdc1394-2.2.1.orig/dc1394/bayer.c 2011-08-29 09:58:17.274211906 +0200 ++++ libdc1394-2.2.1/dc1394/bayer.c 2011-08-29 10:01:52.564014989 +0200 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> @@ -234,9 +234,9 @@ dc1394_debayer_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394bayer_method_t method) { if ((method<DC1394_BAYER_METHOD_MIN)||(method>DC1394_BAYER_METHOD_MAX)) -diff -urN libdc1394-2.2.0.orig/dc1394/capture.c libdc1394-2.2.0/dc1394/capture.c ---- libdc1394-2.2.0.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/capture.c libdc1394-2.2.1/dc1394/capture.c +--- libdc1394-2.2.1.orig/dc1394/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/capture.c 2011-08-29 10:01:52.564014989 +0200 @@ -23,8 +23,9 @@ #include "control.h" #include "platform.h" @@ -293,9 +293,9 @@ dc1394_capture_is_frame_corrupt (dc1394camera_t * camera, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.2.0.orig/dc1394/control.c libdc1394-2.2.0/dc1394/control.c ---- libdc1394-2.2.0.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/control.c libdc1394-2.2.1/dc1394/control.c +--- libdc1394-2.2.1.orig/dc1394/control.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/control.c 2011-08-29 10:01:52.566014987 +0200 @@ -27,8 +27,9 @@ #include "internal.h" @@ -1009,9 +1009,9 @@ dc1394_camera_free(dc1394camera_t *camera) { dc1394camera_priv_t * cpriv = DC1394_CAMERA_PRIV (camera); -diff -urN libdc1394-2.2.0.orig/dc1394/conversions.c libdc1394-2.2.0/dc1394/conversions.c ---- libdc1394-2.2.0.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 -+++ libdc1394-2.2.0/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/conversions.c libdc1394-2.2.1/dc1394/conversions.c +--- libdc1394-2.2.1.orig/dc1394/conversions.c 2011-08-29 10:00:09.189211894 +0200 ++++ libdc1394-2.2.1/dc1394/conversions.c 2011-08-29 10:02:04.969014969 +0200 @@ -25,6 +25,7 @@ #define _XOPEN_SOURCE #include <unistd.h> @@ -1218,9 +1218,9 @@ dc1394_deinterlace_stereo_frames(dc1394video_frame_t *in, dc1394video_frame_t *out, dc1394stereo_method_t method) { dc1394error_t err; -diff -urN libdc1394-2.2.0.orig/dc1394/enumeration.c libdc1394-2.2.0/dc1394/enumeration.c ---- libdc1394-2.2.0.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.0/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/enumeration.c libdc1394-2.2.1/dc1394/enumeration.c +--- libdc1394-2.2.1.orig/dc1394/enumeration.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.2.1/dc1394/enumeration.c 2011-08-29 10:01:52.567014987 +0200 @@ -27,6 +27,7 @@ #include "internal.h" #include "platform.h" @@ -1265,9 +1265,9 @@ dc1394_camera_free_list (dc1394camera_list_t *list) { if (list) -diff -urN libdc1394-2.2.0.orig/dc1394/format7.c libdc1394-2.2.0/dc1394/format7.c ---- libdc1394-2.2.0.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.0/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/format7.c libdc1394-2.2.1/dc1394/format7.c +--- libdc1394-2.2.1.orig/dc1394/format7.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.2.1/dc1394/format7.c 2011-08-29 10:01:52.567014987 +0200 @@ -34,6 +34,7 @@ #include "utils.h" #include "config.h" @@ -1555,9 +1555,9 @@ dc1394_format7_get_roi(dc1394camera_t *camera, dc1394video_mode_t video_mode, dc1394color_coding_t *color_coding, -diff -urN libdc1394-2.2.0.orig/dc1394/juju/control.c libdc1394-2.2.0/dc1394/juju/control.c ---- libdc1394-2.2.0.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.0/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/juju/control.c libdc1394-2.2.1/dc1394/juju/control.c +--- libdc1394-2.2.1.orig/dc1394/juju/control.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.2.1/dc1394/juju/control.c 2011-08-29 10:01:52.568014987 +0200 @@ -35,6 +35,7 @@ #include "platform.h" #include "internal.h" @@ -1593,9 +1593,9 @@ juju_init(dc1394_t * d) { register_platform (d, &juju_dispatch, "juju"); -diff -urN libdc1394-2.2.0.orig/dc1394/linux/capture.c libdc1394-2.2.0/dc1394/linux/capture.c ---- libdc1394-2.2.0.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/linux/capture.c libdc1394-2.2.1/dc1394/linux/capture.c +--- libdc1394-2.2.1.orig/dc1394/linux/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/linux/capture.c 2011-08-29 10:01:52.568014987 +0200 @@ -43,13 +43,14 @@ #include "kernel-video1394.h" #include "linux.h" @@ -1666,9 +1666,9 @@ dc1394_linux_capture_get_fileno (platform_camera_t * craw) { return craw->capture.dma_fd; -diff -urN libdc1394-2.2.0.orig/dc1394/linux/control.c libdc1394-2.2.0/dc1394/linux/control.c ---- libdc1394-2.2.0.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 -+++ libdc1394-2.2.0/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/linux/control.c libdc1394-2.2.1/dc1394/linux/control.c +--- libdc1394-2.2.1.orig/dc1394/linux/control.c 2011-08-29 09:58:17.275211906 +0200 ++++ libdc1394-2.2.1/dc1394/linux/control.c 2011-08-29 10:01:52.568014987 +0200 @@ -40,6 +40,7 @@ #include "linux.h" #include "offsets.h" @@ -1686,9 +1686,9 @@ linux_init(dc1394_t * d) { register_platform (d, &linux_dispatch, "linux"); -diff -urN libdc1394-2.2.0.orig/dc1394/log.c libdc1394-2.2.0/dc1394/log.c ---- libdc1394-2.2.0.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.2.0/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/log.c libdc1394-2.2.1/dc1394/log.c +--- libdc1394-2.2.1.orig/dc1394/log.c 2011-08-29 09:58:17.277211906 +0200 ++++ libdc1394-2.2.1/dc1394/log.c 2011-08-29 10:01:52.568014987 +0200 @@ -24,6 +24,7 @@ #include "log.h" #include <stdarg.h> @@ -1742,9 +1742,9 @@ { char string[1024]; if (system_debuglog_handler != NULL) { -diff -urN libdc1394-2.2.0.orig/dc1394/register.c libdc1394-2.2.0/dc1394/register.c ---- libdc1394-2.2.0.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 -+++ libdc1394-2.2.0/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/register.c libdc1394-2.2.1/dc1394/register.c +--- libdc1394-2.2.1.orig/dc1394/register.c 2011-08-29 09:58:17.277211906 +0200 ++++ libdc1394-2.2.1/dc1394/register.c 2011-08-29 10:01:52.568014987 +0200 @@ -27,6 +27,7 @@ #include "register.h" #include "utils.h" @@ -1913,9 +1913,9 @@ dc1394_set_strobe_register(dc1394camera_t *camera, uint64_t offset, uint32_t value) { -diff -urN libdc1394-2.2.0.orig/dc1394/usb/capture.c libdc1394-2.2.0/dc1394/usb/capture.c ---- libdc1394-2.2.0.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/usb/capture.c libdc1394-2.2.1/dc1394/usb/capture.c +--- libdc1394-2.2.1.orig/dc1394/usb/capture.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/usb/capture.c 2011-08-29 10:01:52.568014987 +0200 @@ -28,6 +28,7 @@ #include <unistd.h> @@ -1978,9 +1978,9 @@ dc1394_usb_capture_is_frame_corrupt (platform_camera_t * craw, dc1394video_frame_t * frame) { -diff -urN libdc1394-2.2.0.orig/dc1394/usb/control.c libdc1394-2.2.0/dc1394/usb/control.c ---- libdc1394-2.2.0.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/usb/control.c libdc1394-2.2.1/dc1394/usb/control.c +--- libdc1394-2.2.1.orig/dc1394/usb/control.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/usb/control.c 2011-08-29 10:01:52.569014987 +0200 @@ -29,7 +29,7 @@ #include "platform.h" #include "internal.h" @@ -1999,9 +1999,9 @@ dc1394_usb_init(dc1394_t * d) { register_platform (d, &usb_dispatch, "usb"); -diff -urN libdc1394-2.2.0.orig/dc1394/utils.c libdc1394-2.2.0/dc1394/utils.c ---- libdc1394-2.2.0.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 -+++ libdc1394-2.2.0/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/utils.c libdc1394-2.2.1/dc1394/utils.c +--- libdc1394-2.2.1.orig/dc1394/utils.c 2011-08-29 09:58:17.274211906 +0200 ++++ libdc1394-2.2.1/dc1394/utils.c 2011-08-29 10:01:52.569014987 +0200 @@ -21,6 +21,7 @@ */ @@ -2112,9 +2112,9 @@ dc1394_checksum_crc16 (const uint8_t* buffer, uint32_t buffer_size) { uint32_t i, j, c, bit; -diff -urN libdc1394-2.2.0.orig/dc1394/vendor/avt.c libdc1394-2.2.0/dc1394/vendor/avt.c ---- libdc1394-2.2.0.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/vendor/avt.c libdc1394-2.2.1/dc1394/vendor/avt.c +--- libdc1394-2.2.1.orig/dc1394/vendor/avt.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/vendor/avt.c 2011-08-29 10:01:52.569014987 +0200 @@ -26,6 +26,7 @@ #include <stdlib.h> #include <string.h> @@ -2609,9 +2609,9 @@ { dc1394error_t err; uint32_t curval; -diff -urN libdc1394-2.2.0.orig/dc1394/vendor/basler.c libdc1394-2.2.0/dc1394/vendor/basler.c ---- libdc1394-2.2.0.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 -+++ libdc1394-2.2.0/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/vendor/basler.c libdc1394-2.2.1/dc1394/vendor/basler.c +--- libdc1394-2.2.1.orig/dc1394/vendor/basler.c 2011-08-29 09:58:17.276211906 +0200 ++++ libdc1394-2.2.1/dc1394/vendor/basler.c 2011-08-29 10:01:52.569014987 +0200 @@ -30,6 +30,7 @@ #include "../control.h" #include "basler.h" @@ -2719,9 +2719,9 @@ { dc1394basler_sff_t chunk; dc1394bool_t found = DC1394_FALSE; -diff -urN libdc1394-2.2.0.orig/dc1394/visibility.h libdc1394-2.2.0/dc1394/visibility.h ---- libdc1394-2.2.0.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 -+++ libdc1394-2.2.0/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 +diff -urN libdc1394-2.2.1.orig/dc1394/visibility.h libdc1394-2.2.1/dc1394/visibility.h +--- libdc1394-2.2.1.orig/dc1394/visibility.h 1970-01-01 01:00:00.000000000 +0100 ++++ libdc1394-2.2.1/dc1394/visibility.h 2011-08-29 10:01:52.570014987 +0200 @@ -0,0 +1,31 @@ + +#ifndef __DC1394_VISIBILITY_H__ ++++++ libdc1394.ac.patch ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:08.000000000 +0100 @@ -1,5 +1,5 @@ ---- a/libdc1394-2.2.0/configure.in 2009-11-23 10:11:16.000000000 +0300 -+++ b/libdc1394-2.2.0/configure.in 2009-11-23 10:11:51.000000000 +0300 +--- a/libdc1394-2.2.1/configure.in 2009-11-23 10:11:16.000000000 +0300 ++++ b/libdc1394-2.2.1/configure.in 2009-11-23 10:11:51.000000000 +0300 @@ -6,12 +6,6 @@ AC_CANONICAL_SYSTEM ++++++ libdc1394.no-x11.patch ++++++ --- /var/tmp/diff_new_pack.KJ0DXM/_old 2013-03-01 07:24:08.000000000 +0100 +++ /var/tmp/diff_new_pack.KJ0DXM/_new 2013-03-01 07:24:08.000000000 +0100 @@ -1,20 +1,5 @@ ---- - libdc1394-1.2.2/examples/Makefile.am | 2 +- - libdc1394-2.0.2/configure.in | 34 +++++++++++++++++++++------------- - 2 files changed, 22 insertions(+), 14 deletions(-) - ---- a/libdc1394-1.2.2/examples/Makefile.am -+++ b/libdc1394-1.2.2/examples/Makefile.am -@@ -1,6 +1,6 @@ - MAINTAINERCLEANFILES = Makefile.in - bin_PROGRAMS = dc1394_vloopback --noinst_PROGRAMS = grab_gray_image grab_partial_image dc1394_multiview grab_color_image -+noinst_PROGRAMS = grab_gray_image grab_partial_image grab_color_image - - grab_gray_image_SOURCES = grab_gray_image.c - grab_gray_image_LDADD = ../libdc1394/libdc1394_control.la -lraw1394 ---- a/libdc1394-2.2.0/configure.in -+++ b/libdc1394-2.2.0/configure.in +--- a/libdc1394-2.2.1/configure.in ++++ b/libdc1394-2.2.1/configure.in @@ -102,21 +102,30 @@ # check for Xv extensions (necessary for examples/dc1394_multiview) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ksh for openSUSE:Factory
by root＠hilbert.suse.de 01 Mar '13

01 Mar '13

Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2013-03-01 07:23:46 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksh (Old) and /work/SRC/openSUSE:Factory/.ksh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksh", Maintainer is "werner(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/ksh/ksh.changes 2013-02-17 17:04:18.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2013-03-01 07:23:47.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Feb 28 13:10:09 UTC 2013 - werner(a)suse.de + +- Add patch ksh93-heredoclex.dif: substitution in here-document + results in syntax error (bnc#804998) + +------------------------------------------------------------------- New: ---- ksh93-heredoclex.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.nE4vvC/_old 2013-03-01 07:23:48.000000000 +0100 +++ /var/tmp/diff_new_pack.nE4vvC/_new 2013-03-01 07:23:48.000000000 +0100 @@ -122,6 +122,8 @@ Patch30: ksh93-pathtemp.dif # PATCH-FIX-UPSTREAM ksh93-dttree-crash.dif [bnc#795324] Patch31: ksh93-dttree-crash.dif +# PATCH-FIX-UPSTREAM ksh93-heredoclex.dif [bnc#804998] +Patch32: ksh93-heredoclex.dif Patch42: ksh-locale.patch %description @@ -207,6 +209,7 @@ %patch29 %patch30 %patch31 +%patch32 %build # ++++++ ksh93-heredoclex.dif ++++++ --- src/cmd/ksh93/sh/lex.c +++ src/cmd/ksh93/sh/lex.c 2013-02-26 12:21:11.618820739 +0100 @@ -1559,6 +1559,7 @@ static int comsub(register Lex_t *lp, in register int line=lp->sh->inlineno; char *first,*cp=fcseek(0),word[5]; int off, messages=0, assignok=lp->assignok, csub; + struct ionod *inheredoc = lp->heredoc; struct lexstate save; save = lp->lex; csub = lp->comsub; @@ -1683,7 +1684,7 @@ done: lp->lexd.dolparen--; lp->lex = save; lp->assignok = (endchar(lp)==RBRACT?assignok:0); - if(lp->heredoc) + if(lp->heredoc && !inheredoc) errormsg(SH_DICT,ERROR_exit(SYNBAD),e_lexsyntax5,lp->sh->inlineno,lp->heredoc->ioname); return(messages); } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0