December 2012 - openSUSE Commits - openSUSE Mailing Lists

commit libnl-1_1 for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libnl-1_1 for openSUSE:Factory checked in at 2012-12-28 22:44:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libnl-1_1 (Old) and /work/SRC/openSUSE:Factory/.libnl-1_1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libnl-1_1", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libnl-1_1/libnl-1_1.changes 2012-01-06 11:45:29.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libnl-1_1.new/libnl-1_1.changes 2012-12-28 22:44:30.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Dec 19 10:04:54 UTC 2012 - jengelh(a)inai.de + +- Have package build successfully with non-SUSE + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnl-1_1.spec ++++++ --- /var/tmp/diff_new_pack.6VVtcM/_old 2012-12-28 22:44:31.000000000 +0100 +++ /var/tmp/diff_new_pack.6VVtcM/_new 2012-12-28 22:44:31.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libnl-1_1 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,14 +16,13 @@ # - Name: libnl-1_1 %define lname libnl-1_1-1 Summary: Convenience library for kernel netlink sockets -Group: Development/Libraries/Other License: LGPL-2.1 +Group: Development/Libraries/Other Version: 1.1 -Release: 1 +Release: 0 # bug437293 %ifarch ppc64 Obsoletes: libnl-64bit @@ -34,7 +33,16 @@ Source99: baselibs.conf Patch0: libnl-1.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: pkgconfig >= 0.23 +%if 0%{?suse_version} >= 1140 +BuildRequires: linux-glibc-devel >= 2.6.23 +%endif +%if 0%{?suse_version} && 0%{?suse_version} <= 1110 +BuildRequires: linux-kernel-headers >= 2.6.23 +%endif +%if 0%{?rhel_version} || 0%{?centos_version} || 0%{?fedora_version} +BuildRequires: kernel-headers >= 2.6.23 +%endif +BuildRequires: pkgconfig >= 0.21 # Added for 12.1 Obsoletes: libnl < %version-%release Provides: libnl = %version-%release @@ -45,6 +53,7 @@ %package -n %lname Summary: Convenience library for working with Netlink sockets +License: LGPL-2.1 Group: System/Libraries %description -n %lname @@ -52,8 +61,8 @@ netlink protocol based Linux kernel interfaces. %package devel -License: LGPL-2.1+ Summary: Convenience library for kernel netlink sockets +License: LGPL-2.1+ Group: Development/Libraries/Other Requires: %name = %version-%release # bug437293 @@ -79,7 +88,7 @@ make %{?_smp_mflags} %install -%makeinstall +make install DESTDIR="%buildroot" mkdir -p %buildroot/%_libdir/pkgconfig mv %buildroot/%_lib/pkgconfig/* %buildroot/%_libdir/pkgconfig -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libmspub for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libmspub for openSUSE:Factory checked in at 2012-12-28 22:44:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmspub (Old) and /work/SRC/openSUSE:Factory/.libmspub.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libmspub", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.libmspub.new/libmspub.changes 2012-12-28 22:44:18.000000000 +0100 @@ -0,0 +1,25 @@ +------------------------------------------------------------------- +Thu Nov 29 20:38:55 UTC 2012 - tchvatal(a)suse.com + +- Update the whitespacing and order + +------------------------------------------------------------------- +Thu Nov 29 11:05:06 UTC 2012 - tchvatal(a)suse.com + +- Version bump to 0.0.3 + * cleanup the license string + * disable werror explicitely + * fdupe duped images + +------------------------------------------------------------------- +Mon Aug 6 11:26:50 CEST 2012 - fridrich.strba(a)suse.com + +- Upgrade to upstream version 0.0.2 + * support of MS Publisher versions 98 to 2002 + * extended coverage of autoshapes for version 2003 + +------------------------------------------------------------------- +Mon Jun 4 14:52:32 CEST 2012 - fridrich.strba(a)suse.com + +- Initial package of libmspub + New: ---- libmspub-0.0.3.tar.xz libmspub.changes libmspub.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmspub.spec ++++++ # # spec file for package libmspub # # Copyright (c) 2012 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libmspub # note: the main package is empty, it only sets a sane name for the source rpm %if 0%{?suse_version} > 1020 %define build_doc 1 BuildRequires: doxygen %else %define build_doc 0 %endif BuildRequires: boost-devel gcc-c++ pkgconfig xz zlib-devel BuildRequires: libwpd-devel >= 0.9.0 libwpg-devel >= 0.2.0 BuildRequires: fdupes Summary: Microsoft Publisher file format parser library Version: 0.0.3 Release: 0 License: LGPL-2.1+ or GPL-2.0+ or MPL-1.1 Group: Productivity/Publishing/Word Url: http://www.freedesktop.org/wiki/Software/libmspub Source: http://dev-www.libreoffice.org/src/libmspub-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %description libmspub is a library for parsing the Microsoft Publisher file format structure. %define libname libmspub-0_0-0 %package -n %libname Summary: Microsoft Publisher file format parser library Group: System/Libraries %description -n %libname libmspub is a library for parsing the Corel Draw file format structure. It is cross-platform, at the moment it can be build on Microsoft Windows and Linux. %package devel Summary: Files for Developing with libmspub Group: Development/Libraries/C and C++ Requires: %libname = %version libwpd-devel libwpg-devel %description devel libmspub is a library for parsing the Microsoft Publisher file format structure. This package contains the libmspub development files. %if %build_doc %package devel-doc Summary: Documentation for the libmspub API Group: Documentation/HTML %description devel-doc This package contains documentation for the libmspub API. %endif %package tools Summary: Tools to work with publications in Microsoft Publisher file-format Group: Productivity/Publishing/Word %description tools Command line tools to work with publications in Microsoft Publisher file-format. %prep %setup -q %build %configure \ --disable-werror \ --disable-static \ --docdir=%_docdir/%name make %{?_smp_mflags} %install make DESTDIR=$RPM_BUILD_ROOT install rm $RPM_BUILD_ROOT%_libdir/*.la # documentation mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name} cp -p AUTHORS COPYING.* ChangeLog $RPM_BUILD_ROOT%{_docdir}/%{name} # docs have duped pictures %fdupes $RPM_BUILD_ROOT %post -n %libname -p /sbin/ldconfig %postun -n %libname -p /sbin/ldconfig %files -n %libname %defattr(-,root,root) %{_libdir}/*.so.* %files devel %defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/libmspub*.pc %{_includedir}/libmspub-* %if %build_doc != 0 %files devel-doc %defattr(-,root,root,-) %doc %{_docdir}/%{name}/html %endif %files tools %defattr(-,root,root) %{_bindir}/* %doc %dir %{_docdir}/%{name} %doc %{_docdir}/%{name}/[A-Z]* %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 libkgapi for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2012-12-28 22:44:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libkgapi", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2012-10-24 07:13:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libkgapi.new/libkgapi.changes 2012-12-28 22:44:09.000000000 +0100 @@ -1,0 +2,9 @@ +Wed Dec 19 15:17:01 UTC 2012 - nico.kruber(a)gmail.com + +- Update to 0.4.4 + * fixed kde#309314 - Contacts with XML-unsafe characters not stored + * fixed kde#309318 - Support custom IM protocols + * fixed kde#310177 - Support birthday dates without year specified + * fixed kde#310851 - Handle Microsoft TZIDs + +------------------------------------------------------------------- Old: ---- libkgapi-0.4.3.tar.bz2 New: ---- libkgapi-0.4.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.LsuNnI/_old 2012-12-28 22:44:10.000000000 +0100 +++ /var/tmp/diff_new_pack.LsuNnI/_new 2012-12-28 22:44:10.000000000 +0100 @@ -17,7 +17,7 @@ Name: libkgapi -Version: 0.4.3 +Version: 0.4.4 Release: 0 Summary: Extension for accessing your Google data License: GPL-2.0+ ++++++ libkgapi-0.4.3.tar.bz2 -> libkgapi-0.4.4.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-0.4.3/CMakeLists.txt new/libkgapi-0.4.4/CMakeLists.txt --- old/libkgapi-0.4.3/CMakeLists.txt 2012-10-21 18:11:23.000000000 +0200 +++ new/libkgapi-0.4.4/CMakeLists.txt 2012-12-16 19:23:52.000000000 +0100 @@ -1,8 +1,8 @@ project(libkgapi) set(KGAPI_VERSION_MAJOR 0) set(KGAPI_VERSION_MINOR 4) -set(KGAPI_VERSION_RELEASE 3) -set(KGAPI_VERSION 0.4.3) +set(KGAPI_VERSION_RELEASE 4) +set(KGAPI_VERSION 0.4.4) cmake_minimum_required(VERSION 2.8) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-0.4.3/libkgapi/objects/contact.cpp new/libkgapi-0.4.4/libkgapi/objects/contact.cpp --- old/libkgapi-0.4.3/libkgapi/objects/contact.cpp 2012-10-21 18:11:23.000000000 +0200 +++ new/libkgapi-0.4.4/libkgapi/objects/contact.cpp 2012-12-16 19:23:52.000000000 +0100 @@ -258,10 +258,10 @@ case AIM: return "AIM"; default: - return "OTHER"; + return "Other"; } - return "OTHER"; + return "Other"; } QString Contact::IMSchemeToProtocolName(const QString& scheme) @@ -274,11 +274,21 @@ QString proto; if (protocolName.toUpper() == "XMPP") { proto = "JABBER"; - } else { + } else if ((protocolName.toUpper() == QLatin1String("ICQ")) || + (protocolName.toUpper() == QLatin1String("GOOGLE_TALK")) || + (protocolName.toUpper() == QLatin1String("QQ")) || + (protocolName.toUpper() == QLatin1String("SKYPE")) || + (protocolName.toUpper() == QLatin1String("YAHOO")) || + (protocolName.toUpper() == QLatin1String("MSN")) || + (protocolName.toUpper() == QLatin1String("AIM"))) + { proto = protocolName.toUpper(); + return SCHEME_URL + proto; } - return SCHEME_URL + proto; + /* If the protocolName is not officially supported by Google, then instead + * of full scheme, Google expects just a name of the protocol. */ + return protocolName; } Contact::IMProtocol Contact::IMSchemeToProtocol(const QString& scheme) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-0.4.3/libkgapi/services/calendar.cpp new/libkgapi-0.4.4/libkgapi/services/calendar.cpp --- old/libkgapi-0.4.3/libkgapi/services/calendar.cpp 2012-10-21 18:11:23.000000000 +0200 +++ new/libkgapi-0.4.4/libkgapi/services/calendar.cpp 2012-12-16 19:23:52.000000000 +0100 @@ -63,6 +63,22 @@ static KGAPI::Object* JSONToEvent(const QVariantMap& event); static QVariantMap eventToJSON(KGAPI::Object *event); static QList<KGAPI::Object*> parseEventJSONFeed(const QVariantList& feed); + + /** + * Checks whether TZID is in Olson format and converts it to it if neccessary + * + * This is mainly to handle crazy Microsoft TZIDs like + * "(GMT) Greenwich Mean Time/Dublin/Edinburgh/London", because Google only + * accepts TZIDs in Olson format ("Europe/London"). + * + * It first tries to match the given \p tzid to all TZIDs in KTimeZones::zones(). + * If it fails, it parses the \p event, looking for X-MICROSOFT-CDO-TZID + * property and than matches it to Olson-formatted TZID using a table. + * + * When the method fails to process the TZID, it returns the original \p tzid + * in hope, that Google will cope with it. + */ + static QString checkAndConverCDOTZID(const QString &tzid, const Objects::Event *event); }; } @@ -627,7 +643,7 @@ tzStart = KTimeZone::utc().name(); } if (!tzStart.isEmpty()) { - start["timeZone"] = tzStart; + start["timeZone"] = checkAndConverCDOTZID(tzStart, object); } data["start"] = start; @@ -646,7 +662,7 @@ tzEnd = KTimeZone::utc().name(); } if (!tzEnd.isEmpty()) { - end["timeZone"] = tzEnd; + end["timeZone"] = checkAndConverCDOTZID(tzEnd, object); } data["end"] = end; @@ -794,3 +810,176 @@ return list; } + + +static QMap<int, QString> initMSCDOTZIDTable() +{ + QMap<int, QString> map; + + /* Based on "Time Zone to CdoTimeZoneId Map" + * http://msdn.microsoft.com/en-us/library/aa563018%28loband%29.aspx + * + * The mapping is not exact, since the CdoTimeZoneId usually refers to a + * region of multiple countries, so I always picked one of the countries + * in the specified region and used it's TZID. + */ + map.insert(0, QLatin1String("UTC")); + map.insert(1, QLatin1String("Europe/London")); /* GMT Greenwich Mean Time; Dublin, Edinburgh, London */ + /* Seriously? *sigh* Let's handle these two in checkAndConvertCDOTZID() */ + //map.insertMulti(2, QLatin1String("Europe/Lisbon")); /* GMT Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London */ + //map.insertMulti(2, QLatin1String("Europe/Sarajevo")); /* GMT+01:00 Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb */ + map.insert(3, QLatin1String("Europe/Paris")); /* GMT+01:00 Paris, Madrid, Brussels, Copenhagen */ + map.insert(4, QLatin1String("Europe/Berlin")); /* GMT+01:00 Amsterdam, Berlin, Bern, Rome, Stockholm, Vienna */ + map.insert(5, QLatin1String("Europe/Bucharest")); /* GMT+02:00 Bucharest */ + map.insert(6, QLatin1String("Europe/Prague")); /* GMT+01:00 Prague, Central Europe */ + map.insert(7, QLatin1String("Europe/Athens")); /* GMT+02:00 Athens, Istanbul, Minsk */ + map.insert(8, QLatin1String("America/Brazil")); /* GMT-03:00 Brasilia */ + map.insert(9, QLatin1String("America/Halifax")); /* GMT-04:00 Atlantic time (Canada) */ + map.insert(10, QLatin1String("America/New_York")); /* GMT-05:00 Eastern Time (US & Canada) */ + map.insert(11, QLatin1String("America/Chicago")); /* GMT-06:00 Central Time (US & Canada) */ + map.insert(12, QLatin1String("America/Denver")); /* GMT-07:00 Mountain Time (US & Canada) */ + map.insert(13, QLatin1String("America/Los_Angeles")); /* GMT-08:00 Pacific Time (US & Canada); Tijuana */ + map.insert(14, QLatin1String("America/Anchorage")); /* GMT-09:00 Alaska */ + map.insert(15, QLatin1String("Pacific/Honolulu")); /* GMT-10:00 Hawaii */ + map.insert(16, QLatin1String("Pacific/Apia")); /* GMT-11:00 Midway Island, Samoa */ + map.insert(17, QLatin1String("Pacific/Auckland")); /* GMT+12:00 Auckland, Wellington */ + map.insert(18, QLatin1String("Australia/Brisbane")); /* GMT+10:00 Brisbane, East Australia */ + map.insert(19, QLatin1String("Australia/Adelaide")); /* GMT+09:30 Adelaide, Central Australia */ + map.insert(20, QLatin1String("Asia/Tokyo")); /* GMT+09:00 Osaka, Sapporo, Tokyo */ + map.insert(21, QLatin1String("Asia/Singapore")); /* GMT+08:00 Kuala Lumpur, Singapore */ + map.insert(22, QLatin1String("Asia/Bangkok")); /* GMT+07:00 Bangkok, Hanoi, Jakarta */ + map.insert(23, QLatin1String("Asia/Calcutta")); /* GMT+05:30 Kolkata, Chennai, Mumbai, New Delhi, India Standard Time */ + map.insert(24, QLatin1String("Asia/Dubai")); /* GMT+04:00 Abu Dhabi, Muscat */ + map.insert(25, QLatin1String("Asia/Tehran")); /* GMT+03:30 Tehran */ + map.insert(26, QLatin1String("Asia/Baghdad")); /* GMT+03:00 Baghdad */ + map.insert(27, QLatin1String("Asia/Jerusalem")); /* GMT+02:00 Israel, Jerusalem Standard Time */ + map.insert(28, QLatin1String("America/St_Johns")); /* GMT-03:30 Newfoundland */ + map.insert(29, QLatin1String("Atlantic/Portugal")); /* GMT-01:00 Azores */ + map.insert(30, QLatin1String("America/Noronha")); /* GMT-02:00 Mid-Atlantic */ + map.insert(31, QLatin1String("Africa/Monrovia")); /* GMT Casablanca, Monrovia */ + map.insert(32, QLatin1String("America/Argentina/Buenos_Aires")); /* GMT-03:00 Buenos Aires, Georgetown */ + map.insert(33, QLatin1String("America/La_Paz")); /* GMT-04:00 Caracas, La Paz */ + map.insert(34, QLatin1String("America/New_York")); /* GMT-05:00 Indiana (East) */ + map.insert(35, QLatin1String("America/Bogota")); /* GMT-05:00 Bogota, Lima, Quito */ + map.insert(36, QLatin1String("America/Winnipeg")); /* GMT-06:00 Saskatchewan */ + map.insert(37, QLatin1String("America/Mexico_City")); /* GMT-06:00 Mexico City, Tegucigalpa */ + map.insert(38, QLatin1String("America/Phoenix")); /* GMT-07:00 Arizona */ + map.insert(39, QLatin1String("Pacific/Kwajalein")); /* GMT-12:00 Eniwetok, Kwajalein, Dateline Time */ + map.insert(40, QLatin1String("Pacific/Fiji")); /* GMT+12:00 Fušál, Kamchatka, Mashall Is. */ + map.insert(41, QLatin1String("Pacific/Noumea")); /* GMT+11:00 Magadan, Solomon Is., New Caledonia */ + map.insert(42, QLatin1String("Australia/Hobart")); /* GMT+10:00 Hobart, Tasmania */ + map.insert(43, QLatin1String("Pacific/Guam")); /* GMT+10:00 Guam, Port Moresby */ + map.insert(44, QLatin1String("Australia/Darwin")); /* GMT+09:30 Darwin */ + map.insert(45, QLatin1String("Asia/Shanghai")); /* GMT+08:00 Beijing, Chongqing, Hong Kong SAR, Urumqi */ + map.insert(46, QLatin1String("Asia/Omsk")); /* GMT+06:00 Almaty, Novosibirsk, North Central Asia */ + map.insert(47, QLatin1String("Asia/Karachi")); /* GMT+05:00 Islamabad, Karachi, Tashkent */ + map.insert(48, QLatin1String("Asia/Kabul")); /* GMT+04:30 Kabul */ + map.insert(49, QLatin1String("Africa/Cairo")); /* GMT+02:00 Cairo */ + map.insert(50, QLatin1String("Africa/Harare")); /* GMT+02:00 Harare, Pretoria */ + map.insert(51, QLatin1String("Europe/Moscow")); /* GMT+03:00 Moscow, St. Petersburg, Volgograd */ + map.insert(53, QLatin1String("Atlantic/Cape_Verde")); /* GMT-01:00 Cape Verde Is. */ + map.insert(54, QLatin1String("Asia/Tbilisi")); /* GMT+04:00 Baku, Tbilisi, Yerevan */ + map.insert(55, QLatin1String("America/Tegucigalpa")); /* GMT-06:00 Central America */ + map.insert(56, QLatin1String("Africa/Nairobi")); /* GMT+03:00 East Africa, Nairobi */ + map.insert(58, QLatin1String("Asia/Yekaterinburg")); /* GMT+05:00 Ekaterinburg */ + map.insert(59, QLatin1String("Europe/Helsinki")); /* GMT+02:00 Helsinki, Riga, Tallinn */ + map.insert(60, QLatin1String("America/Greenland")); /* GMT-03:00 Greenland */ + map.insert(61, QLatin1String("Asia/Rangoon")); /* GMT+06:30 Yangon (Rangoon) */ + map.insert(62, QLatin1String("Asia/Katmandu")); /* GMT+05:45 Kathmandu, Nepal */ + map.insert(63, QLatin1String("Asia/Irkutsk")); /* GMT+08:00 Irkutsk, Ulaan Bataar */ + map.insert(64, QLatin1String("Asia/Krasnoyarsk")); /* GMT+07:00 Krasnoyarsk */ + map.insert(65, QLatin1String("America/Santiago")); /* GMT-04:00 Santiago */ + map.insert(66, QLatin1String("Asia/Colombo")); /* GMT+06:00 Sri Jayawardenepura, Sri Lanka */ + map.insert(67, QLatin1String("Pacific/Tongatapu")); /* GMT+13:00 Nuku'alofa, Tonga */ + map.insert(68, QLatin1String("Asia/Vladivostok")); /* GMT+10:00 Vladivostok */ + map.insert(69, QLatin1String("Africa/Bangui")); /* GMT+01:00 West Central Africa */ + map.insert(70, QLatin1String("Asia/Yakutsk")); /* GMT+09:00 Yakutsk */ + map.insert(71, QLatin1String("Asia/Dhaka")); /* GMT+06:00 Astana, Dhaka */ + map.insert(72, QLatin1String("Asia/Seoul")); /* GMT+09:00 Seoul, Korea Standard time */ + map.insert(73, QLatin1String("Australia/Perth")); /* GMT+08:00 Perth, Western Australia */ + map.insert(74, QLatin1String("Asia/Kuwait")); /* GMT+03:00 Arab, Kuwait, Riyadh */ + map.insert(75, QLatin1String("Asia/Taipei")); /* GMT+08:00 Taipei */ + map.insert(76, QLatin1String("Australia/Sydney")); /* GMT+10:00 Canberra, Melbourne, Sydney */ + + return map; +} + +static const QMap<int, QString> MSCDOTZIDTable = initMSCDOTZIDTable(); + +QString Services::CalendarPrivate::checkAndConverCDOTZID(const QString& tzid, const Objects::Event* event) +{ + /* Try to match the @tzid to any valid timezone we know. */ + KTimeZones timeZones; + const KTimeZones::ZoneMap zones = timeZones.zones(); + KTimeZones::ZoneMap::const_iterator iter; + for (iter = zones.constBegin(); iter != zones.constEnd(); iter++) { + if (iter.key() == tzid) { + /* Yay, @tzid is a valid TZID in Olson format */ + return tzid; + } + } + + /* Damn, no match. Parse the iCal and try to find X-MICROSOFT-CDO-TZID + * property that we can match against the MSCDOTZIDTable */ + ICalFormat format; + /* Use a copy of @event, otherwise it would be deleted when ptr is destroyed */ + Incidence::Ptr ptr(new Event(*dynamic_cast<const Event*>(event))); + const QString vcard = format.toICalString(ptr); + const QStringList properties = vcard.split(QLatin1Char('\n')); + int CDOId = -1; + Q_FOREACH(const QString &property, properties) { + if (property.startsWith(QLatin1String("X-MICROSOFT-CDO-TZID"))) { + QStringList parsed = property.split(QLatin1Char(':')); + if (parsed.length() != 2) { + /* Fail */ + return tzid; + } + + CDOId = parsed.at(1).toInt(); + break; + } + } + + /* Wheeee, we have X-MICROSOFT-CDO-TZID, try to map it to Olson format */ + if (CDOId > -1) { + + /* *sigh* Some expert in MS assigned the same ID to two two different timezones... */ + if (CDOId == 2) { + + /* GMT Greenwich Mean Time: Dublin, Edinburgh, Lisbon, London */ + if (tzid.contains(QLatin1String("Dublin")) || + tzid.contains(QLatin1String("Edinburgh")) || + tzid.contains(QLatin1String("Lisbon")) || + tzid.contains(QLatin1String("London"))) + { + return QLatin1String("Europe/London"); + } + + /* GMT+01:00 Sarajevo, Skopje, Sofija, Vilnius, Warsaw, Zagreb */ + else if (tzid.contains(QLatin1String("Sarajevo")) || + tzid.contains(QLatin1String("Skopje")) || + tzid.contains(QLatin1String("Sofija")) || + tzid.contains(QLatin1String("Vilnius")) || + tzid.contains(QLatin1String("Warsaw")) || + tzid.contains(QLatin1String("Zagreb"))) + { + return QLatin1String("Europe/Sarajevo"); + } + + /* This should never ever happen. I don't know what to do if it happens */ + else { + return tzid; + } + } + + if (MSCDOTZIDTable.contains(CDOId)) { + return MSCDOTZIDTable.value(CDOId); + } + } + + /* Fail. The event does not have a valid timezone, does not contain + * X-MICROSOFT-CDO-TZID or we failed to map the CDO-TZID to a real timezone. + * We are screwed. Just return the original TZID and hope Google will accept it + * (though we know they won't) */ + return tzid; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-0.4.3/libkgapi/services/contacts.cpp new/libkgapi-0.4.4/libkgapi/services/contacts.cpp --- old/libkgapi-0.4.3/libkgapi/services/contacts.cpp 2012-10-21 18:11:23.000000000 +0200 +++ new/libkgapi-0.4.4/libkgapi/services/contacts.cpp 2012-12-16 19:23:52.000000000 +0100 @@ -22,6 +22,9 @@ #include <kurl.h> +/* Qt::escape() */ +#include <QTextDocument> + #include <qjson/parser.h> #include <qjson/serializer.h> @@ -527,8 +530,16 @@ /* Birthday */ QVariantMap bDay = data["gContact$birthday"].toMap(); - if (!bDay.isEmpty()) - object->setBirthday(QDateTime::fromString(bDay["when"].toString(), "yyyy-MM-dd")); + if (!bDay.isEmpty()) { + QString birthday = bDay["when"].toString(); + /* Birthdays in format "--MM-DD" are valid and mean that no year has + * been specified. Since KABC does not support birthdays without year, + * we simulate that by specifying a fake year - 1900 */ + if (birthday.startsWith("--")) { + birthday = "1900" + birthday.mid(1); + } + object->setBirthday(QDateTime::fromString(birthday, "yyyy-MM-dd")); + } /* User-defined fields */ QVariantList userDefined = data["gContact$userDefinedField"].toList(); @@ -562,34 +573,34 @@ /* Name */ output.append("<gd:name>"); if (!contact->givenName().isEmpty()) - output.append("<gd:givenName>").append(contact->givenName().toUtf8()).append("</gd:givenName>"); + output.append("<gd:givenName>").append(Qt::escape(contact->givenName()).toUtf8()).append("</gd:givenName>"); if (!contact->familyName().isEmpty()) - output.append("<gd:familyName>").append(contact->familyName().toUtf8()).append("</gd:familyName>"); + output.append("<gd:familyName>").append(Qt::escape(contact->familyName()).toUtf8()).append("</gd:familyName>"); if (!contact->assembledName().isEmpty()) - output.append("<gd:fullName>").append(contact->formattedName().toUtf8()).append("</gd:fullName>"); + output.append("<gd:fullName>").append(Qt::escape(contact->formattedName()).toUtf8()).append("</gd:fullName>"); if (!contact->additionalName().isEmpty()) - output.append("<gd:additionalName>").append(contact->additionalName().toUtf8()).append("</gd:additionalName>"); + output.append("<gd:additionalName>").append(Qt::escape(contact->additionalName()).toUtf8()).append("</gd:additionalName>"); if (!contact->prefix().isEmpty()) - output.append("<gd:namePrefix>").append(contact->prefix().toUtf8()).append("</gd:namePrefix>"); + output.append("<gd:namePrefix>").append(Qt::escape(contact->prefix()).toUtf8()).append("</gd:namePrefix>"); if (!contact->suffix().isEmpty()) - output.append("<gd:nameSuffix>").append(contact->suffix().toUtf8()).append("</gd:nameSuffix>"); + output.append("<gd:nameSuffix>").append(Qt::escape(contact->suffix()).toUtf8()).append("</gd:nameSuffix>"); output.append("</gd:name>"); /* Notes */ if (!contact->note().isEmpty()) - output.append("<atom:content type='text'>").append(contact->note().toUtf8()).append("</atom:content>"); + output.append("<atom:content type='text'>").append(Qt::escape(contact->note()).toUtf8()).append("</atom:content>"); /* Organization (work) */ QByteArray org; QString office = contact->office(); if (!contact->organization().isEmpty()) - org.append("<gd:orgName>").append(contact->organization().toUtf8()).append("</gd:orgName>"); + org.append("<gd:orgName>").append(Qt::escape(contact->organization()).toUtf8()).append("</gd:orgName>"); if (!contact->department().isEmpty()) - org.append("<gd:orgDepartment>").append(contact->department().toUtf8()).append("</gd:orgDepartment>"); + org.append("<gd:orgDepartment>").append(Qt::escape(contact->department()).toUtf8()).append("</gd:orgDepartment>"); if (!contact->title().isEmpty()) - org.append("<gd:orgTitle>").append(contact->title().toUtf8()).append("</gd:orgTitle>"); + org.append("<gd:orgTitle>").append(Qt::escape(contact->title()).toUtf8()).append("</gd:orgTitle>"); if (!office.isEmpty()) { - org.append("<gd:where>").append(office.toUtf8()).append("</gd:where>"); + org.append("<gd:where>").append(Qt::escape(office).toUtf8()).append("</gd:where>"); parsedCustoms << "KADDRESSBOOK-X-Office"; } if (!org.isEmpty()) @@ -597,56 +608,56 @@ /* Nickname */ if (!contact->nickName().isEmpty()) - output.append("<gContact:nickname>").append(contact->nickName().toUtf8()).append("</gContact:nickname>"); + output.append("<gContact:nickname>").append(Qt::escape(contact->nickName()).toUtf8()).append("</gContact:nickname>"); /* Occupation */ if (!contact->profession().isEmpty()) { - output.append("<gContact:occupation>").append(contact->profession().toUtf8()).append("</gContact:occupation>"); + output.append("<gContact:occupation>").append(Qt::escape(contact->profession()).toUtf8()).append("</gContact:occupation>"); parsedCustoms << "KADDRESSBOOK-X-Profession"; } /* Spouse */ QString spouse = contact->spousesName(); if (!spouse.isEmpty()) { - output.append("<gContact:relation rel=\"spouse\">").append(spouse.toUtf8()).append("</gContact:relation>"); + output.append("<gContact:relation rel=\"spouse\">").append(Qt::escape(spouse).toUtf8()).append("</gContact:relation>"); parsedCustoms << "KADDRESSBOOK-X-SpousesName"; } /* Manager */ QString manager = contact->managersName(); if (!manager.isEmpty()) { - output.append("<gContact:relation rel=\"manager\">").append(manager.toUtf8()).append("</gContact:relation>"); + output.append("<gContact:relation rel=\"manager\">").append(Qt::escape(manager).toUtf8()).append("</gContact:relation>"); parsedCustoms << "KADDRESSBOOK-X-ManagersName"; } /* Assistant */ QString assistant = contact->assistantsName(); if (!assistant.isEmpty()) { - output.append("<gContact:relation rel=\"assistant\">").append(assistant.toUtf8()).append("</gContact:relation>"); + output.append("<gContact:relation rel=\"assistant\">").append(Qt::escape(assistant).toUtf8()).append("</gContact:relation>"); parsedCustoms << "KADDRESSBOOK-X-AssistantsName"; } /* Anniversary */ QString anniversary = contact->anniversary(); if (!anniversary.isEmpty()) { - output.append("<gContact:event rel=\"anniversary\"><gd:when startTime=\"").append(anniversary.toUtf8()).append("\" /></gContact:event>"); + output.append("<gContact:event rel=\"anniversary\"><gd:when startTime=\"").append(Qt::escape(anniversary).toUtf8()).append("\" /></gContact:event>"); parsedCustoms << "KADDRESSBOOK-X-Anniversary"; } /* Homepage */ if (!contact->url().isEmpty()) - output.append("<gContact:website rel=\"home-page\" href=\"").append(contact->url().prettyUrl().toUtf8()).append("\" />"); + output.append("<gContact:website rel=\"home-page\" href=\"").append(Qt::escape(contact->url().prettyUrl()).toUtf8()).append("\" />"); /* Blog */ QString blog = contact->blogFeed(); if (!blog.isEmpty()) { - output.append("<gContact:website rel=\"blog\" href=\"").append(blog.toUtf8()).append("\" />"); + output.append("<gContact:website rel=\"blog\" href=\"").append(Qt::escape(blog).toUtf8()).append("\" />"); parsedCustoms << "KADDRESSBOOK-BlogFeed"; } /* Emails */ Q_FOREACH(const QString &email, contact->emails()) { - output.append("<gd:email rel='http://schemas.google.com/g/2005#home' address='").append(email.toUtf8()).append("' />"); + output.append("<gd:email rel='http://schemas.google.com/g/2005#home' address='").append(Qt::escape(email).toUtf8()).append("' />"); } /* IMs */ @@ -660,6 +671,17 @@ bool primary = (contact->custom("KADDRESSBOOK", "X-IMAddress") == value); output.append(im_str.arg(value, Objects::Contact::IMProtocolNameToScheme(proto), (primary ? "true" : "false")).toUtf8()); parsedCustoms << key; + /* X-messaging is probably a new key (?) used by KAddressbook when importing + * contacts from vCard. */ + } else if (im.startsWith(QLatin1String("X-messaging"))) { + const QString key = im.left(im.indexOf(QLatin1Char(':'))); + const QString value = im.mid(im.indexOf(QLatin1Char(':')) + 1); + QString proto = key.mid(12); /* strlen("X-messaging/") */ + if (proto.endsWith(QLatin1String("-All"))) { + proto.chop(4); + } + output.append(im_str.arg(value, proto, QLatin1String("false")).toUtf8()); + parsedCustoms << key; } } parsedCustoms << "KADDRESSBOOK-X-IMAddress"; @@ -677,24 +699,33 @@ .append("'>"); if (!address.locality().isEmpty()) - output.append("<gd:city>").append(address.locality().toUtf8()).append("</gd:city>"); + output.append("<gd:city>").append(Qt::escape(address.locality()).toUtf8()).append("</gd:city>"); if (!address.street().isEmpty()) - output.append("<gd:street>").append(address.street().toUtf8()).append("</gd:street>"); + output.append("<gd:street>").append(Qt::escape(address.street()).toUtf8()).append("</gd:street>"); if (!address.region().isEmpty()) - output.append("<gd:region>").append(address.region().toUtf8()).append("</gd:region>"); + output.append("<gd:region>").append(Qt::escape(address.region()).toUtf8()).append("</gd:region>"); if (!address.postalCode().isEmpty()) - output.append("<gd:postcode>").append(address.postalCode().toUtf8()).append("</gd:postcode>"); + output.append("<gd:postcode>").append(Qt::escape(address.postalCode()).toUtf8()).append("</gd:postcode>"); if (!address.country().isEmpty()) - output.append("<gd:country>").append(address.country().toUtf8()).append("</gd:country>"); + output.append("<gd:country>").append(Qt::escape(address.country()).toUtf8()).append("</gd:country>"); if (!address.formattedAddress().isEmpty()) - output.append("<gd:formattedAddress>").append(address.formattedAddress().toUtf8()).append("</gd:formattedAddress>"); + output.append("<gd:formattedAddress>").append(Qt::escape(address.formattedAddress()).toUtf8()).append("</gd:formattedAddress>"); output.append("</gd:structuredPostalAddress>"); } /* Birthday */ QDate birthday = contact->birthday().date(); if (birthday.isValid()) { - QString birthdayStr = birthday.toString("yyyy-MM-dd"); + QString birthdayStr; + /* We use year 1900 as a fake year for birthdays without a year specified. + * Here we assume that nobody actually has a contact born in 1900 and so + * we replace 1900 by "-", so that we get "--MM-dd" date, which is a valid + * birthday date according to RFC6350 */ + if (birthday.year() == 1900) { + birthdayStr = birthday.toString("--MM-dd"); + } else { + birthdayStr = birthday.toString("yyyy-MM-dd"); + } output.append("<gContact:birthday when='").append(birthdayStr.toUtf8()).append("'/>"); } @@ -715,7 +746,7 @@ QString key = customStr.left(customStr.indexOf(':')); if (!parsedCustoms.contains(key)) { QString value = customStr.mid(customStr.indexOf(':') + 1); - output.append(defined_str.arg(key, value).toUtf8()); + output.append(defined_str.arg(Qt::escape(key), Qt::escape(value)).toUtf8()); } } @@ -730,8 +761,8 @@ output.append("<atom:category scheme=\"http://schemas.google.com/g/2005#kind\" " "term=\"http://schemas.google.com/g/2005#group\"/>"); - output.append("<atom:title type=\"text\">").append(group->title().toUtf8()).append("</atom:title>"); - output.append("<atom:content type=\"text\">").append(group->content().toUtf8()).append("</atom:content>"); + output.append("<atom:title type=\"text\">").append(Qt::escape(group->title()).toUtf8()).append("</atom:title>"); + output.append("<atom:content type=\"text\">").append(Qt::escape(group->content()).toUtf8()).append("</atom:content>"); return output; } @@ -979,7 +1010,14 @@ /* Birthday */ if (e.tagName() == "gContact:birthday") { - contact->setBirthday(QDateTime::fromString(e.attribute("when"), "yyyy-MM-dd")); + QString birthday = e.attribute("when"); + /* Birthdays in format "--MM-DD" are valid and mean that no year has + * been specified. Since KABC does not support birthdays without year, + * we simulate that by specifying a fake year - 1900 */ + if (birthday.startsWith("--")) { + birthday = "1900" + birthday.mid(1); + } + contact->setBirthday(QDateTime::fromString(birthday, "yyyy-MM-dd")); continue; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit freerdp for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package freerdp for openSUSE:Factory checked in at 2012-12-28 22:43:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/freerdp (Old) and /work/SRC/openSUSE:Factory/.freerdp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "freerdp", Maintainer is "LZWang(a)suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/freerdp/freerdp.changes 2012-12-28 15:00:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.freerdp.new/freerdp.changes 2012-12-28 22:43:56.000000000 +0100 @@ -1,0 +2,5 @@ +Fri Dec 28 17:29:45 UTC 2012 - dvaleev(a)suse.com + +- disable SSE2 for powerpc + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ freerdp.spec ++++++ --- /var/tmp/diff_new_pack.qDhYed/_old 2012-12-28 22:43:58.000000000 +0100 +++ /var/tmp/diff_new_pack.qDhYed/_new 2012-12-28 22:43:58.000000000 +0100 @@ -108,7 +108,9 @@ -DWITH_PCSC=ON \ -DWITH_CUPS=ON \ -DWITH_FFMPEG=OFF \ +%ifnarch ppc ppc64 -DWITH_SSE2=ON \ +%endif .. make %{?_smp_mflags} VERBOSE=1 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libgsasl for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libgsasl for openSUSE:Factory checked in at 2012-12-28 15:04:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgsasl (Old) and /work/SRC/openSUSE:Factory/.libgsasl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libgsasl", Maintainer is "gnome-maintainers(a)suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/libgsasl/libgsasl.changes 2012-08-23 16:04:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libgsasl.new/libgsasl.changes 2012-12-28 15:04:03.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Aug 16 21:34:34 UTC 2012 - agraf(a)suse.com + +- fix-arm.patch: Add hack to fix compiling on ARM + +------------------------------------------------------------------- New: ---- fix-arm.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgsasl.spec ++++++ --- /var/tmp/diff_new_pack.WTwzt3/_old 2012-12-28 15:04:04.000000000 +0100 +++ /var/tmp/diff_new_pack.WTwzt3/_new 2012-12-28 15:04:04.000000000 +0100 @@ -21,6 +21,7 @@ Release: 0 Source: %{name}-%{version}.tar.gz Patch1: libgsasl-stdio.h.patch +Patch2: fix-arm.patch Summary: Implementation of the SASL framework and a few common SASL mechanisms License: LGPL-2.1+ and GPL-3.0+ Group: Development/Libraries/C and C++ @@ -85,6 +86,9 @@ %prep %setup -q %patch1 -p1 +%ifarch %arm +%patch2 -p1 +%endif %build %configure --disable-static --with-pic ++++++ fix-arm.patch ++++++ Index: libgsasl-1.6.1/gl/stdint.in.h =================================================================== --- libgsasl-1.6.1.orig/gl/stdint.in.h +++ libgsasl-1.6.1/gl/stdint.in.h @@ -234,8 +234,8 @@ typedef unsigned long long int gl_uint64 #undef uint_fast32_t #undef int_fast64_t #undef uint_fast64_t -typedef long int gl_int_fast8_t; -typedef unsigned long int gl_uint_fast8_t; +typedef signed char gl_int_fast8_t; +typedef unsigned char gl_uint_fast8_t; typedef long int gl_int_fast16_t; typedef unsigned long int gl_uint_fast16_t; typedef long int gl_int_fast32_t; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libcmis for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libcmis for openSUSE:Factory checked in at 2012-12-28 15:03:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libcmis (Old) and /work/SRC/openSUSE:Factory/.libcmis.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libcmis", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-12-21 01:49:00.356010756 +0100 +++ /work/SRC/openSUSE:Factory/.libcmis.new/libcmis.changes 2012-12-28 15:03:53.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Fri Nov 9 12:38:53 UTC 2012 - tchvatal(a)suse.com + +- Fix desc not to contain mention of libexttextcat. + +------------------------------------------------------------------- +Tue Nov 6 13:40:15 UTC 2012 - tchvatal(a)suse.com + +- Initial commit for 0.3.0 release. + New: ---- libcmis-0.3.0.tar.gz libcmis.changes libcmis.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libcmis.spec ++++++ # # spec file for package libcmis # # Copyright (c) 2012 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define libname libcmis-0 Name: libcmis Version: 0.3.0 Release: 0 License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: C++ client library for the CMIS interface Url: http://www.freedesktop.org/wiki/Software/%{name} Group: Productivity/Publishing/Word Source0: %{name}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: boost-devel BuildRequires: cppunit-devel BuildRequires: docbook2X BuildRequires: libcurl-devel BuildRequires: libxml2-devel BuildRequires: libxslt-tools BuildRequires: pkgconfig BuildRoot: %{_tmppath}/%{name}-%{version}-build %description LibCMIS is a C++ client library for the CMIS interface. This allows C++ applications to connect to any ECM behaving as a CMIS server like Alfresco, Nuxeo for the open source ones. %package -n %{libname} Summary: C++ client library for the CMIS interface Group: System/Libraries %description -n %{libname} LibCMIS is a C++ client library for the CMIS interface. This allows C++ applications to connect to any ECM behaving as a CMIS server like Alfresco, Nuxeo for the open source ones. %package devel Summary: Files for Developing with %{name} Group: Development/Libraries/C and C++ Requires: %{libname} = %{version} Requires: libcurl-devel Requires: libxml2-devel %description devel LibCMIS is a C++ client library for the CMIS interface. This allows C++ applications to connect to any ECM behaving as a CMIS server like Alfresco, Nuxeo for the open source ones. This package contains the %{name} development files. %package tools Summary: Tool for connecting to CMIS interface Group: Productivity/Text/Convertors %description tools LibCMIS is a C++ client library for the CMIS interface. This allows C++ applications to connect to any ECM behaving as a CMIS server like Alfresco, Nuxeo for the open source ones. The %{name}-tools package contains the cmis-client proogram that allows you to easily connect to CMIS interfaces. %prep %setup -q %build %configure \ --disable-static \ --disable-werror \ --enable-client \ --enable-tests \ --disable-long-tests \ --docdir=%_docdir/%name make %{?_smp_mflags} %install make DESTDIR=%{buildroot} install rm %{buildroot}%{_libdir}/*.la %post -n %{libname} -p /sbin/ldconfig %postun -n %{libname} -p /sbin/ldconfig %files -n %{libname} %defattr(-,root,root) %{_libdir}/*.so.3* %files devel %defattr(-,root,root) %{_libdir}/*.so %{_libdir}/pkgconfig/%{name}*.pc %{_includedir}/%{name}* %files tools %defattr(-,root,root) %doc AUTHORS COPYING.* README %{_bindir}/* %{_mandir}/man1/cmis-client.1* %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 libavutil for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package libavutil for openSUSE:Factory checked in at 2012-12-28 15:03:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libavutil (Old) and /work/SRC/openSUSE:Factory/.libavutil.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libavutil", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/libavutil/libavutil.changes 2012-10-25 12:10:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libavutil.new/libavutil.changes 2012-12-28 15:03:41.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Dec 16 00:00:00 UTC 2012 - Manfred.Tremmel(a)iiv.de + +- update to 1.0.1 + +------------------------------------------------------------------- Old: ---- ffmpeg-1.0-crippled.tar.bz2 libavutil-1.0-cripple.patch New: ---- ffmpeg-1.0.1-crippled.tar.bz2 libavutil-1.0.1-cripple.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libavutil.spec ++++++ --- /var/tmp/diff_new_pack.dvD0YK/_old 2012-12-28 15:03:42.000000000 +0100 +++ /var/tmp/diff_new_pack.dvD0YK/_new 2012-12-28 15:03:42.000000000 +0100 @@ -19,7 +19,7 @@ %define soname 51 Name: libavutil -Version: 1.0 +Version: 1.0.1 Release: 0 Summary: Utilities library from ffmpeg License: LGPL-3.0+ @@ -29,7 +29,7 @@ Source0: ffmpeg-%{version}-crippled.tar.bz2 Source99: precheckin_cripple_tarball.sh Source100: baselibs.conf -Patch0: libavutil-1.0-cripple.patch +Patch0: libavutil-%{version}-cripple.patch BuildRequires: pkg-config BuildRequires: yasm ++++++ ffmpeg-1.0-crippled.tar.bz2 -> ffmpeg-1.0.1-crippled.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/Doxyfile new/ffmpeg-1.0.1/Doxyfile --- old/ffmpeg-1.0/Doxyfile 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/Doxyfile 2012-12-03 22:17:33.000000000 +0100 @@ -31,7 +31,7 @@ # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.0 +PROJECT_NUMBER = 1.0.1 # With the PROJECT_LOGO tag one can specify an logo or icon that is included # in the documentation. The maximum height of the logo should not exceed 55 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/RELEASE new/ffmpeg-1.0.1/RELEASE --- old/ffmpeg-1.0/RELEASE 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/RELEASE 2012-12-03 22:17:33.000000000 +0100 @@ -1 +1 @@ -1.0.git +1.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/VERSION new/ffmpeg-1.0.1/VERSION --- old/ffmpeg-1.0/VERSION 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/VERSION 2012-12-03 22:17:33.000000000 +0100 @@ -1 +1 @@ -1.0 \ No newline at end of file +1.0.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/configure new/ffmpeg-1.0.1/configure --- old/ffmpeg-1.0/configure 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/configure 2012-12-03 22:17:33.000000000 +0100 @@ -1921,6 +1921,9 @@ super2xsai_filter_deps="gpl" tinterlace_filter_deps="gpl" yadif_filter_deps="gpl" +pixfmts_super2xsai_test_deps="super2xsai_filter" +tinterlace_merge_test_deps="tinterlace_filter" +tinterlace_pad_test_deps="tinterlace_filter" # libraries avdevice_deps="avcodec avformat" @@ -1947,18 +1950,16 @@ # tests colormatrix1_test_deps="colormatrix_filter" colormatrix2_test_deps="colormatrix_filter" -flashsv2_test_deps="zlib" mpg_test_deps="mpeg1system_muxer mpegps_demuxer" -mpng_test_deps="zlib" +png_test_deps="zlib" pp_test_deps="mp_filter" pp2_test_deps="mp_filter" pp3_test_deps="mp_filter" pp4_test_deps="mp_filter" pp5_test_deps="mp_filter" pp6_test_deps="mp_filter" +seek_flashsv_flv_test_deps="zlib" seek_lavf_mxf_d10_test_deps="mxf_d10_test" -zlib_test_deps="zlib" -zmbv_test_deps="zlib" test_deps(){ suf1=$1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/tests/fate/lossless-video.mak new/ffmpeg-1.0.1/tests/fate/lossless-video.mak --- old/ffmpeg-1.0/tests/fate/lossless-video.mak 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/tests/fate/lossless-video.mak 2012-12-03 22:17:35.000000000 +0100 @@ -40,11 +40,13 @@ FATE_LOSSLESS_VIDEO += fate-vble fate-vble: CMD = framecrc -i $(SAMPLES)/vble/flowers-partial-2MB.avi -FATE_LOSSLESS_VIDEO += fate-zlib +FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zlib fate-zlib: CMD = framecrc -i $(SAMPLES)/lcl/zlib-1frame.avi -FATE_LOSSLESS_VIDEO += fate-zerocodec +FATE_LOSSLESS_VIDEO-$(CONFIG_ZLIB) += fate-zerocodec fate-zerocodec: CMD = framecrc -i $(SAMPLES)/zerocodec/sample-zeco.avi +FATE_LOSSLESS_VIDEO += $(FATE_LOSSLESS_VIDEO-yes) + FATE_SAMPLES_FFMPEG += $(FATE_LOSSLESS_VIDEO) fate-lossless-video: $(FATE_LOSSLESS_VIDEO) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/tests/fate/qt.mak new/ffmpeg-1.0.1/tests/fate/qt.mak --- old/ffmpeg-1.0/tests/fate/qt.mak 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/tests/fate/qt.mak 2012-12-03 22:17:35.000000000 +0100 @@ -46,8 +46,10 @@ FATE_QT += fate-svq1 fate-svq1: CMD = framecrc -i $(SAMPLES)/svq1/marymary-shackles.mov -an -t 10 -FATE_QT += fate-svq3 +FATE_QT-$(CONFIG_ZLIB) += fate-svq3 fate-svq3: CMD = framecrc -i $(SAMPLES)/svq3/Vertical400kbit.sorenson3.mov -t 6 -an +FATE_QT += $(FATE_QT-yes) + FATE_SAMPLES_FFMPEG += $(FATE_QT) fate-qt: $(FATE_QT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/tests/fate/screen.mak new/ffmpeg-1.0.1/tests/fate/screen.mak --- old/ffmpeg-1.0/tests/fate/screen.mak 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/tests/fate/screen.mak 2012-12-03 22:17:35.000000000 +0100 @@ -32,7 +32,7 @@ FATE_TSCC += fate-tscc-32bit fate-tscc-32bit: CMD = framecrc -i $(SAMPLES)/tscc/2004-12-17-uebung9-partial.avi -pix_fmt rgb24 -an -FATE_SCREEN += $(FATE_TSCC) +FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_TSCC) fate-tscc: $(FATE_TSCC) FATE_VMNC += fate-vmnc-16bit @@ -56,8 +56,10 @@ FATE_ZMBV += fate-zmbv-32bit fate-zmbv-32bit: CMD = framecrc -i $(SAMPLES)/zmbv/zmbv_32bit.avi -pix_fmt rgb24 -t 25 -FATE_SCREEN += $(FATE_ZMBV) +FATE_SCREEN-$(CONFIG_ZLIB) += $(FATE_ZMBV) fate-zmbv: $(FATE_ZMBV) +FATE_SCREEN += $(FATE_SCREEN-yes) + FATE_SAMPLES_FFMPEG += $(FATE_SCREEN) fate-screen: $(FATE_SCREEN) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/tests/fate/vcodec.mak new/ffmpeg-1.0.1/tests/fate/vcodec.mak --- old/ffmpeg-1.0/tests/fate/vcodec.mak 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/tests/fate/vcodec.mak 2012-12-03 22:17:35.000000000 +0100 @@ -59,12 +59,12 @@ FATE_VCODEC += ffvhuff -FATE_VCODEC += flashsv +FATE_VCODEC-$(CONFIG_ZLIB) += flashsv fate-vsynth%-flashsv: ENCOPTS = -sws_flags neighbor+full_chroma_int fate-vsynth%-flashsv: DECOPTS = -sws_flags area fate-vsynth%-flashsv: FMT = flv -FATE_VCODEC += flashsv2 +FATE_VCODEC-$(CONFIG_ZLIB) += flashsv2 fate-vsynth%-flashsv2: ENCOPTS = -sws_flags neighbor+full_chroma_int -strict experimental -compression_level 0 fate-vsynth%-flashsv2: DECOPTS = -sws_flags area fate-vsynth%-flashsv2: FMT = flv @@ -193,7 +193,7 @@ FATE_VCODEC += msmpeg4v2 fate-vsynth%-msmpeg4v2: ENCOPTS = -qscale 10 -FATE_VCODEC += mpng +FATE_VCODEC-$(CONFIG_ZLIB) += mpng fate-vsynth%-mpng: CODEC = png FATE_VCODEC += msvideo1 @@ -277,8 +277,9 @@ FATE_VCODEC += y41p -FATE_VCODEC += zlib +FATE_VCODEC-$(CONFIG_ZLIB) += zlib +FATE_VCODEC += $(FATE_VCODEC-yes) FATE_VSYNTH1 = $(FATE_VCODEC:%=fate-vsynth1-%) FATE_VSYNTH2 = $(FATE_VCODEC:%=fate-vsynth2-%) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ffmpeg-1.0/tests/fate/video.mak new/ffmpeg-1.0.1/tests/fate/video.mak --- old/ffmpeg-1.0/tests/fate/video.mak 2012-09-28 03:37:35.000000000 +0200 +++ new/ffmpeg-1.0.1/tests/fate/video.mak 2012-12-03 22:17:35.000000000 +0100 @@ -49,7 +49,7 @@ FATE_VIDEO += fate-cljr fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi -FATE_VIDEO += fate-corepng +FATE_VIDEO-$(CONFIG_ZLIB) += fate-corepng fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi FATE_VIDEO += fate-creatureshock-avs @@ -97,7 +97,7 @@ FATE_DXA += fate-dxa-scummvm fate-dxa-scummvm: CMD = framecrc -i $(SAMPLES)/dxa/scummvm.dxa -pix_fmt rgb24 -FATE_VIDEO += $(FATE_DXA) +FATE_VIDEO-$(CONFIG_ZLIB) += $(FATE_DXA) fate-dxa: $(FATE_DXA) FATE_SAMPLES_PCM += fate-film-cvid ++++++ libavutil-1.0-cripple.patch -> libavutil-1.0.1-cripple.patch ++++++ --- /work/SRC/openSUSE:Factory/libavutil/libavutil-1.0-cripple.patch 2012-10-25 12:10:03.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libavutil.new/libavutil-1.0.1-cripple.patch 2012-12-28 15:03:41.000000000 +0100 @@ -1,8 +1,6 @@ -Index: configure -=================================================================== ---- configure.orig -+++ configure -@@ -2046,15 +2046,7 @@ ALT_PP_VER=$ALT_PP_VER_MAJOR.$ALT_PP_VER +--- configure.orig 2012-12-03 22:17:33.000000000 +0100 ++++ configure 2012-12-16 00:28:06.130728867 +0100 +@@ -2047,15 +2047,7 @@ enable $PROGRAM_LIST enable $DOCUMENT_LIST @@ -18,7 +16,7 @@ enable asm enable debug -@@ -2137,18 +2129,6 @@ find_things(){ +@@ -2138,18 +2130,6 @@ sed -n "s/^[^#]*$pattern.*([^,]*, *$[^,]*$$,.*$*).*/\1_$thing/p" "$file" } @@ -37,7 +35,7 @@ ALL_COMPONENTS=" $BSF_LIST $DECODER_LIST -@@ -4233,16 +4213,7 @@ fi +@@ -4234,16 +4214,7 @@ eval echo "${lcname}_VERSION_MAJOR=\$${name}_VERSION_MAJOR" >> config.mak } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kyotocabinet for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package kyotocabinet for openSUSE:Factory checked in at 2012-12-28 15:03:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kyotocabinet (Old) and /work/SRC/openSUSE:Factory/.kyotocabinet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kyotocabinet", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/kyotocabinet/kyotocabinet.changes 2012-08-16 14:07:59.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kyotocabinet.new/kyotocabinet.changes 2012-12-28 15:03:34.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Dec 27 10:34:38 UTC 2012 - dvaleev(a)suse.com + +- fix up configure test to handle lack of 8 byte atomics correctly + (configure-8-byte-atomics.patch) + +------------------------------------------------------------------- New: ---- configure-8-byte-atomics.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kyotocabinet.spec ++++++ --- /var/tmp/diff_new_pack.gLFjQo/_old 2012-12-28 15:03:35.000000000 +0100 +++ /var/tmp/diff_new_pack.gLFjQo/_new 2012-12-28 15:03:35.000000000 +0100 @@ -27,6 +27,7 @@ Source: http://fallabs.com/kyotocabinet/pkg/kyotocabinet-%{version}.tar.gz # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch1: %{name}-fix_rpath.patch +Patch2: configure-8-byte-atomics.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -106,6 +107,7 @@ %prep %setup -q %patch1 -p 1 +%patch2 -p1 sed -ie "/ldconfig/d" Makefile.in sed -ie "/DOCDIR/d" Makefile.in ++++++ configure-8-byte-atomics.patch ++++++ From: Shawn Landden <shawnlandden(a)gmail.com> Date: Thu, 21 Jun 2012 20:34:28 -0700 Subject: configure: 8 byte atomics fix up configure test to handle lack of 8 byte atomics correctly as is the case with all ARM targets currently --- configure | 29 +++++++++++++---------------- configure.in | 19 ++++++++++++++++--- 2 files changed, 29 insertions(+), 19 deletions(-) diff --git a/configure b/configure index a07063d..bfc6df0 100755 --- a/configure +++ b/configure @@ -4012,25 +4012,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then - printf 'checking for atomic operations... ' - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - + printf 'checking for 8 byte atomic operations... ' + if printf ' +/* Some targets support 4 byte atomics, but not 8 byte atomics, + * and will fail at link time if they are used. + * + * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html + * http://gcc.gnu.org/wiki/Atomic + */ +#include <stdint.h> int main () { -__sync_fetch_and_add - ; - return 0; -} -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - MYGCCATOMIC=yes -else - MYGCCATOMIC=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test "$MYGCCATOMIC" = "yes" +uint64_t n = 0xdeadbeaf; +__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 0); +return n; +}' | $CC -xc -o config.tmp - >/dev/null 2>&1 then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' diff --git a/configure.in b/configure.in index 7808806..b5f5ac0 100644 --- a/configure.in +++ b/configure.in @@ -238,9 +238,22 @@ fi # Atomic operations if test "$enable_atomic" != "no" then - printf 'checking for atomic operations... ' - AC_TRY_COMPILE([], [__sync_fetch_and_add], [MYGCCATOMIC=yes], [MYGCCATOMIC=no]) - if test "$MYGCCATOMIC" = "yes" + printf 'checking for 8 byte atomic operations... ' + if printf ' +/* Some targets support 4 byte atomics, but not 8 byte atomics, + * and will fail at link time if they are used. + * + * http://gcc.gnu.org/onlinedocs/gcc-4.6.3/gcc/Atomic-Builtins.html + * http://gcc.gnu.org/wiki/Atomic + */ +#include <stdint.h> +int +main () +{ +uint64_t n = 0xdeadbeaf; +__sync_bool_compare_and_swap(&n, 0xdeadbeaf, 0); +return n; +}' | $CC -xc -o config.tmp - >/dev/null 2>&1 then MYCPPFLAGS="$MYCPPFLAGS -D_MYGCCATOMIC" printf 'yes\n' -- 1.7.9.5 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ksirk for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package ksirk for openSUSE:Factory checked in at 2012-12-28 15:03:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ksirk (Old) and /work/SRC/openSUSE:Factory/.ksirk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ksirk", Maintainer is "ksirk" Changes: -------- --- /work/SRC/openSUSE:Factory/ksirk/ksirk.changes 2012-12-07 14:34:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksirk.new/ksirk.changes 2012-12-28 15:03:30.000000000 +0100 @@ -1,0 +2,16 @@ +Thu Dec 27 14:29:49 UTC 2012 - tittiatcoke(a)gmail.com + +- Corrected licenses to GPL-2.0+ and LGPL-2.0+ + +------------------------------------------------------------------- +Thu Dec 20 11:51:56 UTC 2012 - tittiatcoke(a)gmail.com + +- Corrected license to LGPL-2.1 + +------------------------------------------------------------------- +Wed Dec 19 19:15:33 UTC 2012 - tittiatcoke(a)gmail.com + +- Update to 4.9.95 + * This is the first RC release for 4.10. Contains bugfixes + +------------------------------------------------------------------- Old: ---- ksirk-4.9.90.tar.xz New: ---- ksirk-4.9.95.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksirk.spec ++++++ --- /var/tmp/diff_new_pack.dUleOS/_old 2012-12-28 15:03:31.000000000 +0100 +++ /var/tmp/diff_new_pack.dUleOS/_new 2012-12-28 15:03:31.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package ksirk (Version 4.7.80_20111122) +# spec file for package ksirk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -20,12 +20,12 @@ BuildRequires: libkdegames-devel BuildRequires: libqca2-devel BuildRequires: xz -License: GPL-2.0 -Group: Amusements/Games/Strategy/Turn Based Summary: Risk-like game for KDE +License: GPL-2.0+ and LGPL-2.0+ +Group: Amusements/Games/Strategy/Turn Based Url: http://www.kde.org -Version: 4.9.90 -Release: 1 +Version: 4.9.95 +Release: 0 Source0: ksirk-%{version}.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build %kde4_runtime_requires @@ -49,7 +49,7 @@ %files %defattr(-,root,root) -%doc COPYING COPYING.DOC +%doc COPYING COPYING.DOC COPYING.LIB %{_kde4_bindir}/ksirk %{_kde4_bindir}/ksirkskineditor %{_kde4_htmldir}/en/ksirk/ @@ -64,5 +64,4 @@ %{_kde4_configkcfgdir}/ksirk*.kcfg %{_kde4_configdir}/ksirk.knsrc - %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 ksh for openSUSE:Factory
by root＠hilbert.suse.de 28 Dec '12

28 Dec '12

Hello community, here is the log from the commit of package ksh for openSUSE:Factory checked in at 2012-12-28 15:03:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2012-11-02 16:40:44.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ksh.new/ksh.changes 2012-12-28 15:03:17.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Dec 20 12:48:02 UTC 2012 - werner(a)suse.de + +- Add ksh93-dttree-crash.dif - Allow empty strings in (dt)trees + (bnc#795324) +- Modify ksh93-jobs.dif - make sure that tty is closed even if an + interrupt has been happen at close and also be aware that the + return value of tcgetpgrp() is greater than `1' that does not + match the process group ID of any existing process group (bnc#790315) + +------------------------------------------------------------------- New: ---- ksh93-dttree-crash.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ksh.spec ++++++ --- /var/tmp/diff_new_pack.VkoNuk/_old 2012-12-28 15:03:20.000000000 +0100 +++ /var/tmp/diff_new_pack.VkoNuk/_new 2012-12-28 15:03:20.000000000 +0100 @@ -114,6 +114,7 @@ Patch28: ksh93-env.dif Patch29: ksh93-zerofill.dif Patch30: ksh93-pathtemp.dif +Patch31: ksh93-dttree-crash.dif Patch42: ksh-locale.patch %description @@ -200,6 +201,7 @@ %patch28 %patch29 %patch30 +%patch31 %build # ++++++ ksh93-dttree-crash.dif ++++++ --- src/lib/libast/include/cdt.h +++ src/lib/libast/include/cdt.h 2012-12-20 11:37:28.641452879 +0000 @@ -313,7 +313,7 @@ _END_EXTERNS_ #define _DTCMP(dt,k1,k2,dc) \ ((dc)->comparf ? (*(dc)->comparf)((dt), (k1), (k2), (dc)) : \ (dc)->size > 0 ? memcmp((Void_t*)(k1), ((Void_t*)k2), (dc)->size) : \ - strcmp((char*)(k1), ((char*)k2)) ) + strcmp((char*)(k1), ((char*)(k2 ? k2 : ""))) ) #define _DTHSH(dt,ky,dc) ((dc)->hashf ? (*(dc)->hashf)((dt), (ky), (dc)) : \ dtstrhash(0, (ky), (dc)->size) ) ++++++ ksh93-jobs.dif ++++++ --- /var/tmp/diff_new_pack.VkoNuk/_old 2012-12-28 15:03:20.000000000 +0100 +++ /var/tmp/diff_new_pack.VkoNuk/_new 2012-12-28 15:03:20.000000000 +0100 @@ -1,6 +1,42 @@ --- src/cmd/ksh93/sh/jobs.c -+++ src/cmd/ksh93/sh/jobs.c 2011-08-15 18:43:23.005726321 +0200 -@@ -1103,7 +1103,7 @@ static struct process *job_bystring(regi ++++ src/cmd/ksh93/sh/jobs.c 2012-12-20 13:33:27.885452491 +0000 +@@ -638,12 +638,14 @@ void job_init(Shell_t *shp, int lflag) + /* This should have already been done by rlogin */ + register int fd; + register char *ttynam; ++ int err = errno; + #ifndef SIGTSTP + setpgid(0,shp->gd->pid); + #endif /*SIGTSTP */ + if(job.mypgid<0 || !(ttynam=ttyname(JOBTTY))) + return; +- close(JOBTTY); ++ while(close(JOBTTY)<0 && errno==EINTR) ++ errno = err; + if((fd = open(ttynam,O_RDWR)) <0) + return; + if(fd!=JOBTTY) +@@ -660,7 +662,7 @@ void job_init(Shell_t *shp, int lflag) + /* wait until we are in the foreground */ + while((job.mytgid=tcgetpgrp(JOBTTY)) != job.mypgid) + { +- if(job.mytgid == -1) ++ if(job.mytgid <= 0) + return; + /* Stop this shell until continued */ + signal(SIGTTIN,SIG_DFL); +@@ -833,7 +835,9 @@ static void job_set(register struct proc + if((pw->p_flag&P_STOPPED) || tcgetpgrp(job.fd) == shp->gd->pid) + tcsetpgrp(job.fd,pw->p_fgrp); + /* if job is stopped, resume it in the background */ +- job_unstop(pw); ++ if(!shp->forked) ++ job_unstop(pw); ++ shp->forked = 0; + #endif /* SIGTSTP */ + } + +@@ -1104,7 +1110,7 @@ static struct process *job_bystring(regi int job_kill(register struct process *pw,register int sig) { @@ -9,7 +45,7 @@ register pid_t pid; register int r; const char *msg; -@@ -1116,6 +1116,7 @@ int job_kill(register struct process *pw +@@ -1117,6 +1123,7 @@ int job_kill(register struct process *pw errno = ECHILD; if(pw==0) goto error; @@ -17,3 +53,11 @@ pid = pw->p_pid; #if SHOPT_COSHELL if(pw->p_cojob) +@@ -2043,6 +2050,7 @@ void job_fork(pid_t parent) + job.in_critical = 0; + break; + default: ++ job_chksave(parent); + jobfork=0; + job_unlock(); + break; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0