September 2014 - openSUSE Commits - openSUSE Mailing Lists

commit glibc-testsuite for openSUSE:12.3:Update
by root＠hilbert.suse.de 11 Sep '14

11 Sep '14

Hello community, here is the log from the commit of package glibc-testsuite for openSUSE:12.3:Update checked in at 2014-09-11 08:22:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3:Update/glibc-testsuite (Old) and /work/SRC/openSUSE:12.3:Update/.glibc-testsuite.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "glibc-testsuite" Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ _link ++++++ --- /var/tmp/diff_new_pack.SA9VLY/_old 2014-09-11 08:22:13.000000000 +0200 +++ /var/tmp/diff_new_pack.SA9VLY/_new 2014-09-11 08:22:13.000000000 +0200 @@ -1 +1 @@ -<link package='glibc-testsuite.2020' cicount='copy' /> +<link package='glibc-testsuite.2977' cicount='copy' /> -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-ldap for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-ldap for openSUSE:Factory checked in at 2014-09-10 18:51:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-ldap (Old) and /work/SRC/openSUSE:Factory/.python-ldap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-ldap" Changes: -------- --- /work/SRC/openSUSE:Factory/python-ldap/python-ldap.changes 2014-03-30 12:25:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-ldap.new/python-ldap.changes 2014-09-10 18:51:38.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 10 12:49:52 UTC 2014 - michael(a)stroeder.com + +- Update to upstream release 2.4.16 + +------------------------------------------------------------------- Old: ---- python-ldap-2.4.15.tar.gz New: ---- python-ldap-2.4.16.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-ldap.spec ++++++ --- /var/tmp/diff_new_pack.c1A4NQ/_old 2014-09-10 18:51:39.000000000 +0200 +++ /var/tmp/diff_new_pack.c1A4NQ/_new 2014-09-10 18:51:39.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-ldap -Version: 2.4.15 +Version: 2.4.16 Release: 0 Summary: Python LDAP interface License: Python-2.0 ++++++ python-ldap-2.4.15.tar.gz -> python-ldap-2.4.16.tar.gz ++++++ ++++ 3216 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python3-numpy for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python3-numpy for openSUSE:Factory checked in at 2014-09-10 18:51:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-numpy (Old) and /work/SRC/openSUSE:Factory/.python3-numpy.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python3-numpy" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-numpy/python3-numpy-doc.changes 2014-08-13 08:49:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python3-numpy.new/python3-numpy-doc.changes 2014-09-10 18:51:35.000000000 +0200 @@ -1,0 +2,20 @@ +Mon Sep 8 10:01:09 UTC 2014 - toddrme2178(a)gmail.com + +- Update to 1.9.0 + Highlights + * Numerous performance improvements in various areas, most + notably indexing and operations on small arrays are + significantly faster. Indexing operations now also release the + GIL. + * Addition of nanmedian and nanpercentile rounds out the + nanfunction set. +- Remove upstreamed numpy-double-double-le.patch +- Add numpy-1.9.0-remove-__declspec.patch + Fixes spurious warnings during build. These warnings are related + to a windows-specific function that is not built, so the patch + just removed the function. + See: + http://lists.opensuse.org/opensuse-packaging/2014-09/msg00004.html +- Added patch tag for numpy-buildfix.patch + +------------------------------------------------------------------- python3-numpy.changes: same change Old: ---- numpy-1.8.2.tar.gz numpy-double-double-le.patch New: ---- numpy-1.9.0-remove-__declspec.patch numpy-1.9.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-numpy-doc.spec ++++++ --- /var/tmp/diff_new_pack.S4VJWD/_old 2014-09-10 18:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S4VJWD/_new 2014-09-10 18:51:37.000000000 +0200 @@ -17,14 +17,17 @@ Name: python3-numpy-doc -Version: 1.8.2 +Version: 1.9.0 Release: 0 Url: http://www.numpy.org/ Summary: Documentation for python3-numpy License: BSD-3-Clause Group: Development/Libraries/Python Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch +# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure +Patch1: numpy-1.9.0-remove-__declspec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} == 1220 BuildRequires: python3-2to3 @@ -60,6 +63,7 @@ %prep %setup -q -n numpy-%{version} %patch0 -p1 +%patch1 -p1 # Patch in intersphinx file from pytho3-doc: sed -i "s|'http://docs.python.org/dev': None|'http://docs.python.org/dev': '/usr/share/doc/packages/python3/html/objects.inv'|" doc/source/conf.py # Avoid autosummary extensions, summaries are incomplete and it would fail: ++++++ python3-numpy.spec ++++++ --- /var/tmp/diff_new_pack.S4VJWD/_old 2014-09-10 18:51:37.000000000 +0200 +++ /var/tmp/diff_new_pack.S4VJWD/_new 2014-09-10 18:51:37.000000000 +0200 @@ -19,15 +19,17 @@ %define with_atlas 0 Name: python3-numpy -Version: 1.8.2 +Version: 1.9.0 Release: 0 Url: http://www.numpy.org/ Summary: NumPy array processing for numbers, strings, records and objects License: BSD-3-Clause Group: Development/Libraries/Python Source: https://pypi.python.org/packages/source/n/numpy/numpy-%{version}.tar.gz +# PATCH-FIX-OPENSUSE numpy-buildfix.patch -- openSUSE-specific build fixes Patch0: numpy-buildfix.patch -Patch1: numpy-double-double-le.patch +# PATCH-FIX-OPENSUSE numpy-1.9.0-remove-__declspec.patch -- fix for spurious compiler warnings that cause build failure +Patch1: numpy-1.9.0-remove-__declspec.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: blas-devel BuildRequires: lapack-devel @@ -71,16 +73,16 @@ %prep %setup -q -n numpy-%{version} %patch0 -p1 -%patch1 +%patch1 -p1 # Fix non-executable scripts -sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,docs/usersguide/setup_example,f2py2e,f90mod_rules,func2subr,__init__,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py +sed -i "1d" numpy/{compat/setup,distutils/{conv_template,cpuinfo,exec_command,from_template,setup,system_info},f2py/{__init__,auxfuncs,capi_maps,cb_rules,cfuncs,common_rules,crackfortran,diagnose,f2py2e,f90mod_rules,func2subr,rules,setup,use_rules},ma/setup,matrixlib/setup,setup,testing/{print_coercion_tables,setup}}.py %build CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build %install python3 setup.py install --root="%{buildroot}" --prefix="%{_prefix}" -rm -rf %{buildroot}%{python3_sitearch}/numpy/{,core,distutils,f2py,fft,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite +rm -rf %{buildroot}%{python3_sitearch}/numpy/{,core,distutils,f2py,fft,lib,linalg,ma,matrixlib,oldnumeric,polynomial,random,testing}/tests # Don't package testsuite %if 0%{?suse_version} %fdupes -s %{buildroot}%{_prefix} %endif ++++++ numpy-1.9.0-remove-__declspec.patch ++++++ From: toddrme2178(a)gmail.com Date: 2014-09-09 04:45:00 +0000 Subject: Remove windows-specific function Upstream: openSUSE Fix References: http://lists.opensuse.org/opensuse-packaging/2014-09/msg00004.html http://lists.opensuse.org/opensuse-packaging/2014-09/msg00005.html __declspec(thread) is a windows-specific function that is causing spurious compiler warnings. These warnings can be safely ignored, but are being falsely flagged as serious problems that cause the build to fail. Since this is windows-specific, it can be safely removed. --- a/numpy/core/setup_common.py +++ b/numpy/core/setup_common.py @@ -134,7 +134,7 @@ ] # variable attributes tested via "int %s a" % attribute -OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread", "__declspec(thread)"] +OPTIONAL_VARIABLE_ATTRIBUTES = ["__thread"] # Subset of OPTIONAL_STDFUNCS which may alreay have HAVE_* defined by Python.h OPTIONAL_STDFUNCS_MAYBE = ["expm1", "log1p", "acosh", "atanh", "asinh", "hypot", ++++++ numpy-1.8.2.tar.gz -> numpy-1.9.0.tar.gz ++++++ ++++ 145662 lines of diff (skipped) ++++++ numpy-buildfix.patch ++++++ --- /var/tmp/diff_new_pack.S4VJWD/_old 2014-09-10 18:51:38.000000000 +0200 +++ /var/tmp/diff_new_pack.S4VJWD/_new 2014-09-10 18:51:38.000000000 +0200 @@ -8,11 +8,11 @@ +void main() { - #ifndef __GNUC__ && (__GNUC__ >= 4) + #if (! defined __GNUC__) || (__GNUC__ < 4) --- a/numpy/distutils/command/install.py +++ b/numpy/distutils/command/install.py -@@ -66,7 +66,7 @@ +@@ -69,7 +69,7 @@ need_rewrite = False for l in f: l = l.rstrip() -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit branding-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package branding-openSUSE for openSUSE:Factory checked in at 2014-09-10 18:51:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/branding-openSUSE/branding-openSUSE.changes 2014-09-03 12:50:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.branding-openSUSE.new/branding-openSUSE.changes 2014-09-10 18:51:27.000000000 +0200 @@ -1,0 +2,7 @@ +Mon Sep 8 06:12:40 UTC 2014 - coolo(a)suse.com + +update go git: +- updated KDM theme for 13.2 +- reduced svg file size with Inkscape > Vacuum Defs + +------------------------------------------------------------------- kde-branding-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ kde-branding-openSUSE.spec: same change ++++++ openSUSE.tar.xz ++++++ /work/SRC/openSUSE:Factory/branding-openSUSE/openSUSE.tar.xz /work/SRC/openSUSE:Factory/.branding-openSUSE.new/openSUSE.tar.xz differ: char 27, line 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 IccXML for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package IccXML for openSUSE:Factory checked in at 2014-09-10 17:02:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/IccXML (Old) and /work/SRC/openSUSE:Factory/.IccXML.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "IccXML" Changes: -------- --- /work/SRC/openSUSE:Factory/IccXML/IccXML.changes 2012-05-10 14:32:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.IccXML.new/IccXML.changes 2014-09-10 17:03:17.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 03 12:00:01 UTC 2014 - ku.b(a)gmx.de + +- update to 0.9.8 + +------------------------------------------------------------------- Old: ---- IccXML-0.9.6.tar.gz New: ---- IccXML-0.9.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ IccXML.spec ++++++ --- /var/tmp/diff_new_pack.XY2wt3/_old 2014-09-10 17:03:18.000000000 +0200 +++ /var/tmp/diff_new_pack.XY2wt3/_new 2014-09-10 17:03:18.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package IccXML # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011-2012 Kai-Uwe Behrmann +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011-2014 Kai-Uwe Behrmann # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,22 @@ # -Version: 0.9.6 +Name: IccXML +Version: 0.9.8 Release: 0 -Source: IccXML-0.9.6.tar.gz +Source: %{name}-%{version}.tar.gz Summary: Color Management XML tools - -Name: IccXML License: BSD-3-Clause Group: Development/Libraries/Other + Url: http://sourceforge.net/projects/iccxml/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ libSampleICC-devel libSampleICC1 libxml2-devel pkgconfig +BuildRequires: gcc-c++ +BuildRequires: libSampleICC-devel +BuildRequires: libSampleICC1 +BuildRequires: libxml2-devel +BuildRequires: pkgconfig %package -n lib%{name}2 Summary: Colour Management Libraries ++++++ IccXML-0.9.6.tar.gz -> IccXML-0.9.8.tar.gz ++++++ ++++ 32083 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/ChangeLog new/IccXML-0.9.8/ChangeLog --- old/IccXML-0.9.6/ChangeLog 2011-04-22 14:49:00.000000000 +0200 +++ new/IccXML-0.9.8/ChangeLog 2014-09-03 10:03:28.000000000 +0200 @@ -1,3 +1,18 @@ +2014-04-23 Max Drhak + * 0.9.8 Release + * Fix Bug in parsing Unknown tag types + * Changes needed to support updates in IccProfLib 1.6.8 + * Changed #ifdef WIN32 to #if defined(WIN32) || defined(WIN64) + * Added std::string interface to icFixXml + * Increased size of lines in icXmlDumpHexData + * Added support for "Now" to icGetDateTimeValue parsing + * Added icGetChildText for safe extraction of xml child node text + +2012-08-31 Max Derhak + * 0.9.7 Release + * Moved CIccUTF16String to SampleICC's IccProfLib + * Changes needed to support updates in IccProfLib 1.6.7 + 2010-12-07 Max Derhak * 0.9.6 Release * Fixed bug relative to UTF16 to UTF8 conversion. Replaced diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/CmdLine/IccFromXml/IccFromXml.cpp new/IccXML-0.9.8/CmdLine/IccFromXml/IccFromXml.cpp --- old/IccXML-0.9.6/CmdLine/IccFromXml/IccFromXml.cpp 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/CmdLine/IccFromXml/IccFromXml.cpp 2014-09-03 10:03:28.000000000 +0200 @@ -14,7 +14,7 @@ int main(int argc, char* argv[]) { if (argc<=2) { - printf("\nSampleIcc Version " ICCPROFLIBVER ", ICCXML Version " ICCLIBXMLVER "\nUsage: IccFromXml xml_file saved_profile_file {-v{=[relax_ng_schema_file - optional]}}\n"); + printf("\nSampleIcc Version " ICCPROFLIBVER ", ICCXML Version " ICCLIBXMLVER "\nUsage: IccFromXml xml_file saved_profile_file {-noid -v{=[relax_ng_schema_file - optional]}}\n"); return -1; } @@ -25,18 +25,22 @@ std::string reason; std::string szRelaxNGDir; + bool bNoId = false; const char* szRelaxNGFileName = "SampleIccRELAX.rng"; - - if (argc > 3) {// user possibly specified schema validation - if (!strncmp(argv[3], "-v", 2) || !strncmp(argv[3], "-V", 2)) { - if (argv[3][2]=='=') { - szRelaxNGDir = argv[3]+3; + int i; + for (i=3; i<argc; i++) { + if (!stricmp(argv[i], "-noid")) { + bNoId = true; + } + else if (!strncmp(argv[i], "-v", 2) || !strncmp(argv[i], "-V", 2)) {// user specified schema validation + if (argv[i][2]=='=') { + szRelaxNGDir = argv[i]+3; } else { std::string path = argv[0]; // current directory where program is called -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) if (path != "IccFromXml.exe") { //current directory is not path where program is located path = path.substr(0,path.find_last_of("\\")); path += "\\"; @@ -64,7 +68,7 @@ if (!profile.LoadXml(argv[1], szRelaxNGDir.c_str(), &reason)) { printf("Unable to Parse '%s'\n", argv[1]); printf("%s", reason.c_str()); -#ifndef WIN32 +#if defined(WIN32) || defined(WIN64) printf("\n"); #endif return -1; @@ -79,7 +83,7 @@ if (profile.m_Header.profileID.ID8[i]) break; } - if (SaveIccProfile(argv[2], &profile, i<16 ? icAlwaysWriteID : icVersionBasedID)) { + if (SaveIccProfile(argv[2], &profile, bNoId ? icNeverWriteID : (i<16 ? icAlwaysWriteID : icVersionBasedID))) { printf("Profile parsed and saved correctly\n"); } else { @@ -94,7 +98,7 @@ if (profile.m_Header.profileID.ID8[i]) break; } - if (SaveIccProfile(argv[2], &profile, i<16 ? icAlwaysWriteID : icVersionBasedID)) { + if (SaveIccProfile(argv[2], &profile, bNoId ? icNeverWriteID : (i<16 ? icAlwaysWriteID : icVersionBasedID))) { printf("Profile parsed. Profile is invalid, but saved correctly\n"); } else { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/CmdLine/IccToXml/IccToXml.cpp new/IccXML-0.9.8/CmdLine/IccToXml/IccToXml.cpp --- old/IccXML-0.9.6/CmdLine/IccToXml/IccToXml.cpp 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/CmdLine/IccToXml/IccToXml.cpp 2014-09-03 10:03:28.000000000 +0200 @@ -27,18 +27,29 @@ return -1; } +// printf("File Opened\n"); +// fflush(stdout); + if (!profile.Read(&srcIO)) { printf("Unable to read '%s'\n", argv[1]); return -1; } +// printf("File read\n"); +// fflush(stdout); + std::string xml; + xml.reserve(30000000); if (!profile.ToXml(xml)) { printf("Unable to convert '%s' to xml\n", argv[1]); return -1; } +// printf("Profile converted\n"); +// fflush(stdout); + + if (!dstIO.Open(argv[2], "w")) { printf("unable to open '%s'\n", argv[2]); return -1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccLibXMLVer.h new/IccXML-0.9.8/IccLibXML/IccLibXMLVer.h --- old/IccXML-0.9.6/IccLibXML/IccLibXMLVer.h 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/IccLibXML/IccLibXMLVer.h 2014-09-03 10:03:28.000000000 +0200 @@ -1,4 +1,4 @@ #ifndef ICCLIBXMLVER -#define ICCLIBXMLVER "0.9.1" -#define ICCPROFLIBLIBXMLVER "1.6.2" +#define ICCLIBXMLVER "0.9.8" +#define ICCPROFLIBLIBXMLVER "1.6.8" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccMpeXml.cpp new/IccXML-0.9.8/IccLibXML/IccMpeXml.cpp --- old/IccXML-0.9.6/IccLibXML/IccMpeXml.cpp 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/IccLibXML/IccMpeXml.cpp 2014-09-03 10:03:28.000000000 +0200 @@ -66,7 +66,7 @@ #include <cstring> /* C strings strcpy, memcpy ... */ -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) #include <windows.h> #ifdef GetClassName #undef GetClassName diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccMpeXml.h new/IccXML-0.9.8/IccLibXML/IccMpeXml.h --- old/IccXML-0.9.6/IccLibXML/IccMpeXml.h 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/IccLibXML/IccMpeXml.h 2014-09-03 10:03:28.000000000 +0200 @@ -78,7 +78,7 @@ virtual bool ToXml(std::string &xml, std::string blanks="") = 0; virtual bool ParseXml(xmlNode *pNode, std::string &parseStr) = 0; - virtual const char *GetExtClassName() { return "CIccMpeXml"; } + virtual const char *GetExtClassName() const { return "CIccMpeXml"; } }; class CIccMpeXmlUnknown : public CIccMpeUnknown, public CIccMpeXml @@ -86,7 +86,7 @@ public: virtual ~CIccMpeXmlUnknown() {} - virtual const char *GetClassName() { return "CIccTagXmlUnknown"; } + virtual const char *GetClassName() const { return "CIccTagXmlUnknown"; } virtual IIccExtensionMpe *GetExtension() { return this; } @@ -99,7 +99,7 @@ public: virtual ~CIccMpeXmlCurveSet() {} - virtual const char *GetClassName() { return "CIccMpeXmlCurveSet"; } + virtual const char *GetClassName() const { return "CIccMpeXmlCurveSet"; } virtual IIccExtensionMpe *GetExtension() { return this; } @@ -115,7 +115,7 @@ public: virtual ~CIccMpeXmlMatrix() {} - virtual const char *GetClassName() { return "CIccMpeXmlMatrix"; } + virtual const char *GetClassName() const { return "CIccMpeXmlMatrix"; } virtual IIccExtensionMpe *GetExtension() { return this; } @@ -128,7 +128,7 @@ public: virtual ~CIccMpeXmlCLUT() {} - virtual const char *GetClassName() { return "CIccMpeXmlCLUT"; } + virtual const char *GetClassName() const { return "CIccMpeXmlCLUT"; } virtual IIccExtensionMpe *GetExtension() { return this; } @@ -141,7 +141,7 @@ public: virtual ~CIccMpeXmlBAcs() {} - virtual const char *GetClassName() { return "CIccMpeXmlBAcs"; } + virtual const char *GetClassName() const { return "CIccMpeXmlBAcs"; } virtual IIccExtensionMpe *GetExtension() { return this; } @@ -154,7 +154,7 @@ public: virtual ~CIccMpeXmlEAcs() {} - virtual const char *GetClassName() { return "CIccMpeXmlEAcs"; } + virtual const char *GetClassName() const { return "CIccMpeXmlEAcs"; } virtual IIccExtensionMpe *GetExtension() { return this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccProfileXml.cpp new/IccXML-0.9.8/IccLibXML/IccProfileXml.cpp --- old/IccXML-0.9.6/IccLibXML/IccProfileXml.cpp 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/IccLibXML/IccProfileXml.cpp 2014-09-03 10:03:28.000000000 +0200 @@ -257,7 +257,7 @@ icUInt32Number units; for (i=0; i<8; i++) { - units = (icUInt32Number)(v / divisor + 0.5); + units = (icUInt32Number)(v / divisor + 0.001); v-= divisor * units; divisor /= 10.0f; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccTagXml.cpp new/IccXML-0.9.8/IccLibXML/IccTagXml.cpp --- old/IccXML-0.9.6/IccLibXML/IccTagXml.cpp 2011-04-22 14:49:00.000000000 +0200 +++ new/IccXML-0.9.8/IccLibXML/IccTagXml.cpp 2014-09-03 13:27:56.000000000 +0200 @@ -85,6 +85,11 @@ bool CIccTagXmlUnknown::ParseXml(xmlNode *pNode, std::string &parseStr) { + const char *tagType = icXmlAttrValue(pNode->parent, "type"); + if (tagType) { + m_nType = (icTagTypeSignature)icGetSigVal(tagType); + } + pNode = icXmlFindNode(pNode, "UnknownData"); if (pNode && pNode->children && pNode->children->content) { @@ -742,7 +747,7 @@ template <class T, icTagTypeSignature Tsig> -const icChar* CIccTagXmlFixedNum<T, Tsig>::GetClassName() +const icChar* CIccTagXmlFixedNum<T, Tsig>::GetClassName() const { if (Tsig==icSigS15Fixed16ArrayType) return "CIccTagXmlS15Fixed16"; @@ -837,7 +842,7 @@ template class CIccTagXmlFixedNum<icU16Fixed16Number, icSigU16Fixed16ArrayType>; template <class T, icTagTypeSignature Tsig> -const icChar *CIccTagXmlNum<T, Tsig>::GetClassName() +const icChar *CIccTagXmlNum<T, Tsig>::GetClassName() const { if (sizeof(T)==sizeof(icUInt8Number)) return "CIccTagXmlUInt8"; @@ -1058,7 +1063,7 @@ { icUInt8Number *ptr = m_pData; char buf[60]; - char *szFlag = "ASCII"; + const char *szFlag = "ASCII"; if (m_nDataFlag == 1) szFlag = "binary"; @@ -1385,16 +1390,16 @@ for (pDescNode = pNode->children; pDescNode; pDescNode=pDescNode->next) { if (pDescNode->type == XML_ELEMENT_NODE) { if (!icXmlStrCmp(pDescNode->name, "DeviceManufacturerSignature")){ - p.m_deviceMfg = icXmlStrToSig((const icChar*)pDescNode->children->content); + p.m_deviceMfg = icXmlStrToSig(icGetChildText(pDescNode)); } else if (!icXmlStrCmp(pDescNode->name, "DeviceModelSignature")){ - p.m_deviceModel = icXmlStrToSig((const icChar*)pDescNode->children->content); + p.m_deviceModel = icXmlStrToSig(icGetChildText(pDescNode)); } else if (!icXmlStrCmp(pDescNode->name, "DeviceAttributes")){ p.m_attributes = icGetDeviceAttrValue(pDescNode); } else if (!icXmlStrCmp(pDescNode->name, "Technology")){ - p.m_technology = (icTechnologySignature)icXmlStrToSig((const icChar*)pDescNode->children->content); + p.m_technology = (icTechnologySignature)icXmlStrToSig(icGetChildText(pDescNode)); } else if (!icXmlStrCmp(pDescNode->name, "DeviceManufacturer")) { xmlNode *pDevManNode = icXmlFindNode(pDescNode->children, "multiLocalizedUnicodeType"); @@ -2093,7 +2098,7 @@ xml += blanks + " "; for (i=0; i<(int)m_nNumParam; i++) { - sprintf(buf, " %.8f", icFtoD(m_Param[i])); + sprintf(buf, " %.8f", m_dParam[i]); xml += buf; } xml += "\n"; @@ -2141,10 +2146,10 @@ } icUInt32Number j; - icS15Fixed16Number *params = GetParams(); + icFloatNumber *dParams = GetParams(); icFloatNumber *dataBuf = data.GetBuf(); for (j=0; j<data.GetSize(); j++) { - params[j] = icDtoF(dataBuf[j]); + dParams[j] = dataBuf[j]; } xmlAttr *reserved2 = icXmlFindAttr(pCurveNode, "Reserved"); @@ -3193,12 +3198,12 @@ std::string bufstr; xml += blanks + " <DictEntry Name=\""; - xml += icFixXml(fix, icUtf16ToUtf8(bufstr, (icUInt16Number*)nv->m_sName.c_str(), (int)nv->m_sName.size())); + xml += icFixXml(fix, nv->m_sName.ToUtf8(bufstr)); xml += "\""; if (nv->IsValueSet()) { xml += " Value=\""; - xml += icFixXml(fix, icUtf16ToUtf8(bufstr, (icUInt16Number*)nv->GetValue().c_str(), (int)nv->GetValue().size())); + xml += icFixXml(fix, nv->GetValue().ToUtf8(bufstr)); xml += "\""; } @@ -3251,16 +3256,13 @@ return false; ptr.ptr = pDesc; - str = icXmlAttrValue(pNode, "Name", ""); - str.ToWString(pDesc->m_sName); + pDesc->m_sName = icXmlAttrValue(pNode, "Name", ""); pAttr = icXmlFindAttr(pNode, "Value"); if (pAttr) { - std::wstring wstr; str = icXmlAttrValue(pAttr, ""); - str.ToWString(wstr); - pDesc->SetValue(wstr); + pDesc->SetValue(str); } xmlNode *pChild; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccTagXml.h new/IccXML-0.9.8/IccLibXML/IccTagXml.h --- old/IccXML-0.9.6/IccLibXML/IccTagXml.h 2010-12-01 10:51:00.000000000 +0100 +++ new/IccXML-0.9.8/IccLibXML/IccTagXml.h 2014-09-03 10:03:28.000000000 +0200 @@ -76,8 +76,8 @@ public: virtual ~CIccTagXml(void) {} - virtual const char *GetExtClassName() { return "CIccTagXml"; } - virtual const char *GetExtDerivedClassName() { return ""; } + virtual const char *GetExtClassName() const { return "CIccTagXml"; } + virtual const char *GetExtDerivedClassName() const { return ""; } virtual bool ToXml(std::string &xml, std::string blanks="") = 0; virtual bool ParseXml(xmlNode *pNode, std::string &parseStr) = 0; @@ -89,7 +89,7 @@ CIccTagXmlUnknown(icTagTypeSignature nType) { m_nType = nType; } virtual ~CIccTagXmlUnknown() {} - virtual const char *GetClassName() { return "CIccTagXmlUnknown"; } + virtual const char *GetClassName() const { return "CIccTagXmlUnknown"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -106,7 +106,7 @@ virtual CIccTag* NewCopy() const {return new CIccTagXmlText(*this);} - virtual const char *GetClassName() { return "CIccTagXmlText"; } + virtual const char *GetClassName() const { return "CIccTagXmlText"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -123,7 +123,7 @@ virtual CIccTag* NewCopy() const {return new CIccTagXmlTextDescription(*this);} - virtual const char *GetClassName() { return "CIccTagXmlTextDescription"; } + virtual const char *GetClassName() const { return "CIccTagXmlTextDescription"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -136,7 +136,7 @@ public: virtual ~CIccTagXmlSignature() {} - virtual const char *GetClassName() { return "CIccTagXmlSignature"; } + virtual const char *GetClassName() const { return "CIccTagXmlSignature"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -149,7 +149,7 @@ public: virtual ~CIccTagXmlNamedColor2() {} - virtual const char *GetClassName() { return "CIccTagXmlNamedColor2"; } + virtual const char *GetClassName() const { return "CIccTagXmlNamedColor2"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -162,7 +162,7 @@ public: virtual ~CIccTagXmlXYZ() {} - virtual const char *GetClassName() { return "CIccTagXmlXYZ"; } + virtual const char *GetClassName() const { return "CIccTagXmlXYZ"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -175,7 +175,7 @@ public: virtual ~CIccTagXmlChromaticity() {} - virtual const char *GetClassName() { return "CIccTagXmlChromaticity"; } + virtual const char *GetClassName() const { return "CIccTagXmlChromaticity"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -189,7 +189,7 @@ public: virtual ~CIccTagXmlFixedNum() {} - virtual const char *GetClassName(); + virtual const char *GetClassName() const; virtual IIccExtensionTag *GetExtension() { return this; } @@ -207,7 +207,7 @@ public: virtual ~CIccTagXmlNum() {} - virtual const char *GetClassName(); + virtual const char *GetClassName() const; virtual IIccExtensionTag *GetExtension() { return this; } @@ -225,7 +225,7 @@ public: virtual ~CIccTagXmlMeasurement() {} - virtual const char *GetClassName() { return "CIccTagXmlMeasurement"; } + virtual const char *GetClassName() const { return "CIccTagXmlMeasurement"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -238,7 +238,7 @@ public: virtual ~CIccTagXmlMultiLocalizedUnicode() {} - virtual const char *GetClassName() { return "CIccTagXmlMultiLocalizedUnicode"; } + virtual const char *GetClassName() const { return "CIccTagXmlMultiLocalizedUnicode"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -251,7 +251,7 @@ public: virtual ~CIccTagXmlData() {} - virtual const char *GetClassName() { return "CIccTagXmlData"; } + virtual const char *GetClassName() const { return "CIccTagXmlData"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -264,7 +264,7 @@ public: virtual ~CIccTagXmlDateTime() {} - virtual const char *GetClassName() { return "CIccTagXmlDateTime"; } + virtual const char *GetClassName() const { return "CIccTagXmlDateTime"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -277,7 +277,7 @@ public: virtual ~CIccTagXmlColorantOrder() {} - virtual const char *GetClassName() { return "CIccTagXmlColorantOrder"; } + virtual const char *GetClassName() const { return "CIccTagXmlColorantOrder"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -290,7 +290,7 @@ public: virtual ~CIccTagXmlColorantTable() {} - virtual const char *GetClassName() { return "CIccTagXmlColorantTable"; } + virtual const char *GetClassName() const { return "CIccTagXmlColorantTable"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -303,7 +303,7 @@ public: virtual ~CIccTagXmlViewingConditions() {} - virtual const char *GetClassName() { return "CIccTagXmlViewingConditions"; } + virtual const char *GetClassName() const { return "CIccTagXmlViewingConditions"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -316,7 +316,7 @@ public: virtual ~CIccTagXmlProfileSeqDesc() {} - virtual const char *GetClassName() { return "CIccTagXmlProfileSeqDesc"; } + virtual const char *GetClassName() const { return "CIccTagXmlProfileSeqDesc"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -329,7 +329,7 @@ public: virtual ~CIccTagXmlResponseCurveSet16() {} - virtual const char *GetClassName() { return "CIccTagXmlResponseCurveSet16"; } + virtual const char *GetClassName() const { return "CIccTagXmlResponseCurveSet16"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -342,7 +342,7 @@ public: virtual ~CIccCurveXml() {} - virtual const char *GetExtDerivedClassName() { return "CIccCurveXml"; } + virtual const char *GetExtDerivedClassName() const { return "CIccCurveXml"; } virtual bool ToXml(std::string &xml, icConvertType nType, std::string blanks) = 0; virtual bool ParseXml(xmlNode *pNode, icConvertType nType, std::string &parseStr) = 0; @@ -353,7 +353,7 @@ public: virtual ~CIccTagXmlCurve() {} - virtual const char *GetClassName() { return "CIccTagXmlCurve"; } + virtual const char *GetClassName() const { return "CIccTagXmlCurve"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -368,7 +368,7 @@ public: virtual ~CIccTagXmlParametricCurve() {} - virtual const char *GetClassName() { return "CIccTagXmlParametricCurve"; } + virtual const char *GetClassName() const { return "CIccTagXmlParametricCurve"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -383,7 +383,7 @@ public: virtual ~CIccTagXmlLutAtoB() {} - virtual const char *GetClassName() { return "CIccTagXmlLutAtoB"; } + virtual const char *GetClassName() const { return "CIccTagXmlLutAtoB"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -396,7 +396,7 @@ public: virtual ~CIccTagXmlLutBtoA() {} - virtual const char *GetClassName() { return "CIccTagXmlLutBtoA"; } + virtual const char *GetClassName() const { return "CIccTagXmlLutBtoA"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -409,7 +409,7 @@ public: virtual ~CIccTagXmlLut8() {} - virtual const char *GetClassName() { return "CIccTagXmlLut8"; } + virtual const char *GetClassName() const { return "CIccTagXmlLut8"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -422,7 +422,7 @@ public: virtual ~CIccTagXmlLut16() {} - virtual const char *GetClassName() { return "CIccTagXmlLut16"; } + virtual const char *GetClassName() const { return "CIccTagXmlLut16"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -435,7 +435,7 @@ public: virtual ~CIccTagXmlMultiProcessElement() {} - virtual const char *GetClassName() { return "CIccTagXmlMultiProcessElement"; } + virtual const char *GetClassName() const { return "CIccTagXmlMultiProcessElement"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -453,7 +453,7 @@ public: virtual ~CIccTagXmlProfileSequenceId() {} - virtual const char *GetClassName() { return "CIccTagXmlProfileSequenceId"; } + virtual const char *GetClassName() const { return "CIccTagXmlProfileSequenceId"; } virtual IIccExtensionTag *GetExtension() { return this; } @@ -466,7 +466,7 @@ public: virtual ~CIccTagXmlDict() {} - virtual const char *GetClassName() { return "CIccTagXmlDict"; } + virtual const char *GetClassName() const { return "CIccTagXmlDict"; } virtual IIccExtensionTag *GetExtension() { return this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccUtilXml.cpp new/IccXML-0.9.8/IccLibXML/IccUtilXml.cpp --- old/IccXML-0.9.6/IccLibXML/IccUtilXml.cpp 2011-04-22 14:49:00.000000000 +0200 +++ new/IccXML-0.9.8/IccLibXML/IccUtilXml.cpp 2014-09-03 13:53:08.000000000 +0200 @@ -63,8 +63,9 @@ #include "IccUtilXml.h" #include "IccConvertUTF.h" +#include <time.h> -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) #include <windows.h> #ifdef GetClassName #undef GetClassName @@ -72,7 +73,7 @@ #endif #include <cstring> /* C strings strcpy, memcpy ... */ -icTagSigType tagSignatureMap[] ={ +const icTagSigType tagSignatureMap[] ={ { icSigChromaticityType , "chromaticityType"}, { icSigColorantOrderType , "colorantOrderType"}, { icSigColorantTableType , "colorantTableType"}, @@ -109,173 +110,38 @@ #define tagSignatureMapSize (sizeof(tagSignatureMap)/sizeof(tagSignatureMap[0])) -CIccUTF16String::CIccUTF16String() -{ - m_alloc=64; - m_len = 0; - m_str = (icUInt16Number*)calloc(m_alloc, sizeof(icUInt16Number)); -} - -CIccUTF16String::CIccUTF16String(const icUInt16Number *uzStr) -{ - m_len = WStrlen(uzStr); - m_alloc = AllocSize(m_len); - - m_str = (icUInt16Number *)malloc(m_alloc*sizeof(icUInt16Number)); - memcpy(m_str, uzStr, m_len+1*sizeof(icUInt16Number)); -} - -CIccUTF16String::CIccUTF16String(const char *szStr) -{ - size_t sizeSrc = strlen(szStr); - - if (sizeSrc) { - m_alloc = AllocSize(sizeSrc*2); - m_str = (UTF16 *)calloc(m_alloc, sizeof(icUInt16Number)); //overallocate to allow for up to 4 bytes per character - UTF16 *szDest = m_str; - icConvertUTF8toUTF16((const UTF8 **)&szStr, (const UTF8 *)&szStr[sizeSrc], &szDest, &szDest[m_alloc], lenientConversion); - if (m_str[0]==0xfeff) { - size_t i; - for (i=1; m_str[i]; i++) - m_str[i-1] = m_str[i]; - m_str[i-1] = 0; - } - m_len = WStrlen(m_str); - } - else { - m_alloc = 64; - m_len = 0; - m_str = (icUInt16Number*)calloc(m_alloc, sizeof(icUInt16Number)); - } -} - -CIccUTF16String::CIccUTF16String(const CIccUTF16String &str) -{ - m_alloc = str.m_alloc; - m_len = str.m_len; - m_str = (icUInt16Number*)malloc(m_alloc*sizeof(icUInt16Number)); - - memcpy(m_str, str.m_str, (m_alloc)*sizeof(icUInt16Number)); -} - -CIccUTF16String::~CIccUTF16String() -{ - free(m_str); -} - -void CIccUTF16String::Clear() -{ - m_len = 0; - m_str[0] = 0; -} - -void CIccUTF16String::Resize(size_t len) -{ - if (len>m_alloc) { - size_t nAlloc = AllocSize(len); - - m_str = (icUInt16Number*)realloc(m_str, m_alloc*sizeof(icUInt16Number)); - } - - if (len>m_len) { - memset(&m_str[m_len], 0x0020, (len-m_len)*sizeof(icUInt16Number)); - } - m_len = len; - m_str[m_len] = 0; -} - -size_t CIccUTF16String::WStrlen(const icUInt16Number *uzStr) -{ - size_t n=0; - while(uzStr[n]) n++; - - return n; -} - -CIccUTF16String& CIccUTF16String::operator=(const CIccUTF16String &wstr) -{ - if (m_alloc<=wstr.m_alloc) { - m_str = (icUInt16Number*)realloc(m_str, m_alloc*sizeof(icUInt16Number)); - m_alloc = wstr.m_alloc; - } - m_len = wstr.m_len; - - memcpy(m_str, wstr.m_str, (m_len+1)*sizeof(icUInt16Number)); - - return *this; -} - -CIccUTF16String& CIccUTF16String::operator=(const char *szStr) -{ - FromUtf8(szStr, 0); - - return *this; -} - -CIccUTF16String& CIccUTF16String::operator=(const icUInt16Number *uzStr) -{ - size_t n = WStrlen(uzStr); - size_t nAlloc = AllocSize(n); - - if (m_alloc<=nAlloc) { - m_str = (icUInt16Number*)realloc(m_str, m_alloc*sizeof(icUInt16Number)); - m_alloc =nAlloc; - } - m_len = n; - - memcpy(m_str, uzStr, (m_len+1)*sizeof(icUInt16Number)); - - return *this; -} -void CIccUTF16String::FromUtf8(const char *szStr, size_t sizeSrc) +const char *icFixXml(std::string &buf, const char *szStr) { - if (!sizeSrc) - sizeSrc = strlen(szStr); - - if (sizeSrc) { - size_t nAlloc = AllocSize(sizeSrc*2); - if (m_alloc<=nAlloc) { - m_str = (icUInt16Number*)realloc(m_str, m_alloc*sizeof(icUInt16Number)); - m_alloc = nAlloc; - } - UTF16 *szDest = m_str; - icConvertUTF8toUTF16((const UTF8 **)&szStr, (const UTF8 *)&szStr[sizeSrc], &szDest, &szDest[m_alloc], lenientConversion); - if (m_str[0]==0xfeff) { - size_t i; - for (i=1; m_str[i]; i++) - m_str[i-1] = m_str[i]; - m_str[i-1] = 0; + buf = ""; + while (*szStr) { + switch (*szStr) { + case '\'': + buf += "'"; + break; + case '&': + buf += "&"; + break; + case '\"': + buf += """; + break; + case '<': + buf += "<"; + break; + case '>': + buf += ">"; + break; + default: + buf += *szStr; } - m_len = WStrlen(m_str); - } - else { - m_len = 0; - m_str[0] = 0; - } -} - -const char *CIccUTF16String::ToUtf8(std::string &buf) -{ - return icUtf16ToUtf8(buf, m_str, (int)m_len); -} - -const wchar_t *CIccUTF16String::ToWString(std::wstring &buf) -{ - size_t i; - - buf.clear(); - - for (i=0; i<m_len; i++) { - buf += (wchar_t)m_str[i]; + szStr++; } return buf.c_str(); } - -char *icFixXml(char *szDest, const char *szStr) +const char *icFixXml(char *szDest, const char *szStr) { char *ptr = szDest; @@ -311,40 +177,9 @@ return szDest; } -const char *icUtf16ToUtf8(std::string &buf, const icUInt16Number *szSrc, int sizeSrc/*=0*/) -{ - if (!sizeSrc) { - sizeSrc = (int)CIccUTF16String::WStrlen(szSrc); - } - - int n = sizeSrc*4; - - if (n) { - char *szBuf = (char *)malloc(n+1); - char *szDest = szBuf; - icConvertUTF16toUTF8(&szSrc, &szSrc[sizeSrc], (UTF8**)&szDest, (UTF8*)&szDest[n+1], lenientConversion); - *szDest= '\0'; - - buf = szBuf; - free(szBuf); - } - else { - buf.clear(); - } - - return buf.c_str(); -} - -const unsigned short *icUtf8ToUtf16(CIccUTF16String &buf, const char *szSrc, int sizeSrc/*=0*/) -{ - buf.FromUtf8(szSrc, sizeSrc); - - return buf.c_str(); -} - const char *icAnsiToUtf8(std::string &buf, const char *szSrc) { -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) size_t len = strlen(szSrc)+1; wchar_t *szUnicodeBuf = (wchar_t*)malloc(len*sizeof(icUInt16Number)*2); char *szBuf = (char*)malloc(len*2); @@ -369,7 +204,7 @@ const char *icUtf8ToAnsi(std::string &buf, const char *szSrc) { -#ifdef WIN32 +#if defined(WIN32) || defined(WIN64) size_t len = strlen(szSrc)+1; wchar_t *szUnicodeBuf = (wchar_t*)malloc(len*sizeof(icUInt16Number)*2); char *szBuf = (char*)malloc(len*2); @@ -607,7 +442,7 @@ icUInt32Number i; for (i=0; i<nBufSize; i++, ptr++) { - if (!(i%16)) { + if (!(i%32)) { if (i) xml += "\n"; xml += blanks; @@ -685,7 +520,7 @@ template <class T, icTagTypeSignature Tsig> bool CIccXmlArrayType<T, Tsig>::ParseArray(xmlNode *pNode) { - char *scanType = (Tsig == icSigFloatArrayType ? "f" : "n"); + const char *scanType = (Tsig == icSigFloatArrayType ? "f" : "n"); icUInt32Number n = icXmlNodeCount(pNode, scanType); if (n) { @@ -1152,21 +987,46 @@ icDateTimeNumber icGetDateTimeValue(const icChar* str) { - unsigned int day=0, month=0, year=0, hours=0, minutes=0, seconds=0; icDateTimeNumber dateTime; - - sscanf(str, "%d-%02d-%02dT%02d:%02d:%02d", &year, &month, &day, &hours, &minutes, &seconds); - dateTime.year = year; - dateTime.month = month; - dateTime.day = day; - dateTime.hours = hours; - dateTime.minutes = minutes; - dateTime.seconds = seconds; - + if (!stricmp(str, "Now")) { + struct tm *newtime; + time_t long_time; + + time( &long_time ); /* Get time as long integer. */ + newtime = gmtime( &long_time ); + + dateTime.year = newtime->tm_year+1900; + dateTime.month = newtime->tm_mon+1; + dateTime.day = newtime->tm_mday; + dateTime.hours = newtime->tm_hour; + dateTime.minutes = newtime->tm_min; + dateTime.seconds = newtime->tm_sec; + + } + else { + unsigned int day=0, month=0, year=0, hours=0, minutes=0, seconds=0; + + sscanf(str, "%d-%02d-%02dT%02d:%02d:%02d", &year, &month, &day, &hours, &minutes, &seconds); + + dateTime.year = year; + dateTime.month = month; + dateTime.day = day; + dateTime.hours = hours; + dateTime.minutes = minutes; + dateTime.seconds = seconds; + } + return dateTime; } +const icChar *icGetChildText(xmlNode *pNode) +{ + if (pNode && pNode->children && pNode->content) + return (const char*)pNode->content; + return ""; +} + icUInt64Number icGetDeviceAttrValue(xmlNode *pNode) { icUInt64Number devAttr = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/IccLibXML/IccUtilXml.h new/IccXML-0.9.8/IccLibXML/IccUtilXml.h --- old/IccXML-0.9.6/IccLibXML/IccUtilXml.h 2011-04-22 14:49:00.000000000 +0200 +++ new/IccXML-0.9.8/IccLibXML/IccUtilXml.h 2014-09-03 13:52:22.000000000 +0200 @@ -69,49 +69,14 @@ #include "IccXmlConfig.h" #include "libxml/parser.h" #include <vector> +#include <string> -class CIccUTF16String -{ -public: - CIccUTF16String(); - CIccUTF16String(const icUInt16Number *uzStr); - CIccUTF16String(const char *szStr); - CIccUTF16String(const CIccUTF16String &str); - virtual ~CIccUTF16String(); - - void Clear(); - size_t Size() { return m_len; } - void Resize(size_t len); - - CIccUTF16String& operator=(const CIccUTF16String &wstr); - CIccUTF16String& operator=(const char *szStr); - CIccUTF16String& operator=(const icUInt16Number *uzStr); - - icUInt16Number operator[](size_t nIndex) { return m_str[nIndex]; } - - const icUInt16Number *c_str() { return m_str; } - - void FromUtf8(const char *szStr, size_t sizeSrc=0); - const char *ToUtf8(std::string &buf); - const wchar_t *ToWString(std::wstring &buf); - static size_t WStrlen(const icUInt16Number *uzStr); - -protected: - static size_t AllocSize(size_t n) { return (((n+64)/64)*64); } - size_t m_alloc; - size_t m_len; - icUInt16Number *m_str; -}; - - -char *icFixXml(char *szDest, const char *szStr); +const char *icFixXml(char *szDest, const char *szStr); +const char *icFixXml(std::string &buf, const char *szStr); const char *icAnsiToUtf8(std::string &buf, const char *szSrc); const char *icUtf8ToAnsi(std::string &buf, const char *szSrc); -const char *icUtf16ToUtf8(std::string &buf, const icUInt16Number *szSrc, int sizeSrc=0); -const unsigned short *icUtf8ToUtf16(CIccUTF16String &buf, const char *szSrc, int sizeSrc=0); - bool icCLUTToXml(std::string &xml, CIccCLUT *pCLUT, icConvertType nType, std::string blanks, bool bSaveGridPoints=false, const char *szExtraAttrs="", const char *szName="CLUT"); icFloatNumber icXmlStrToFloat(const xmlChar *szStr); @@ -180,6 +145,7 @@ icIlluminant icGetIlluminantValue(const icChar *str); const icChar* icGetStandardObserverName(icStandardObserver str); icDateTimeNumber icGetDateTimeValue(const icChar *str); +const icChar* icGetChildText(xmlNode *pNode); icUInt64Number icGetDeviceAttrValue(xmlNode *pNode); icColorantEncoding icGetColorantValue(const icChar* str); icMeasurementUnitSig icGetMeasurementValue(const icChar* str); @@ -189,9 +155,9 @@ typedef struct { icTagTypeSignature tagSig; - icChar* szTagType; + const icChar* szTagType; } icTagSigType; -#endif //_ICCUTILXML_H \ No newline at end of file +#endif //_ICCUTILXML_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/IccXML-0.9.6/configure.ac new/IccXML-0.9.8/configure.ac --- old/IccXML-0.9.6/configure.ac 2011-04-22 14:49:00.000000000 +0200 +++ new/IccXML-0.9.8/configure.ac 2014-09-03 10:11:09.000000000 +0200 @@ -6,7 +6,7 @@ ICCXML_MAJOR_VERSION=0 ICCXML_MINOR_VERSION=9 -ICCXML_MICRO_VERSION=6 +ICCXML_MICRO_VERSION=8 ICCXML_VERSION=$ICCXML_MAJOR_VERSION.$ICCXML_MINOR_VERSION.${ICCXML_MICRO_VERSION} AC_SUBST(ICCXML_VERSION) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit SampleICC for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package SampleICC for openSUSE:Factory checked in at 2014-09-10 17:02:35 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/SampleICC (Old) and /work/SRC/openSUSE:Factory/.SampleICC.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "SampleICC" Changes: -------- --- /work/SRC/openSUSE:Factory/SampleICC/SampleICC.changes 2012-11-08 21:53:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.SampleICC.new/SampleICC.changes 2014-09-10 17:03:16.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 03 12:00:01 UTC 2014 - ku.b(a)gmx.de + +- update to 1.6.8 + +------------------------------------------------------------------- Old: ---- SampleICC-1.6.6.tar.gz New: ---- SampleICC-1.6.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ SampleICC.spec ++++++ --- /var/tmp/diff_new_pack.sCYz00/_old 2014-09-10 17:03:16.000000000 +0200 +++ /var/tmp/diff_new_pack.sCYz00/_new 2014-09-10 17:03:16.000000000 +0200 @@ -1,8 +1,8 @@ # # spec file for package SampleICC # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2011-2012 Kai-Uwe Behrmann +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011-2014 Kai-Uwe Behrmann # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,26 @@ # -Version: 1.6.6 +Name: SampleICC +Url: http://sourceforge.net/projects/sampleicc/ +Version: 1.6.8 Release: 0 -Source: SampleICC-1.6.6.tar.gz +Source: %{name}-%{version}.tar.gz Summary: Color Management System - -Name: SampleICC License: BSD-3-Clause Group: Development/Libraries/Other -Url: http://sourceforge.net/projects/sampleicc/ + BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: doxygen gcc-c++ gettext graphviz libjpeg-devel libpng-devel libtiff-devel libxml2-devel pkgconfig +BuildRequires: doxygen +BuildRequires: gcc-c++ +BuildRequires: gettext +BuildRequires: graphviz +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +BuildRequires: pkgconfig %package -n lib%{name}1 Summary: Colour Management System Libraries ++++++ SampleICC-1.6.6.tar.gz -> SampleICC-1.6.8.tar.gz ++++++ ++++ 50457 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit obs-service-tar_scm for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package obs-service-tar_scm for openSUSE:Factory checked in at 2014-09-10 17:02:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-tar_scm (Old) and /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "obs-service-tar_scm" Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-tar_scm/obs-service-tar_scm.changes 2014-07-11 06:47:01.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.obs-service-tar_scm.new/obs-service-tar_scm.changes 2014-09-10 17:03:14.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 9 19:01:29 UTC 2014 - jblunck(a)infradead.org + +- Update to version 0.4.0.1410288598.7f38281: + + Python rewrite of tar_scm + + Make pep8 happy (except for regex in tar_scm:299) + + Address some feedback from pylint + + make Python version PEP8-compliant + + Let Travis execute pep8 + + Strip newline ('\n') characters from safe_run output in detect_version() + + Make potentially long-running tasks print output in real-time + + Improve efficiency of stdout handling in safe_run() + + Release obs-service-tar_scm 0.4.0 + +------------------------------------------------------------------- Old: ---- obs-service-tar_scm-0.3.2.1404723797.745a470.tar.gz New: ---- obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-tar_scm.spec ++++++ --- /var/tmp/diff_new_pack.OSYESt/_old 2014-09-10 17:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OSYESt/_new 2014-09-10 17:03:15.000000000 +0200 @@ -19,7 +19,7 @@ %define service tar_scm Name: obs-service-%{service} -Version: 0.3.2.1404723797.745a470 +Version: 0.4.0.1410288598.7f38281 Release: 0 Summary: An OBS source service: checkout or update a tar ball from svn/git/hg License: GPL-2.0+ @@ -49,17 +49,11 @@ %build %install -mkdir -p %{buildroot}%{_prefix}/lib/obs/service -install -m 0755 tar_scm %{buildroot}%{_prefix}/lib/obs/service -install -m 0644 tar_scm.service %{buildroot}%{_prefix}/lib/obs/service - -mkdir -p %{buildroot}%{_sysconfdir}/obs/services -install -m 0644 tar_scm.rc %{buildroot}%{_sysconfdir}/obs/services/%{service} +make install DESTDIR="%{buildroot}" PREFIX="%{_prefix}" SYSCFG="%{_sysconfdir}" %if 0%{?suse_version} >= 1220 %check -: Running the test suite. Please be patient - this takes a few minutes ... -python tests/test.py +make check %endif %files ++++++ _service ++++++ --- /var/tmp/diff_new_pack.OSYESt/_old 2014-09-10 17:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OSYESt/_new 2014-09-10 17:03:15.000000000 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="exclude">.git</param> <param name="version">git-master</param> - <param name="versionformat">0.3.2.%ct.%h</param> + <param name="versionformat">0.4.0.%ct.%h</param> <param name="revision">master</param> <param name="changesgenerate">enable</param> </service> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.OSYESt/_old 2014-09-10 17:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OSYESt/_new 2014-09-10 17:03:15.000000000 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">git://github.com/openSUSE/obs-service-tar_scm.git</param> - <param name="changesrevision">745a470cfb</param> + <param name="changesrevision">7f382817c6</param> </service> </servicedata> \ No newline at end of file ++++++ debian.dsc ++++++ --- /var/tmp/diff_new_pack.OSYESt/_old 2014-09-10 17:03:15.000000000 +0200 +++ /var/tmp/diff_new_pack.OSYESt/_new 2014-09-10 17:03:15.000000000 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: obs-service-tar-scm -Version: 0.2.3 +Version: 0.4.0 Binary: obs-service-tar-scm Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: all @@ -9,5 +9,7 @@ bzr, git, mercurial, + python (>= 2.6), + python-argparse | python (>= 2.7), subversion, python-unittest2 ++++++ obs-service-tar_scm-0.3.2.1404723797.745a470.tar.gz -> obs-service-tar_scm-0.4.0.1410288598.7f38281.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/.travis.yml new/obs-service-tar_scm-0.4.0.1410288598.7f38281/.travis.yml --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/.travis.yml 2014-07-09 11:15:58.000000000 +0200 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/.travis.yml 2014-09-09 21:01:29.000000000 +0200 @@ -5,4 +5,6 @@ before_install: - sudo apt-get update -qq - sudo apt-get install -qq bzr git mercurial subversion +install: pip install pep8 --use-mirrors +before_script: pep8 tar_scm script: python tests/test.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/GNUmakefile new/obs-service-tar_scm-0.4.0.1410288598.7f38281/GNUmakefile --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/GNUmakefile 1970-01-01 01:00:00.000000000 +0100 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/GNUmakefile 2014-09-09 21:01:29.000000000 +0200 @@ -0,0 +1,19 @@ +DESTDIR ?= +PREFIX = /usr/local +SYSCFG = /etc + +mylibdir = $(PREFIX)/lib/obs/service +mycfgdir = $(SYSCFG)/obs/services + +.PHONY: check +check: + : Running the test suite. Please be patient - this takes a few minutes ... + python tests/test.py + +.PHONY: install +install: + mkdir -p $(DESTDIR)$(mylibdir) + mkdir -p $(DESTDIR)$(mycfgdir) + install -m 0755 tar_scm $(DESTDIR)$(mylibdir) + install -m 0644 tar_scm.service $(DESTDIR)$(mylibdir) + install -m 0644 tar_scm.rc $(DESTDIR)$(mycfgdir)/tar_scm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/README.md new/obs-service-tar_scm-0.4.0.1410288598.7f38281/README.md --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/README.md 2014-07-09 11:15:58.000000000 +0200 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/README.md 2014-09-09 21:01:29.000000000 +0200 @@ -7,11 +7,7 @@ The files in this top-level directory need to be installed using the following: - mkdir -p /usr/lib/obs/service - mkdir -p /etc/obs/services - install -m 0755 tar_scm /usr/lib/obs/service - install -m 0644 tar_scm.service /usr/lib/obs/service - install -m 0644 tar_scm.rc /etc/obs/services/tar_scm + make install ## Test suite diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/changelog new/obs-service-tar_scm-0.4.0.1410288598.7f38281/debian/changelog --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/debian/changelog 2014-07-09 11:15:58.000000000 +0200 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/debian/changelog 2014-09-09 21:01:29.000000000 +0200 @@ -1,3 +1,17 @@ +obs-service-tar-scm (0.4.0) unstable; urgency=low + + * Python rewrite of tar_scm + * Make pep8 happy (except for regex in tar_scm:299) + * Address some feedback from pylint + * make Python version PEP8-compliant + * Let Travis execute pep8 + * Strip newline ('\n') characters from safe_run output in detect_version() + * Make potentially long-running tasks print output in real-time + * Improve efficiency of stdout handling in safe_run() + * Release obs-service-tar_scm 0.4.0 + + -- Jan Blunck <jblunck(a)infradead.org> Tue, 09 Sep 2014 18:37:39 +0200 + obs-service-tar-scm (0.2.3) unstable; urgency=low * Initial release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/tar_scm new/obs-service-tar_scm-0.4.0.1410288598.7f38281/tar_scm --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/tar_scm 2014-07-09 11:15:58.000000000 +0200 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/tar_scm 2014-09-09 21:01:29.000000000 +0200 @@ -1,707 +1,834 @@ -#!/bin/bash - +#!/usr/bin/env python +# # A simple script to checkout or update a svn or git repo as source service # -# (C) 2010 by Adrian Schröter <adrian(a)suse.de> -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# See http://www.gnu.org/licenses/gpl-2.0.html for full license text. - -SERVICE='tar_scm' - -set_default_params () { - MYSCM="" - MYURL="" - MYVERSION="_auto_" - MYFORMAT="" - MYPREFIX="" - MYFILENAME="" - MYREVISION="" - MYPACKAGEMETA="" - USE_SUBMODULES=enable -# MYHISTORYDEPTH="" - CHANGES_GENERATE=disable - CHANGES_REVISION="" - CHANGES_AUTHOR="" - INCLUDES="" -} +# (C) 2010 by Adrian Schroeter <adrian(a)suse.de> +# (C) 2014 by Jan Blunck <jblunck(a)infradead.org> (Python rewrite) +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# See http://www.gnu.org/licenses/gpl-2.0.html for full license text. -get_config_options () { - # config options for this host ? - if [ -f /etc/obs/services/$SERVICE ]; then - . /etc/obs/services/$SERVICE - fi - # config options for this user ? - if [ -f "$HOME"/.obs/$SERVICE ]; then - . "$HOME"/.obs/$SERVICE - fi -} +import argparse +import datetime +import os +import shutil +import re +import fnmatch +import sys +import tarfile +import subprocess +import atexit +import hashlib +import tempfile +import logging +import glob +import ConfigParser +import StringIO + + +def safe_run(cmd, cwd, interactive=False): + """Execute the command cmd in the working directory cwd and check return + value. If the command returns non-zero raise a SystemExit exception.""" + + logging.debug("COMMAND: %s", cmd) + + # Ensure we get predictable results when parsing the output of commands + # like 'git branch' + env = os.environ.copy() + env['LANG'] = 'C' + + proc = subprocess.Popen(cmd, + shell=False, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + cwd=cwd, + env=env) + output = '' + if interactive: + stdout_lines = [] + while proc.poll() is None: + for line in proc.stdout: + print line.rstrip() + stdout_lines.append(line.rstrip()) + output = '\n'.join(stdout_lines) + else: + output = proc.communicate()[0] -parse_params () { - while test $# -gt 0; do - if test -n "`echo \"$2\" | sed 's,[0-9a-zA-Z{}|@%:/._-]*,,g'`"; then - echo "Argument $1 got an argument with not supported char." - exit 1 - fi - case $1 in - *-scm) - MYSCM="$2" - shift - ;; - *-url) - MYURL="$2" - shift - ;; - *-subdir) - MYSUBDIR="$2" - shift - ;; - *-revision) - MYREVISION="$2" - shift - ;; - *-version) - MYVERSION="$2" - shift - ;; - *-include) - INCLUDES="$INCLUDES $2" - shift - ;; - *-versionformat) - MYFORMAT="$2" - shift - ;; - *-versionprefix) - MYPREFIX="$2" - shift - ;; - *-exclude) - EXCLUDES="$EXCLUDES --exclude=${2#/}" - shift - ;; - *-filename) - MYFILENAME="${2#/}" - shift - ;; - *-package-meta) - MYPACKAGEMETA="${2#/}" - shift - ;; - *-outdir) - MYOUTDIR="$2" - shift - ;; - *-history-depth) - echo "history-depth parameter is obsolete and will be ignored" - shift - ;; - *-submodules) - USE_SUBMODULES="$2" - shift - ;; - *-changesgenerate) - CHANGES_GENERATE="$2" - shift - ;; - *-changesauthor) - CHANGES_AUTHOR="$2" - shift - ;; - *) - echo "Unknown parameter: $1" - echo 'Usage: $SERVICE --scm $SCM --url $URL [--subdir $SUBDIR] [--revision $REVISION] [--version $VERSION] [--include $INCLUDE]* [--exclude $EXCLUDE]* [--versionformat $FORMAT] [--versionprefix $PREFIX] [--filename $FILENAME] [--package-meta $META] [--submodules disable] --outdir $OUT' - exit 1 - ;; - esac - shift - done -} + if proc.returncode: + logging.info("ERROR(%d): %s", proc.returncode, repr(output)) + sys.exit("Command failed(%d): %s" % (proc.returncode, repr(output))) + else: + logging.debug("RESULT(%d): %s", proc.returncode, repr(output)) + return (proc.returncode, output) -error () { - echo "ERROR: $*" - exit 1 -} -debug () { - [ -n "$DEBUG_TAR_SCM" ] && echo "$*" -} +def fetch_upstream_git(url, clone_dir, revision, cwd): + """fetch sources from GIT""" + + safe_run(['git', 'clone', url, clone_dir], cwd=cwd, + interactive=sys.stdout.isatty()) + safe_run(['git', 'submodule', 'update', '--init', '--recursive'], + clone_dir) + -safe_run () { - if ! "$@"; then - error "$* failed; aborting!" - fi +def fetch_upstream_svn(url, clone_dir, revision, cwd): + """fetch sources from SVN""" + + command = ['svn', 'checkout', '--non-interactive', url, clone_dir] + if revision: + command.insert(4, '-r%s' % revision) + safe_run(command, cwd, interactive=sys.stdout.isatty()) + + +def fetch_upstream_hg(url, clone_dir, revision, cwd): + """fetch sources from HG""" + + safe_run(['hg', 'clone', url, clone_dir], cwd, + interactive=sys.stdout.isatty()) + + +def fetch_upstream_bzr(url, clone_dir, revision, cwd): + """fetch sources from BZR""" + + command = ['bzr', 'checkout', url, clone_dir] + if revision: + command.insert(3, '-r') + command.insert(4, revision) + safe_run(command, cwd, interactive=sys.stdout.isatty()) + + +FETCH_UPSTREAM_COMMANDS = { + 'git': fetch_upstream_git, + 'svn': fetch_upstream_svn, + 'hg': fetch_upstream_hg, + 'bzr': fetch_upstream_bzr, } -sanitise_params () { - TAR_VERSION="$MYVERSION" - if [ -z "$MYSCM" ]; then - error "no scm is given via --scm parameter (git/svn/hg/bzr)!" - fi - if [ -z "$MYURL" ]; then - error "no checkout URL is given via --url parameter!" - fi - if [ -z "$MYOUTDIR" ]; then - error "no output directory is given via --outdir parameter!" - fi - - FILE="$MYFILENAME" - WD_VERSION="$MYVERSION" - if [ -z "$MYPACKAGEMETA" ]; then - EXCLUDES="$EXCLUDES --exclude-vcs" - fi - # if [ "$MYHISTORYDEPTH" == "full" ]; then - # MYHISTORYDEPTH="999999999" - # fi +def update_cache_git(url, clone_dir, revision): + """update sources from GIT""" + + safe_run(['git', 'fetch'], cwd=clone_dir, interactive=sys.stdout.isatty()) + + +def update_cache_svn(url, clone_dir, revision): + """update sources from SVN""" + + command = ['svn', 'update'] + if revision: + command.insert(3, "-r%s" % revision) + safe_run(command, cwd=clone_dir, interactive=sys.stdout.isatty()) + + +def update_cache_hg(url, clone_dir, revision): + """update sources from HG""" + + try: + safe_run(['hg', 'pull'], cwd=clone_dir, + interactive=sys.stdout.isatty()) + except SystemExit, e: + # Contrary to the docs, hg pull returns exit code 1 when + # there are no changes to pull, but we don't want to treat + # this as an error. + if re.match('.*no changes found.*', e) is None: + raise + + +def update_cache_bzr(url, clone_dir, revision): + """update sources from BZR""" + + command = ['bzr', 'update'] + if revision: + command.insert(3, '-r') + command.insert(4, revision) + safe_run(command, cwd=clone_dir, interactive=sys.stdout.isatty()) + + +UPDATE_CACHE_COMMANDS = { + 'git': update_cache_git, + 'svn': update_cache_svn, + 'hg': update_cache_hg, + 'bzr': update_cache_bzr, } -detect_default_filename_param () { - if [ -n "$FILE" ]; then + +def switch_revision_git(clone_dir, revision): + """Switch sources to revision. The GIT revision may refer to any of the + following: + - explicit SHA1: a1b2c3d4.... + - the SHA1 must be reachable from a default clone/fetch (generally, must be + reachable from some branch or tag on the remote). + - short branch name: "master", "devel" etc. + - explicit ref: refs/heads/master, refs/tags/v1.2.3, + refs/changes/49/11249/1 + """ + + if revision is None: + revision = 'master' + + revs = [x + revision for x in ['origin/', '']] + for rev in revs: + try: + safe_run(['git', 'rev-parse', '--verify', '--quiet', rev], + cwd=clone_dir) + text = safe_run(['git', 'reset', '--hard', rev], cwd=clone_dir)[1] + print text.rstrip() + break + except SystemExit: + continue + else: + sys.exit('%s: No such revision' % revision) + + safe_run(['git', 'submodule', 'update', '--recursive'], cwd=clone_dir) + + +def switch_revision_hg(clone_dir, revision): + """Switch sources to revision.""" + + if revision is None: + revision = 'tip' + + try: + safe_run(['hg', 'update', revision], cwd=clone_dir, + interactive=sys.stdout.isatty()) + except SystemExit: + sys.exit('%s: No such revision' % revision) + + +def switch_revision_none(clone_dir, revision): + """Switch sources to revision. Dummy implementation for version control + systems that change revision during fetch/update.""" + return - fi - case "$MYSCM" in - git) - FILE="${MYURL%/}" - FILE="${FILE##*/}" - FILE="${FILE%.git}" - FILE="${FILE#*@*:}" - ;; - svn|hg|bzr) - FILE="${MYURL%/}" - FILE="${FILE##*/}" - ;; - *) - error "unknown SCM '$MYSCM'" - esac + +SWITCH_REVISION_COMMANDS = { + 'git': switch_revision_git, + 'svn': switch_revision_none, + 'hg': switch_revision_hg, + 'bzr': switch_revision_none, } -detect_changes () { - # Try to load from _servicedata. We have to change $PWD, ET.parse() seems to be relative... - CHANGES_REVISION=$(python <<-EOF -import os, shutil -try: - # If lxml is available, we can use a parser that doesnt destroy comments - import lxml.etree as ET - xml_parser = ET.XMLParser(remove_comments=False) -except ImportError: - import xml.etree.ElementTree as ET - xml_parser = None -create_servicedata, tar_scm_service = False, None -tar_scm_xmlstring = " <service name=\"tar_scm\">\n <param name=\"url\">${MYURL}</param>\n </service>\n" -root=None -try: - tree = ET.parse(os.path.join("$SRCDIR", "_servicedata"), parser=xml_parser) + +def fetch_upstream(scm, url, revision, out_dir): + """Fetch sources from repository and checkout given revision.""" + + # calc_dir_to_clone_to + basename = os.path.basename(re.sub(r'/.git$', '', url)) + clone_dir = os.path.abspath(os.path.join(out_dir, basename)) + + if not os.path.isdir(clone_dir): + # initial clone + os.mkdir(clone_dir) + FETCH_UPSTREAM_COMMANDS[scm](url, clone_dir, revision, cwd=out_dir) + else: + logging.info("Detected cached repository...") + UPDATE_CACHE_COMMANDS[scm](url, clone_dir, revision) + + # switch_to_revision + SWITCH_REVISION_COMMANDS[scm](clone_dir, revision) + + return clone_dir + + +def prep_tree_for_tar(repodir, subdir, outdir, dstname): + """Prepare directory tree for creation of the tarball by copying the + requested sub-directory to the top-level destination directory.""" + + src = os.path.join(repodir, subdir) + if not os.path.exists(src): + sys.exit("%s: No such file or directory" % src) + + dst = os.path.join(outdir, dstname) + if os.path.exists(dst) and \ + (os.path.samefile(src, dst) or + os.path.samefile(os.path.dirname(src), dst)): + sys.exit("%s: src and dst refer to same file" % src) + + shutil.copytree(src, dst) + + return dst + + +def create_tar(repodir, outdir, dstname, extension='tar', + exclude=[], include=[], package_metadata=False): + """Create a tarball of repodir in destination directory.""" + + (workdir, topdir) = os.path.split(repodir) + + incl_patterns = [] + excl_patterns = [] + + for i in include: + incl_patterns.append(re.compile(fnmatch.translate(i))) + + # skip vcs files base on this pattern + if not package_metadata: + excl_patterns.append(re.compile(r".*/\.bzr.*")) + excl_patterns.append(re.compile(r".*/\.git.*")) + excl_patterns.append(re.compile(r".*/\.hg.*")) + excl_patterns.append(re.compile(r".*/\.svn.*")) + + for e in exclude: + excl_patterns.append(re.compile(fnmatch.translate(e))) + + def tar_exclude(filename): + '''Exclude (return True) or add (return False) file to tar achive''' + + if incl_patterns: + for pat in incl_patterns: + if pat.match(filename): + return False + return True + + for pat in excl_patterns: + if pat.match(filename): + return True + return False + + def tar_filter(tarinfo): + '''Python 2.7 only: reset uid/gid to 0/0 (root)''' + + tarinfo.uid = tarinfo.gid = 0 + tarinfo.uname = tarinfo.gname = "root" + + if tar_exclude(tarinfo.name): + return None + + return tarinfo + + os.chdir(workdir) + + tar = tarfile.open(os.path.join(outdir, dstname + '.' + extension), "w") + try: + tar.add(topdir, filter=tar_filter) + except TypeError: + # Python 2.6 compatibility + tar.add(topdir, exclude=tar_exclude) + tar.close() + + +CLEANUP_DIRS = [] + + +def cleanup(dirs): + '''Cleaning temporary directories.''' + + logging.info("Cleaning: %s", ' '.join(dirs)) + + for d in dirs: + if not os.path.exists(d): + continue + for root, dirs, files in os.walk(d, topdown=False): + for name in files: + os.remove(os.path.join(root, name)) + for name in dirs: + os.rmdir(os.path.join(root, name)) + os.rmdir(d) + + +def version_iso_cleanup(version): + '''Reformat timestamp value.''' + + version = re.sub(r'([0-9]{4})-([0-9]{2})-([0-9]{2}) +' + r'([0-9]{2})([:]([0-9]{2})([:]([0-9]{2}))?)?' + r'( +[-+][0-9]{3,4})', r'\1\2\3T\4\6\8', version) + version = re.sub(r'[-:]', '', version) + return version + + +def detect_version_git(repodir, versionformat): + '''Automatic detection of version number for checked-out GIT repository.''' + + if versionformat is None: + versionformat = '%ct' + + if re.match('.*@PARENT_TAG@.*', versionformat): + try: + text = safe_run(['git', 'describe', '--tags', '--abbrev=0'], + repodir)[1] + versionformat = re.sub('@PARENT_TAG@', text, versionformat) + except SystemExit: + sys.exit(r'\e[0;31mThe git repository has no tags,' + r' thus @PARENT_TAG@ can not be expanded\e[0m') + + version = safe_run(['git', 'log', '-n1', '--date=short', + "--pretty=format:%s" % versionformat], repodir)[1] + return version_iso_cleanup(version) + + +def detect_version_svn(repodir, versionformat): + '''Automatic detection of version number for checked-out SVN repository.''' + + if versionformat is None: + versionformat = '%r' + + svn_info = safe_run(['svn', 'info'], repodir)[1] + + version = '' + match = re.search('Last Changed Rev: (.*)', svn_info, re.MULTILINE) + if match: + version = match.group(1).strip() + return re.sub('%r', version, versionformat) + + +def detect_version_hg(repodir, versionformat): + '''Automatic detection of version number for checked-out HG repository.''' + + if versionformat is None: + versionformat = '{rev}' + + version = safe_run(['hg', 'id', '-n'], repodir)[1] + + # Mercurial internally stores commit dates in its changelog + # context objects as (epoch_secs, tz_delta_to_utc) tuples (see + # mercurial/util.py). For example, if the commit was created + # whilst the timezone was BST (+0100) then tz_delta_to_utc is + # -3600. In this case, + # + # hg log -l1 -r$rev --template '{date}\n' + # + # will result in something like '1375437706.0-3600' where the + # first number is timezone-agnostic. However, hyphens are not + # permitted in rpm version numbers, so tar_scm removes them via + # sed. This is required for this template format for any time + # zone "numerically east" of UTC. + # + # N.B. since the extraction of the timestamp as a version number + # is generally done in order to provide chronological sorting, + # ideally we would ditch the second number. However the + # template format string is left up to the author of the + # _service file, so we can't do it here because we don't know + # what it will expand to. Mercurial provides template filters + # for dates (e.g. 'hgdate') which _service authors could + # potentially use, but unfortunately none of them can easily + # extract only the first value from the tuple, except for maybe + # 'sub(...)' which is only available since 2.4 (first introduced + # in openSUSE 12.3). + + version = safe_run(['hg', 'log', '-l1', "-r%s" % version.strip(), + '--template', versionformat], repodir)[1] + return version_iso_cleanup(version) + + +def detect_version_bzr(repodir, versionformat): + '''Automatic detection of version number for checked-out BZR repository.''' + + if versionformat is None: + versionformat = '%r' + + version = safe_run(['bzr', 'revno'], repodir)[1] + return re.sub('%r', version.strip(), versionformat) + + +def detect_version(scm, repodir, versionformat=None): + '''Automatic detection of version number for checked-out repository.''' + + detect_version_commands = { + 'git': detect_version_git, + 'svn': detect_version_svn, + 'hg': detect_version_hg, + 'bzr': detect_version_bzr, + } + + version = detect_version_commands[scm](repodir, versionformat).strip() + logging.debug("VERSION(auto): %s", version) + return version + + +def get_repocache_hash(scm, url, subdir): + '''Calculate hash fingerprint for repository cache.''' + + digest = hashlib.new('sha256') + digest.update(url) + if scm == 'svn': + digest.update('/' + subdir) + return digest.hexdigest() + + +def read_changes_revision(url, srcdir, outdir): + """Reads the _servicedata file and returns a dictionary with 'revision' on + success. As a side-effect it creates the _servicedata file if it doesn't + exist. 'revision' is None in that case. + """ + + change = { + 'revision': None, + 'url': url, + } + + try: + # If lxml is available, we can use a parser that doesn't + # destroy comments + import lxml.etree as ET + xml_parser = ET.XMLParser(remove_comments=False) + except ImportError: + import xml.etree.ElementTree as ET + xml_parser = None + + create_servicedata, tar_scm_service = False, None + tar_scm_xmlstring = """ <service name=\"tar_scm\"> + <param name=\"url\">%s</param> + </service> +""" % url + root = None + try: + tree = ET.parse(os.path.join(srcdir, "_servicedata"), + parser=xml_parser) + root = tree.getroot() + for service in root.findall("service[@name='tar_scm']"): + for param in service.findall("param[@name='url']"): + if param.text == url: + tar_scm_service = service + break + if tar_scm_service is not None: + params = tar_scm_service.findall("param[@name='changesrevision']") + if len(params) == 1: + # Found what we searched for! + change['revision'] = params[0].text + else: + # File exists, is well-formed but does not contain the service + # we search + root.append(ET.fromstring(tar_scm_xmlstring)) + create_servicedata = True + except IOError as e: + # File doesnt exist + root = ET.fromstring("<servicedata>\n%s</servicedata>\n" % + tar_scm_xmlstring) + create_servicedata = True + except ET.ParseError as e: + if e.message.startswith("Document is empty"): + # File is empty + root = ET.fromstring("<servicedata>\n%s</servicedata>\n" % + tar_scm_xmlstring) + create_servicedata = True + else: + # File is corrupt + raise + + if create_servicedata: + ET.ElementTree(root).write(os.path.join(outdir, "_servicedata")) + else: + if not os.path.samefile(os.path.join(srcdir, "_servicedata"), + os.path.join(outdir, "_servicedata")): + shutil.copy(os.path.join(srcdir, "_servicedata"), + os.path.join(outdir, "_servicedata")) + + return change + + +def write_changes_revision(url, outdir, revision): + '''Updates the changesrevision in the _servicedata file. ''' + + logging.debug("Updating %s", os.path.join(outdir, '_servicedata')) + + try: + # If lxml is available, we can use a parser that doesn't + # destroy comments + import lxml.etree as ET + xml_parser = ET.XMLParser(remove_comments=False) + except ImportError: + import xml.etree.ElementTree as ET + xml_parser = None + + tree = ET.parse(os.path.join(outdir, "_servicedata"), parser=xml_parser) root = tree.getroot() + changed, tar_scm_service = False, None for service in root.findall("service[@name='tar_scm']"): for param in service.findall("param[@name='url']"): - if param.text == "${MYURL}": + if param.text == url: tar_scm_service = service break if tar_scm_service is not None: - changerev_params = tar_scm_service.findall("param[@name='changesrevision']") - if len(changerev_params) == 1: - print(changerev_params[0].text) # Found what we searched for! - else: - # File exists, is well-formed but does not contain the service we search - root.append(ET.fromstring(tar_scm_xmlstring)) - create_servicedata = True -except IOError as e: - root = ET.fromstring("<servicedata>\n%s</servicedata>\n" % tar_scm_xmlstring) - create_servicedata = True # File doesnt exist -except ET.ParseError as e: - if e.message.startswith("Document is empty"): - root = ET.fromstring("<servicedata>\n%s</servicedata>\n" % tar_scm_xmlstring) - create_servicedata = True # File is empty + changerev_params = \ + tar_scm_service.findall("param[@name='changesrevision']") + if len(changerev_params) == 1: # already present, just update + if changerev_params[0].text != revision: + changerev_params[0].text = revision + changed = True + else: # not present, add changesrevision element + tree = ET.fromstring( + " <param name=\"changesrevision\">%s</param>\n" + % revision) + tar_scm_service.append(tree) + changed = True + if changed: + tree.write(os.path.join(outdir, "_servicedata")) else: - print("error: %s" % e) # File is mal-formed, bail out. -except Exception as e: - print("error: %s" % e) # Catch-all, since we are in a here-document - -if create_servicedata: - ET.ElementTree(root).write(os.path.join("$MYOUTDIR", "_servicedata")) -else: - shutil.copy(os.path.join("$SRCDIR", "_servicedata"), os.path.join("$MYOUTDIR", "_servicedata")) -EOF -) - if [[ $CHANGES_REVISION == error* ]] ; then - echo $CHANGES_REVISION # All we can do here, really. - exit 1 - fi - - safe_run cd $REPOPATH - - case "$MYSCM" in - git) - if [ -z "$CHANGES_REVISION" ]; then - # Ok, first run. Let's ask git for a range... - CHANGES_REVISION=`safe_run git log -n10 --pretty=format:%H | tail -n 1` - fi - CURRENT_REVISION=`safe_run git log -n1 --pretty=format:%H` - CURRENT_REVISION=${CURRENT_REVISION:0:10} # shorten SHA1 hash - # Use pattern-matching to check if either revision is a prefix of the other. It's pretty common at least - # for git users to abbreviate commit hashes but people disagree on the exact length, thus: - if [[ ${CURRENT_REVISION} == ${CHANGES_REVISION}* || ${CHANGES_REVISION} == ${CURRENT_REVISION}* ]]; then - debug "No new commits, skipping changes file generation" + sys.exit("File _servicedata is missing tar_scm with URL '%s'" % url) + + +def write_changes(changes_filename, changes, version, author): + '''Add changes to given *.changes file.''' + + if changes is None: return - fi - debug "Generate changes between $CHANGES_REVISION and $CURRENT_REVISION" - lines=`safe_run git log --pretty=tformat:%s --no-merges ${CHANGES_REVISION}..${CURRENT_REVISION} | tac` - ;; - svn|hg|bzr) - debug "Unable to generate changes for subversion, mercurial or bazaar, skipping changes file generation" - return - ;; - *) - error "Unknown SCM '$MYSCM'" - esac - OLD_IFS="$IFS" - IFS=$'\n' CHANGES_LINES=( $lines ) - IFS="$OLD_IFS" - CHANGES_REVISION=$CURRENT_REVISION -} -write_changes () { - # Replace or add changesrevision in _servicedata file and do it in Python, otherwise sth. like - # https://gist.github.com/mralexgray/1209534 would be needed. The stdlib xml module's XPath - # support is quite basic, thus there are some for-loops in the code: - python <<-EOF -import os -try: - # If lxml is available, we can use a parser that doesn't destroy comments - import lxml.etree as ET - xml_parser = ET.XMLParser(remove_comments=False) -except ImportError: - import xml.etree.ElementTree as ET - xml_parser = None -tree = ET.parse(os.path.join("$MYOUTDIR", "_servicedata"), parser=xml_parser) -root = tree.getroot() -changed, tar_scm_service = False, None -for service in root.findall("service[@name='tar_scm']"): - for param in service.findall("param[@name='url']"): - if param.text == "${MYURL}": - tar_scm_service = service - break -if tar_scm_service is not None: - changerev_params = tar_scm_service.findall("param[@name='changesrevision']") - if len(changerev_params) == 1: # already present, just update - if changerev_params[0].text != "${CHANGES_REVISION}": - changerev_params[0].text = "${CHANGES_REVISION}" - changed = True - else: # not present, add changesrevision element - tar_scm_service.append(ET.fromstring(" <param name=\"changesrevision\">${CHANGES_REVISION}</param>\n")) - changed = True - if changed: - tree.write(os.path.join("$MYOUTDIR", "_servicedata")) -else: - print("File _servicedata is missing tar_scm with URL '${MYURL}'") -EOF + logging.debug("Writing changes file %s", changes_filename) - if [ ${#CHANGES_LINES[@]} -eq 0 ] ; then - echo "No changes since $CHANGES_REVISION, skipping changes file generation" - return - fi + tmp_fp = tempfile.NamedTemporaryFile(delete=False) + tmp_fp.write('-' * 66 + '\n') + tmp_fp.write("%s - %s\n" % ( + datetime.datetime.utcnow().strftime('%a %b %d %H:%M:%S UTC %Y'), + author)) + tmp_fp.write('\n') + tmp_fp.write("- Update to version %s:\n" % version) + for line in changes.split(os.linesep): + tmp_fp.write(" + %s\n" % line) + tmp_fp.write('\n') - if [ -z "$CHANGES_AUTHOR" ] ; then - OSCRC="$HOME/.oscrc" - if [ -f $OSCRC ] ; then - CHANGES_AUTHOR=$(grep -e '^email.*=' $OSCRC | head -n1 | cut -d"=" -f2) - else - CHANGES_AUTHOR="opensuse-packaging(a)opensuse.org" - fi - fi - - change_entry="------------------------------------------------------------------- -$(LC_ALL=POSIX TZ=UTC date) - ${CHANGES_AUTHOR} - -- Update to version ${TAR_VERSION}:" - for commit in "${CHANGES_LINES[@]}" ; do - change_entry="$change_entry - + $commit" - done - change_entry="$change_entry -" - - # Prepend change entry to changes files - for changes_file in $SRCDIR/*.changes ; do - tmpfile=$(mktemp) - echo "$change_entry" | cat - $changes_file > $tmpfile && mv $tmpfile $MYOUTDIR/$(basename $changes_file) - done -} + old_fp = open(changes_filename, 'r') + tmp_fp.write(old_fp.read()) + old_fp.close() -fetch_upstream () { - TOHASH="$MYURL" - [ "$MYSCM" = 'svn' ] && TOHASH="$TOHASH/$MYSUBDIR" - HASH=`echo "$TOHASH" | sha256sum | cut -d\ -f 1` - REPOCACHE= - if [ -n "$CACHEDIRECTORY" ]; then - REPOCACHEINCOMING="$CACHEDIRECTORY/incoming" - REPOCACHEROOT="$CACHEDIRECTORY/repo" - REPOCACHE="$REPOCACHEROOT/$HASH" - REPOURLCACHE="$CACHEDIRECTORY/repourl/$HASH" - fi - - if [ -z "$MYREVISION" ]; then - case "$MYSCM" in - git) - MYREVISION=master - ;; - hg) - MYREVISION=tip - ;; - # bzr) - # MYREVISION=HEAD - # ;; - esac - if [ -n "$MYREVISION" ]; then - debug "no revision specified; defaulting to $MYREVISION" - fi - fi - - debug "check local cache if configured" - if [ -n "$CACHEDIRECTORY" -a -d "$REPOCACHE/.$MYSCM" ]; then - debug "cache hit: $REPOCACHE/.$MYSCM" - check_cache - echo "Found $TOHASH in $REPOCACHE; updating ..." - update_cache - REPOPATH="$REPOCACHE" - else - if [ -n "$CACHEDIRECTORY" ]; then - debug "cache miss: $REPOCACHE/.$MYSCM" - else - debug "cache not enabled" - fi - - calc_dir_to_clone_to - debug "new $MYSCM checkout to $CLONE_TO" - initial_clone - - if [ -n "$CACHEDIRECTORY" ]; then - cache_repo - REPOPATH="$REPOCACHE" - else - REPOPATH="$MYOUTDIR/$FILE" - fi - fi - - safe_run cd "$REPOPATH" - switch_to_revision - if [ "$TAR_VERSION" == "_auto_" -o -n "$MYFORMAT" ]; then - detect_version - fi - if [ "$CHANGES_GENERATE" == "enable" ]; then - detect_changes - fi -} + tmp_fp.close() -calc_dir_to_clone_to () { - if [ -n "$CACHEDIRECTORY" ]; then - safe_run cd "$REPOCACHEINCOMING" - # Use dry-run mode because git/hg refuse to clone into - # an empty directory on SLES11 - debug mktemp -u -d "tmp.XXXXXXXXXX" - CLONE_TO=`mktemp -u -d "tmp.XXXXXXXXXX"` - else - CLONE_TO="$FILE" - fi -} + os.rename(tmp_fp.name, changes_filename) -initial_clone () { - echo "Fetching from $MYURL ..." - case "$MYSCM" in - git) - # Clone with full depth; so that the revision can be found if specified - safe_run git clone "$MYURL" "$CLONE_TO" - if [ "$USE_SUBMODULES" == "enable" ]; then - safe_run cd "$CLONE_TO" - safe_run git submodule update --init --recursive - safe_run cd .. - fi - ;; - svn) - args= - [ -n "$MYREVISION" ] && args="-r$MYREVISION" - if [[ $(svn --version --quiet) > "1.5.99" ]]; then - TRUST_SERVER_CERT="--trust-server-cert" - fi - safe_run svn checkout --non-interactive $TRUST_SERVER_CERT \ - $args "$MYURL/$MYSUBDIR" "$CLONE_TO" - MYSUBDIR= # repo root is subdir - ;; - hg) - safe_run hg clone "$MYURL" "$CLONE_TO" - ;; - bzr) - args= - [ -n "$MYREVISION" ] && args="-r $MYREVISION" - safe_run bzr checkout $args "$MYURL" "$CLONE_TO" - ;; - *) - error "unknown SCM '$MYSCM'" - esac -} +def detect_changes_commands_git(repodir, changes): + '''Detect changes between GIT revisions.''' -cache_repo () { - if [ -e "$REPOCACHE" ]; then - error "Somebody else beat us to populating the cache for $MYURL ($REPOCACHE)" - else - # FIXME: small race window here; do source services need to be thread-safe? - debug "mv #1: $CLONE_TO -> $REPOCACHE" - safe_run mv "$CLONE_TO" "$REPOCACHE" - echo "$MYURL" > "$REPOURLCACHE" - echo "Cached $MYURL at $REPOCACHE" - fi -} + last_rev = changes['revision'] -check_cache () { - CACHEDURL=`cat "$REPOURLCACHE"` - [ -z "$CACHEDURL" ] && CACHEDURL='<unknown URL>' - if [ "$MYURL" != "$CACHEDURL" ]; then - error "Corrupt cache: cache for repo $MYURL was recorded as being from $CACHEDURL" - fi -} + if last_rev is None: + last_rev = safe_run(['git', 'log', '-n1', '--pretty=format:%H', + '--skip=10'], cwd=repodir)[1] + current_rev = safe_run(['git', 'log', '-n1', '--pretty=format:%H'], + cwd=repodir)[1] -update_cache () { - safe_run cd "$REPOCACHE" + if last_rev == current_rev: + logging.debug("No new commits, skipping changes file generation") + return - case "$MYSCM" in - git) - safe_run git fetch - ;; - svn) - args= - [ -n "$MYREVISION" ] && args="-r$MYREVISION" - safe_run svn update $args - MYSUBDIR= # repo root is subdir - ;; - hg) - if ! out=`hg pull`; then - if [[ "$out" == *'no changes found'* ]]; then - # Contrary to the docs, hg pull returns exit code 1 when - # there are no changes to pull, but we don't want to treat - # this as an error. - : - else - error "hg pull failed; aborting!" - fi - fi - ;; - bzr) - args= - [ -n "$MYREVISION" ] && args="-r$MYREVISION" - safe_run bzr update $args - ;; - *) - error "unknown SCM '$MYSCM'" - esac -} + logging.debug("Generating changes between %s and %s", last_rev, + current_rev) -switch_to_revision () { - case "$MYSCM" in - git) - # $MYREVISION may refer to any of the following: - # - # - explicit SHA1: a1b2c3d4.... - # - the SHA1 must be reachable from a default clone/fetch (generally, must be - # reachable from some branch or tag on the remote). - # - short branch name: "master", "devel" etc. - # - explicit ref: refs/heads/master, refs/tags/v1.2.3, refs/changes/49/11249/1 - # - if ! git rev-parse --verify --quiet tar_scm_tmp >/dev/null; then - safe_run git checkout -b tar_scm_tmp - fi - if git rev-parse --verify --quiet "origin/$MYREVISION" >/dev/null; then - safe_run git reset --hard "origin/$MYREVISION" - else - safe_run git reset --hard "$MYREVISION" - fi - if [ "$USE_SUBMODULES" == "enable" ]; then - safe_run git submodule update --recursive - fi - ;; - svn|bzr) - : # should have already happened via checkout or update - ;; - hg) - safe_run hg update "$MYREVISION" - ;; - # bzr) - # safe_run bzr update - # if [ -n "$MYREVISION" ]; then - # safe_run bzr revert -r "$MYREVISION" - # fi - # ;; - *) - error "unknown SCM '$MYSCM'" - esac -} + lines = safe_run(['git', 'log', '--no-merges', '--pretty=tformat:%s', + "%s..%s" % (last_rev, current_rev)], repodir)[1] -detect_version () { - if [ -z "$MYFORMAT" ]; then - case "$MYSCM" in - git) - MYFORMAT="%ct" - ;; - hg) - MYFORMAT="{rev}" - ;; - svn|bzr) - MYFORMAT="%r" - ;; - *) - error "unknown SCM '$MYSCM'" - ;; - esac - fi - - safe_run cd "$REPOPATH" - [ -n "$MYPREFIX" ] && MYPREFIX="$MYPREFIX." - get_version - TAR_VERSION="$MYPREFIX$version" -} + changes['revision'] = current_rev + changes['lines'] = '\n'.join(reversed(lines.split('\n'))) + return changes -ISO_CLEANUP_RE='s@([0-9]{4})-([0-9]{2})-([0-9]{2}) +([0-9]{2})([:]([0-9]{2})([:]([0-9]{2}))?)?( +[-+][0-9]{3,4})?@\1\2\3T\4\6\8@g' -get_version () { - case "$MYSCM" in - git) - #version=`safe_run git show --pretty=format:"$MYFORMAT" | head -n 1` - if [[ "$MYFORMAT" =~ .*@PARENT_TAG@.* ]] ; then - PARENT_TAG=$(git describe --tags --abbrev=0) - PARENT_TAG=${PARENT_TAG/-/.} - MYFORMAT=${MYFORMAT/@PARENT_TAG@/$PARENT_TAG} - echo "MYFORMAT: $MYFORMAT" - if [ $? -gt 0 ] ; then - echo -e "\e[0;31mThe git repository has no tags, thus @PARENT_TAG@ can not be expanded\e[0m" - exit 1 - fi - fi - version=`safe_run git log -n1 --date=short --pretty=format:"$MYFORMAT" | sed -r -e "$ISO_CLEANUP_RE" -e 's@[-:]@@g'` - ;; - svn) - #rev=`LC_ALL=C safe_run svn info | awk '/^Revision:/ { print $2 }'` - rev=`LC_ALL=C safe_run svn info | sed -n 's,^Last Changed Rev: $.*$,\1,p'` - version="${MYFORMAT//%r/$rev}" - ;; - hg) - rev=`safe_run hg id -n` - # Mercurial internally stores commit dates in its changelog - # context objects as (epoch_secs, tz_delta_to_utc) tuples (see - # mercurial/util.py). For example, if the commit was created - # whilst the timezone was BST (+0100) then tz_delta_to_utc is - # -3600. In this case, - # - # hg log -l1 -r$rev --template '{date}\n' - # - # will result in something like '1375437706.0-3600' where the - # first number is timezone-agnostic. However, hyphens are not - # permitted in rpm version numbers, so tar_scm removes them via - # sed. This is required for this template format for any time - # zone "numerically east" of UTC. - # - # N.B. since the extraction of the timestamp as a version number - # is generally done in order to provide chronological sorting, - # ideally we would ditch the second number. However the - # template format string is left up to the author of the - # _service file, so we can't do it here because we don't know - # what it will expand to. Mercurial provides template filters - # for dates (e.g. 'hgdate') which _service authors could - # potentially use, but unfortunately none of them can easily - # extract only the first value from the tuple, except for maybe - # 'sub(...)' which is only available since 2.4 (first introduced - # in openSUSE 12.3). - version=`safe_run hg log -l1 -r$rev --template "$MYFORMAT" | sed -r -e "$ISO_CLEANUP_RE" -e 's@[-:]@@g'` - ;; - bzr) - #safe_run bzr log -l1 ... - rev=`safe_run bzr revno` - version="${MYFORMAT//%r/$rev}" - ;; - *) - error "unknown SCM '$MYSCM'" - esac -} +def detect_changes(scm, url, repodir, outdir): + '''Detect changes between revisions.''' -prep_tree_for_tar () { - if [ ! -e "$REPOPATH/$MYSUBDIR" ]; then - error "directory does not exist: $REPOPATH/$MYSUBDIR" - fi - - if [ -z "$TAR_VERSION" ]; then - TAR_BASENAME="$FILE" - else - TAR_BASENAME="${FILE}-${TAR_VERSION}" - fi - - MYINCLUDES="" - - for INC in $INCLUDES; do - MYINCLUDES="$MYINCLUDES $TAR_BASENAME/$INC" - done - if [ -z "$MYINCLUDES" ]; then - MYINCLUDES="$TAR_BASENAME" - fi - - safe_run cd "$MYOUTDIR" - - if [ -n "$CACHEDIRECTORY" ]; then - debug cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" - safe_run cp -a "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" - else - debug mv3 "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" - safe_run mv "$REPOPATH/$MYSUBDIR" "$TAR_BASENAME" - fi -} + try: + changes = read_changes_revision(url, os.getcwd(), outdir) + except Exception, e: + sys.exit("_servicedata: Failed to parse (%s)" % e) -create_tar () { - TARFILE="${TAR_BASENAME}.tar" - TARPATH="$MYOUTDIR/$TARFILE" - debug tar --owner=root --group=root -cf "$TARPATH" $EXCLUDES $MYINCLUDES - safe_run tar --owner=root --group=root -cf "$TARPATH" $EXCLUDES $MYINCLUDES - echo "Created $TARFILE" -} + detect_changes_commands = { + 'git': detect_changes_commands_git, + } -cleanup () { - debug rm -rf "$TAR_BASENAME" "$FILE" - rm -rf "$TAR_BASENAME" "$FILE" -} + return detect_changes_commands[scm](repodir, changes) + + +def get_config_options(): + '''Read user-specific and system-wide service configuration files, if not + in test-mode. This function returns an instance of ConfigParser.''' + + config = ConfigParser.RawConfigParser() + config.optionxform = str -main () { - # Ensure we get predictable results when parsing the output of commands - # like 'git branch' - LANG=C - - set_default_params - if [ -z "$DEBUG_TAR_SCM" ]; then - get_config_options - else # We're in test-mode, so don't let any local site-wide # or per-user config impact the test suite. - : - fi - parse_params "$@" - sanitise_params - - SRCDIR=$(pwd) - cd "$MYOUTDIR" - detect_default_filename_param - - fetch_upstream - - prep_tree_for_tar - create_tar - if [ "$CHANGES_GENERATE" == "enable" ]; then - write_changes - fi + if os.getenv('DEBUG_TAR_SCM'): + logging.info("Ignoring config files: test-mode detected") + return config + + # fake a section header for configuration files + for fname in ['/etc/obs/services/tar_scm', + os.path.expanduser('~/.obs/tar_scm')]: + try: + tmp_fp = StringIO.StringIO() + tmp_fp.write('[tar_scm]\n') + tmp_fp.write(open(fname, 'r').read()) + tmp_fp.seek(0, os.SEEK_SET) + config.readfp(tmp_fp) + except (OSError, IOError): + continue + + # strip quotes from pathname + for opt in config.options('tar_scm'): + config.set('tar_scm', opt, re.sub(r'"(.*)"', r'\1', + config.get('tar_scm', opt))) + + return config + + +if __name__ == '__main__': + parser = argparse.ArgumentParser(description='Git Tarballs') + parser.add_argument('--scm', required=True, + help='Used SCM') + parser.add_argument('--url', required=True, + help='upstream tarball URL to download') + parser.add_argument('--outdir', required=True, + help='osc service parameter that does nothing') + parser.add_argument('--verbose', '-v', action='store_true', default=False, + help='enable verbose output') + parser.add_argument('--version', default='_auto_', + help='Specify version to be used in tarball. ' + 'Defaults to automatically detected value ' + 'formatted by versionformat parameter.') + parser.add_argument('--versionformat', + help='Auto-generate version from checked out source ' + 'using this format string. This parameter is ' + 'used if the \'version\' parameter is not ' + 'specified.') + parser.add_argument('--versionprefix', + help='specify a base version as prefix.') + parser.add_argument('--changesgenerate', choices=['enable', 'disable'], + default='disable', + help='Whether or not to generate changes file entries ' + 'from SCM commit log since a given parent ' + 'revision (see changesrevision).') + parser.add_argument('--changesauthor', + help='The author of the changes file entry to be ' + 'written, defaults to first email entry in ' + '~/.oscrc or "opensuse-packaging(a)opensuse.org" ' + 'if there is no ~/.oscrc found.') + parser.add_argument('--filename', + help='name of package - used together with version ' + 'to determine tarball name') + parser.add_argument('--extension', default='tar', + help='suffix name of package - used together with ' + 'filename to determine tarball name') + parser.add_argument('--revision', + help='revision to package') + parser.add_argument('--subdir', default='', + help='package just a sub directory') + group = parser.add_mutually_exclusive_group() + group.add_argument('--include', action='append', default=[], + help='for specifying subset of files/subdirectories to ' + 'pack in the tar ball') + group.add_argument('--exclude', action='append', default=[], + help='for specifying excludes when creating the ' + 'tar ball') + parser.add_argument('--package-meta', choices=['yes', 'no'], default='no', + help='Package the meta data of SCM to allow the user ' + 'or OBS to update after un-tar') + parser.add_argument('--history-depth', + help='osc service parameter that does nothing') + parser.add_argument('--submodules', + help='osc service parameter that does nothing') + args = parser.parse_args() + + # basic argument validation + if not os.path.isdir(args.outdir): + sys.exit("%s: No such directory" % args.outdir) + + if args.history_depth: + print "history-depth parameter is obsolete and will be ignored" + + # booleanize non-standard parameters + if args.changesgenerate == 'enable': + args.changesgenerate = True + else: + args.changesgenerate = False - cleanup -} + if args.package_meta == 'yes': + args.package_meta = True + else: + args.package_meta = False -main "$@" + # force verbose mode in test-mode + if os.getenv('DEBUG_TAR_SCM'): + args.verbose = True + + FORMAT = "%(message)s" + logging.basicConfig(format=FORMAT, stream=sys.stderr, level=logging.INFO) + if args.verbose: + logging.getLogger().setLevel(logging.DEBUG) + + # force cleaning of our workspace on exit + atexit.register(cleanup, CLEANUP_DIRS) + + # check for enabled caches (1. environment, 2. user confog, 3. system wide) + repocachedir = os.getenv('CACHEDIRECTORY') + if repocachedir is None: + config = get_config_options() + try: + repocachedir = config.get('tar_scm', 'CACHEDIRECTORY') + except ConfigParser.Error: + pass + + if repocachedir: + logging.debug("REPOCACHE: %s", repocachedir) + + # construct repodir (the parent directory of the checkout) + repodir = None + if repocachedir and os.path.isdir(os.path.join(repocachedir, 'repo')): + repohash = get_repocache_hash(args.scm, args.url, args.subdir) + logging.debug("HASH: %s", repohash) + repodir = os.path.join(repocachedir, 'repo') + repodir = os.path.join(repodir, repohash) + + # if caching is enabled but we haven't cached something yet + if repodir and not os.path.isdir(repodir): + repodir = tempfile.mkdtemp(dir=os.path.join(repocachedir, 'incoming')) + + if repodir is None: + repodir = tempfile.mkdtemp(dir=args.outdir) + CLEANUP_DIRS.append(repodir) + + clone_dir = fetch_upstream(args.scm, args.url, args.revision, repodir) + + if args.filename: + dstname = args.filename + else: + dstname = os.path.basename(clone_dir) -exit 0 + version = args.version + if version == '_auto_' or args.versionformat: + version = detect_version(args.scm, clone_dir, args.versionformat) + if args.versionprefix: + version = "%s.%s" % (args.versionprefix, version) + if version: + dstname = dstname + '-' + version + + logging.debug("DST: %s", dstname) + + changes = None + if args.changesgenerate: + changes = detect_changes(args.scm, args.url, clone_dir, args.outdir) + + tar_dir = prep_tree_for_tar(clone_dir, args.subdir, args.outdir, + dstname=dstname) + CLEANUP_DIRS.append(tar_dir) + + create_tar(tar_dir, args.outdir, + dstname=dstname, extension=args.extension, + exclude=args.exclude, include=args.include, + package_metadata=args.package_meta) + + if changes: + changesauthor = args.changesauthor + if changesauthor is None: + config = ConfigParser.RawConfigParser({ + 'email': 'opensuse-packaging(a)opensuse.org', + }) + config.read(os.path.expanduser('~/.oscrc')) + changesauthor = config.get('https://api.opensuse.org', 'email') + + logging.debug("AUTHOR: %s", changesauthor) + + for filename in glob.glob(os.path.join(args.outdir, '*.changes')): + write_changes(filename, changes['lines'], version, changesauthor) + write_changes_revision(changes['url'], args.outdir, + changes['revision']) + + # Populate cache + if repocachedir and os.path.isdir(os.path.join(repocachedir, 'repo')): + repodir2 = os.path.join(repocachedir, 'repo') + repodir2 = os.path.join(repodir2, repohash) + if repodir2 and not os.path.isdir(repodir2): + os.rename(repodir, repodir2) + elif not os.path.samefile(repodir, repodir2): + CLEANUP_DIRS.append(repodir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testenv.py new/obs-service-tar_scm-0.4.0.1410288598.7f38281/tests/testenv.py --- old/obs-service-tar_scm-0.3.2.1404723797.745a470/tests/testenv.py 2014-07-09 11:15:58.000000000 +0200 +++ new/obs-service-tar_scm-0.4.0.1410288598.7f38281/tests/testenv.py 2014-09-09 21:01:29.000000000 +0200 @@ -139,7 +139,7 @@ mkfreshdir(self.outdir) cmdargs = args + [ '--outdir', self.outdir ] quotedargs = [ "'%s'" % arg for arg in cmdargs ] - cmdstr = 'bash %s %s 2>&1' % (self.tar_scm_bin(), " ".join(quotedargs)) + cmdstr = 'python %s %s 2>&1' % (self.tar_scm_bin(), " ".join(quotedargs)) print print ">>>>>>>>>>>" print "Running", cmdstr -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-cairocffi for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-cairocffi for openSUSE:Factory checked in at 2014-09-10 17:02:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-cairocffi (Old) and /work/SRC/openSUSE:Factory/.python-cairocffi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-cairocffi" Changes: -------- --- /work/SRC/openSUSE:Factory/python-cairocffi/python-cairocffi.changes 2014-09-03 20:51:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-cairocffi.new/python-cairocffi.changes 2014-09-10 17:03:13.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 10 09:27:47 UTC 2014 - toddrme2178(a)gmail.com + +- Require gdk-pixbuf instead of typelib(GdkPixbuf) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-cairocffi.spec ++++++ --- /var/tmp/diff_new_pack.DwdrHH/_old 2014-09-10 17:03:14.000000000 +0200 +++ /var/tmp/diff_new_pack.DwdrHH/_new 2014-09-10 17:03:14.000000000 +0200 @@ -25,10 +25,10 @@ Url: https://github.com/SimonSapin/cairocffi Source: https://pypi.python.org/packages/source/c/cairocffi/cairocffi-%{version}.ta… BuildRequires: cairo-tools +BuildRequires: gdk-pixbuf BuildRequires: python-cffi >= 0.6 BuildRequires: python-devel BuildRequires: python-setuptools -BuildRequires: typelib(GdkPixbuf) Requires: cairo-tools Requires: python-cffi >= 0.6 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,7 +46,7 @@ %package pixbuf Summary: Python cairo bindings based on cffi - pixbuf image loader -Requires: typelib(GdkPixbuf) +Requires: gdk-pixbuf Requires: %{name} = %{version} %description pixbuf -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libyui-bindings for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libyui-bindings for openSUSE:Factory checked in at 2014-09-10 17:02:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libyui-bindings (Old) and /work/SRC/openSUSE:Factory/.libyui-bindings.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libyui-bindings" Changes: -------- --- /work/SRC/openSUSE:Factory/libyui-bindings/libyui-bindings.changes 2014-01-29 22:16:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libyui-bindings.new/libyui-bindings.changes 2014-09-10 17:03:12.000000000 +0200 @@ -0,0 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 10 07:43:07 UTC 2014 - mvidner(a)suse.com + +- Enabled building (but not running) from a non /usr prefix, + for ci.opensuse.org. +- 1.0.5 + +------------------------------------------------------------------- Old: ---- libyui-bindings-1.0.4.tar.bz2 New: ---- libyui-bindings-1.0.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libyui-bindings.spec ++++++ --- /var/tmp/diff_new_pack.cg5vfC/_old 2014-09-10 17:03:13.000000000 +0200 +++ /var/tmp/diff_new_pack.cg5vfC/_new 2014-09-10 17:03:13.000000000 +0200 @@ -18,7 +18,7 @@ Name: libyui-bindings -Version: 1.0.4 +Version: 1.0.5 Release: 0 Summary: Bindings for libyui License: LGPL-2.1 or LGPL-3.0 @@ -52,7 +52,8 @@ %build mkdir build cd build -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +cmake -DPREFIX=%{prefix} \ + -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ -DPYTHON_SITEDIR=%{py_sitedir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ ++++++ libyui-bindings-1.0.4.tar.bz2 -> libyui-bindings-1.0.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/CMakeLists.txt new/libyui-bindings-1.0.5/CMakeLists.txt --- old/libyui-bindings-1.0.4/CMakeLists.txt 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 @@ -19,7 +19,12 @@ SET( PACKAGE "libyui-bindings" ) SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) -SET( LIBYUI_INCLUDE_DIR "/usr/include/yui" ) +IF( NOT PREFIX ) + SET( PREFIX "/usr" ) +ENDIF() +SET( CMAKE_INSTALL_PREFIX "${PREFIX}" ) + +SET( LIBYUI_INCLUDE_DIR "${PREFIX}/include" ) SET( LIBYUI_LIBRARY "yui" ) SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Language Bindings for libyui") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/VERSION.cmake new/libyui-bindings-1.0.5/VERSION.cmake --- old/libyui-bindings-1.0.4/VERSION.cmake 2014-01-24 18:46:29.000000000 +0100 +++ new/libyui-bindings-1.0.5/VERSION.cmake 2014-09-10 09:53:10.000000000 +0200 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "1") SET(VERSION_MINOR "0") -SET(VERSION_PATCH "4") +SET(VERSION_PATCH "5") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/libyui-bindings.spec.cmake new/libyui-bindings-1.0.5/libyui-bindings.spec.cmake --- old/libyui-bindings-1.0.4/libyui-bindings.spec.cmake 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/libyui-bindings.spec.cmake 2014-09-10 10:48:12.000000000 +0200 @@ -1,11 +1,7 @@ # # spec file for package libyui-bindings -# generates: -# libyui-ruby -# libyui-python -# perl-libyui (Perl naming convention) # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,13 +16,14 @@ # # nodebuginfo + Name: @PACKAGE@ Version: @VERSION@ Release: 0 -License: LGPL-2.1 or LGPL-3.0 Summary: Bindings for libyui +License: LGPL-2.1 or LGPL-3.0 Group: Development/Sources -URL: https://github.com/libyui/libyui-bindings +Url: https://github.com/libyui/libyui-bindings BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: cmake BuildRequires: gcc-c++ @@ -55,7 +52,8 @@ %build mkdir build cd build -cmake -DCMAKE_INSTALL_PREFIX=%{prefix} \ +cmake -DPREFIX=%{prefix} \ + -DCMAKE_INSTALL_PREFIX=%{prefix} \ -DLIB=%{_lib} \ -DPYTHON_SITEDIR=%{py_sitedir} \ -DCMAKE_VERBOSE_MAKEFILE=TRUE \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/perl/CMakeLists.txt new/libyui-bindings-1.0.5/swig/perl/CMakeLists.txt --- old/libyui-bindings-1.0.4/swig/perl/CMakeLists.txt 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/swig/perl/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 @@ -16,9 +16,13 @@ EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{installvendorlib}" OUTPUT_VARIABLE PERL_VENDOR_LIB) EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{ccdlflags}" OUTPUT_VARIABLE PERL_LINK_FLAGS) +STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" PERL_VENDOR_ARCH "${PERL_VENDOR_ARCH}") +STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" PERL_VENDOR_LIB "${PERL_VENDOR_LIB}") + MESSAGE(STATUS "Perl executable: ${PERL_EXECUTABLE}") MESSAGE(STATUS "Perl core dir: ${PERL_CORE_DIR}") -MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDORDIR}") +MESSAGE(STATUS "Perl vendor arch dir: ${PERL_VENDOR_ARCH}") +MESSAGE(STATUS "Perl vendor lib dir: ${PERL_VENDOR_LIB}") ADD_DEFINITIONS( ${PERL_CCFLAGS} -Wno-unused -Wno-error ) LINK_DIRECTORIES( ${PERL_CORE_DIR} ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/python/CMakeLists.txt new/libyui-bindings-1.0.5/swig/python/CMakeLists.txt --- old/libyui-bindings-1.0.4/swig/python/CMakeLists.txt 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/swig/python/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 @@ -15,7 +15,8 @@ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write(sys.path[2])" OUTPUT_VARIABLE PYTHON_LIB_DIR) IF (NOT PYTHON_SITEDIR) -SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}/site-packages) + SET (PYTHON_SITEDIR ${PYTHON_LIB_DIR}/site-packages) + STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" PYTHON_SITEDIR "${PYTHON_SITEDIR}") ENDIF (NOT PYTHON_SITEDIR) MESSAGE(STATUS "Python executable: ${PYTHON_EXECUTABLE}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/ruby/CMakeLists.txt new/libyui-bindings-1.0.5/swig/ruby/CMakeLists.txt --- old/libyui-bindings-1.0.4/swig/ruby/CMakeLists.txt 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/swig/ruby/CMakeLists.txt 2014-09-10 09:53:10.000000000 +0200 @@ -5,6 +5,7 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-strict-aliasing") EXECUTE_PROCESS(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDOR_ARCH_DIR) +STRING(REGEX REPLACE "^/usr/" "${CMAKE_INSTALL_PREFIX}/" RUBY_VENDOR_ARCH_DIR "${RUBY_VENDOR_ARCH_DIR}") MESSAGE(STATUS "Ruby executable: ${RUBY_EXECUTABLE}") MESSAGE(STATUS "Ruby vendor arch dir: ${RUBY_VENDOR_ARCH_DIR}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/ruby/examples/hello_world.rb new/libyui-bindings-1.0.5/swig/ruby/examples/hello_world.rb --- old/libyui-bindings-1.0.4/swig/ruby/examples/hello_world.rb 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/swig/ruby/examples/hello_world.rb 2014-09-10 10:18:09.000000000 +0200 @@ -1,3 +1,5 @@ +# encoding: utf-8 + # # Trivial libyui example # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/ruby/examples/selection_box3.rb new/libyui-bindings-1.0.5/swig/ruby/examples/selection_box3.rb --- old/libyui-bindings-1.0.4/swig/ruby/examples/selection_box3.rb 2013-07-01 16:16:19.000000000 +0200 +++ new/libyui-bindings-1.0.5/swig/ruby/examples/selection_box3.rb 2014-09-10 09:53:10.000000000 +0200 @@ -20,11 +20,11 @@ # but it is dumb and yields a useless SimpleFactory instead, # so let's forward it def <<(*args) - @parent_widget.<< (*args) + @parent_widget.<<(*args) end - METHODS = %w{popup_dialog selection_box hbox vbox output_field - push_button vspacing left right} + METHODS = ["popup_dialog", "selection_box", "hbox", "vbox", "output_field", + "push_button", "vspacing", "left", "right"] def method_missing(name, *args, &block) super(name, *args, &block) unless METHODS.include? name.to_s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libyui-bindings-1.0.4/swig/yui.i new/libyui-bindings-1.0.5/swig/yui.i --- old/libyui-bindings-1.0.4/swig/yui.i 2014-01-24 18:46:29.000000000 +0100 +++ new/libyui-bindings-1.0.5/swig/yui.i 2014-09-10 09:53:10.000000000 +0200 @@ -136,7 +136,7 @@ %include "stl.i" class Exception; -%include YUI.h +%include yui/YUI.h %define YUILogComponent "bindings" %enddef @@ -167,90 +167,90 @@ %apply SWIGTYPE *DISOWN { YTableHeader *header_disown }; %apply SWIGTYPE *DISOWN { YWidget *parent_disown }; -%include YUILog.h -%include YUIPlugin.h +%include yui/YUILog.h +%include yui/YUIPlugin.h -%include YTypes.h -%include YWidget.h -%include YSingleChildContainerWidget.h -%include YSelectionWidget.h -%include YSimpleInputField.h -%include YItem.h -%include YTreeItem.h -%include YStringTree.h - -%include YWidgetFactory.h - -%include YDialog.h - -%include YAlignment.h -%include YApplication.h -%include YBarGraph.h -%include YBothDim.h -%include YBuiltinCaller.h -%include YBusyIndicator.h -%include YCheckBoxFrame.h -%include YCheckBox.h -%include YChildrenManager.h -%include YColor.h -%include YComboBox.h -%include YCommandLine.h -%include YDateField.h -%include YDownloadProgress.h -%include YDumbTab.h -%include YEmpty.h -%include YEvent.h -%include YFrame.h -%include YImage.h -%include YInputField.h -%include YIntField.h -%include YLabel.h -%include YLayoutBox.h -%include YLogView.h -%include YMacro.h -%include YMacroPlayer.h -%include YMacroRecorder.h -%include YMenuButton.h -%include YMenuItem.h -%include YMultiLineEdit.h -%include YMultiProgressMeter.h -%include YMultiSelectionBox.h -%include YOptionalWidgetFactory.h -%include YPackageSelector.h -%include YPackageSelectorPlugin.h -%include YPartitionSplitter.h -%include YProgressBar.h -%include YProperty.h -%include YPushButton.h -%include YRadioButtonGroup.h -%include YRadioButton.h -%include YReplacePoint.h -%include YRichText.h -%include YRpmGroupsTree.h -%include YSelectionBox.h -%include YSettings.h -%include YShortcut.h -%include YShortcutManager.h -%include YSimpleEventHandler.h -%include YSlider.h -%include YSpacing.h -%include YSquash.h -%include YTable.h -%include YTableHeader.h -%include YTableItem.h -%include YTimeField.h -%include YTimezoneSelector.h -%include YTransText.h -%include YTree.h -%include YUIException.h -%include YUI.h -%include YUILoader.h -%include YUILog.h -%include YUISymbols.h -%include YWidgetID.h -%include YWizard.h -%include YExternalWidgetFactory.h -%include YExternalWidgets.h +%include yui/YTypes.h +%include yui/YWidget.h +%include yui/YSingleChildContainerWidget.h +%include yui/YSelectionWidget.h +%include yui/YSimpleInputField.h +%include yui/YItem.h +%include yui/YTreeItem.h +%include yui/YStringTree.h + +%include yui/YWidgetFactory.h + +%include yui/YDialog.h + +%include yui/YAlignment.h +%include yui/YApplication.h +%include yui/YBarGraph.h +%include yui/YBothDim.h +%include yui/YBuiltinCaller.h +%include yui/YBusyIndicator.h +%include yui/YCheckBoxFrame.h +%include yui/YCheckBox.h +%include yui/YChildrenManager.h +%include yui/YColor.h +%include yui/YComboBox.h +%include yui/YCommandLine.h +%include yui/YDateField.h +%include yui/YDownloadProgress.h +%include yui/YDumbTab.h +%include yui/YEmpty.h +%include yui/YEvent.h +%include yui/YFrame.h +%include yui/YImage.h +%include yui/YInputField.h +%include yui/YIntField.h +%include yui/YLabel.h +%include yui/YLayoutBox.h +%include yui/YLogView.h +%include yui/YMacro.h +%include yui/YMacroPlayer.h +%include yui/YMacroRecorder.h +%include yui/YMenuButton.h +%include yui/YMenuItem.h +%include yui/YMultiLineEdit.h +%include yui/YMultiProgressMeter.h +%include yui/YMultiSelectionBox.h +%include yui/YOptionalWidgetFactory.h +%include yui/YPackageSelector.h +%include yui/YPackageSelectorPlugin.h +%include yui/YPartitionSplitter.h +%include yui/YProgressBar.h +%include yui/YProperty.h +%include yui/YPushButton.h +%include yui/YRadioButtonGroup.h +%include yui/YRadioButton.h +%include yui/YReplacePoint.h +%include yui/YRichText.h +%include yui/YRpmGroupsTree.h +%include yui/YSelectionBox.h +%include yui/YSettings.h +%include yui/YShortcut.h +%include yui/YShortcutManager.h +%include yui/YSimpleEventHandler.h +%include yui/YSlider.h +%include yui/YSpacing.h +%include yui/YSquash.h +%include yui/YTable.h +%include yui/YTableHeader.h +%include yui/YTableItem.h +%include yui/YTimeField.h +%include yui/YTimezoneSelector.h +%include yui/YTransText.h +%include yui/YTree.h +%include yui/YUIException.h +%include yui/YUI.h +%include yui/YUILoader.h +%include yui/YUILog.h +%include yui/YUISymbols.h +%include yui/YWidgetID.h +%include yui/YWizard.h +%include yui/YExternalWidgetFactory.h +%include yui/YExternalWidgets.h #if defined(SWIGRUBY) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit poppler-data for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package poppler-data for openSUSE:Factory checked in at 2014-09-10 17:02:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/poppler-data (Old) and /work/SRC/openSUSE:Factory/.poppler-data.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "poppler-data" Changes: -------- --- /work/SRC/openSUSE:Factory/poppler-data/poppler-data.changes 2013-03-13 07:33:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.poppler-data.new/poppler-data.changes 2014-09-10 17:03:10.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 9 16:45:49 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.4.7: + + Add a pkg-config file. +- Place pkg-config file in main package, as there is no need for a + seperate devel-package. +- Add pkg-config BuildRequires in order to get a pkgconfig() + Provides. + +------------------------------------------------------------------- Old: ---- poppler-data-0.4.6.tar.gz New: ---- poppler-data-0.4.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ poppler-data.spec ++++++ --- /var/tmp/diff_new_pack.LuLmAt/_old 2014-09-10 17:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.LuLmAt/_new 2014-09-10 17:03:11.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package poppler-data # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,13 +17,14 @@ Name: poppler-data -Version: 0.4.6 +Version: 0.4.7 Release: 0 Url: http://poppler.freedesktop.org/ Summary: Encoding Files for use with libpoppler License: BSD-3-Clause and GPL-2.0 Group: System/Libraries Source: http://poppler.freedesktop.org/%{name}-%{version}.tar.gz +BuildRequires: pkg-config BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -46,5 +47,6 @@ %defattr (-, root, root) %doc COPYING COPYING.adobe COPYING.gpl2 README %{_datadir}/poppler +%{_datadir}/pkgconfig/poppler-data.pc %changelog ++++++ poppler-data-0.4.6.tar.gz -> poppler-data-0.4.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-data-0.4.6/Makefile new/poppler-data-0.4.7/Makefile --- old/poppler-data-0.4.6/Makefile 2012-10-16 23:25:52.000000000 +0200 +++ new/poppler-data-0.4.7/Makefile 2014-08-12 20:46:01.000000000 +0200 @@ -1,26 +1,28 @@ PACKAGE = poppler-data -VERSION = 0.4.6 +VERSION = 0.4.7 distdir = $(PACKAGE)-$(VERSION) prefix = /usr/local datadir = $(prefix)/share pkgdatadir = $(datadir)/poppler -all : +all : poppler-data.pc -install : +install : all install -d -m 0755 $(DESTDIR)$(pkgdatadir)/cidToUnicode install -m 0644 $(cid-to-unicode-files) $(DESTDIR)$(pkgdatadir)/cidToUnicode install -d -m 0755 $(DESTDIR)$(pkgdatadir)/nameToUnicode install -m 0644 $(name-to-unicode-files) $(DESTDIR)$(pkgdatadir)/nameToUnicode install -d -m 0755 $(DESTDIR)$(pkgdatadir)/unicodeMap install -m 0644 $(unicode-map-files) $(DESTDIR)$(pkgdatadir)/unicodeMap + install -d -m 0755 $(DESTDIR)$(datadir)/pkgconfig + install -m 0644 poppler-data.pc $(DESTDIR)$(datadir)/pkgconfig for f in $(cmap-files); do \ install -d -m 0755 $(DESTDIR)$(pkgdatadir)/`dirname $$f`; \ install -m 0644 $$f $(DESTDIR)$(pkgdatadir)/$$f; \ done -distdir : $(DISTFILES) +distdir : $(DISTFILES) all rm -rf $(distdir) mkdir $(distdir) for f in $(DISTFILES); do \ @@ -35,6 +37,15 @@ clean : rm -rf $(distdir) +# poppler-data.pc is not a real PHONY target, but this trick +# allows to force-generate it when needed. +.PHONY: poppler-data.pc +poppler-data.pc : poppler-data.pc.in + sed -e 's!@prefix@!$(prefix)!g' \ + -e 's!@pkgdatadir@!$(pkgdatadir)!g' \ + -e 's/@VERSION@/$(VERSION)/g' \ + poppler-data.pc.in > poppler-data.pc + unicode-map-files = \ unicodeMap/Big5 \ unicodeMap/Big5ascii \ @@ -292,6 +303,8 @@ cidToUnicode/Adobe-Korea1 DISTFILES = \ + poppler-data.pc.in \ + poppler-data.pc \ Makefile \ README \ COPYING \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-data-0.4.6/poppler-data.pc new/poppler-data-0.4.7/poppler-data.pc --- old/poppler-data-0.4.6/poppler-data.pc 1970-01-01 01:00:00.000000000 +0100 +++ new/poppler-data-0.4.7/poppler-data.pc 2014-08-12 20:46:01.000000000 +0200 @@ -0,0 +1,8 @@ +poppler_datadir=/usr/local/share/poppler + +Name: poppler-data +Description: Encoding files for use with poppler +Version: 0.4.7 + +Cflags: -DPOPPLER_DATADIR=/usr/local/share/poppler + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/poppler-data-0.4.6/poppler-data.pc.in new/poppler-data-0.4.7/poppler-data.pc.in --- old/poppler-data-0.4.6/poppler-data.pc.in 1970-01-01 01:00:00.000000000 +0100 +++ new/poppler-data-0.4.7/poppler-data.pc.in 2014-08-12 20:46:01.000000000 +0200 @@ -0,0 +1,8 @@ +poppler_datadir=@pkgdatadir@ + +Name: poppler-data +Description: Encoding files for use with poppler +Version: @VERSION@ + +Cflags: -DPOPPLER_DATADIR=@pkgdatadir@ + -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit kiwi-config-openSUSE for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2014-09-10 17:02:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi-config-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2014-08-25 11:05:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2014-09-10 17:03:09.000000000 +0200 @@ -1,0 +2,21 @@ +Tue Sep 9 14:30:01 UTC 2014 - coolo(a)suse.com + +- disable usb configs, remove config-hal.patch and config-firstboot.patch + +------------------------------------------------------------------- +Tue Sep 9 14:20:31 UTC 2014 - coolo(a)suse.com + +- remove clicfs support - we don't use it anymore + +------------------------------------------------------------------- +Tue Sep 9 14:16:14 UTC 2014 - lnussel(a)suse.de + +- remove ifcfg-eth0, not used anymore + +------------------------------------------------------------------- +Tue Sep 9 12:41:10 UTC 2014 - lnussel(a)suse.de + +- disable wicked +- throw out obsolete sound card hacks, /etc/hosts hack + +------------------------------------------------------------------- Old: ---- clicfs.service config-firstboot.patch config-hal.patch ifcfg-eth0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200 @@ -38,23 +38,19 @@ Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1: COPYING -Source2: config-hal.patch Source3: config.sh Source4: config.xml.in -Source8: ifcfg-eth0 Source9: isopatch.sh.in Source10: README Source11: correct_live_for_reboot Source12: correct_live_install Source16: langset.service Source17: 99-ignore-live-usb.fdi -Source19: config-firstboot.patch Source20: geturls.xsl Source22: getcountrydata.ycp Source23: langset.sh Source26: xdm-liveinstall.patch Source27: SoftLocks -Source28: clicfs.service Source30: GPL-2.0.txt Source31: gpl-3.0.txt ExcludeArch: ia64 ppc64 s390x s390 ppc @@ -80,19 +76,12 @@ mv $i ${i/.UTF-8/} done popd -for config in livecd-kde livecd-gnome usb-kde usb-gnome livecd-x11 usb-x11; do +for config in livecd-kde livecd-gnome livecd-x11; do cd $BASEDIR mkdir $config cd $config desktop=`echo $config | cut -d- -f2` type=`echo $config | cut -d- -f1` - if test $type = usb; then - #sed -i -e "s,yast2-live-installer,yast2-firstboot," wanted.list - #sed -i -e "s,release-livecd,release-usb," wanted.list - othertype=livecd - else - othertype=usb - fi install -m 755 %{SOURCE3} config.sh if test $desktop = kde; then echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER kdm4' >> config.sh @@ -106,18 +95,7 @@ echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' >> config.sh fi - if test $type = usb; then - echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' >> config.sh - fi - - echo '/usr/bin/systemctl -f enable NetworkManager.service' >> config.sh - - grep -v " type:$othertype " %{SOURCE4} | \ - xmllint --format - > config.xml - if test $type = usb; then - sed -i -e 's,#USB ,,' config.sh - fi - sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml + sed -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," %{SOURCE4} > config.xml sed -i -e "s,@VERSION@,$kiwiversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml volid="openSUSE %{version} Live" @@ -136,9 +114,6 @@ ;; esac label=`echo "$volid" | sed -e 's, ,_,g'` - if test $type = usb; then - sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml - fi sed -i -e "s,@VOLID@,$volid,; s,@LABEL@,$label," config.xml %ifarch x86_64 sed -i -e "s,@BOOTKERNEL@,desktop," config.xml @@ -146,6 +121,7 @@ sed -i -e "s,@BOOTKERNEL@,std," config.xml sed -i -e 's,firmware="uefi",,' config.xml %endif + xmllint --format config.xml > t && mv t config.xml jing /usr/share/kiwi/modules/KIWISchema.rng config.xml sed -e "s,^desktop=,desktop=$desktop," %{SOURCE9} > isopatch.sh @@ -167,22 +143,11 @@ mkdir -p var/lib/zypp install -m 644 %{SOURCE27} var/lib/zypp/SoftLocks echo 0123456-7890-$desktop-$type-0123456 > var/lib/zypp/AnonymousUniqueId - if test $type = usb; then - cp %{SOURCE19} var/lib/livecd/config-firstboot.patch - mkdir -p var/lib/YaST2 - touch var/lib/YaST2/reconfig_system - # still needed due to a bug in yast2-installation - touch etc/reconfig_system - touch etc/dmidecode.md5 - fi - install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh install -D -m 755 %{SOURCE16} usr/lib/systemd/system/langset.service install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot install -D -m 755 %{SOURCE12} usr/bin/correct_live_install - install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch - install -D -m 644 %{SOURCE28} etc/systemd/system/clicfs.service if test $desktop != x11; then install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch fi ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200 @@ -28,25 +28,16 @@ #-------------------------------------- echo "Configure image: [$name]..." -if test -n "$use_special_hacks"; then -#====================================== -# Load sound drivers by default #-------------------------------------- -perl -ni -e 'm,^blacklist snd-, || print;' \ - /etc/modprobe.d/50-blacklist.conf - -# and unmute their mixers. -perl -pi -e 's,/sbin/alsactl -F restore,/bin/set_default_volume -f,;' \ - /etc/udev/rules.d/40-alsa.rules -fi +# enable and disable services -#-------------------------------------- -# these two we want to disable for policy reasons -chkconfig sshd off -chkconfig cron off +for i in langset NetworkManager; do + systemctl -f enable $i +done +for i in sshd cron wicked purge-kernels; do + systemctl -f disable $i +done -ln -s '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' -ln -s '/usr/lib/systemd/system/langset.service' '/usr/lib/systemd/system/sysinit.target.wants/langset.service' cd / if test -e /etc/YaST2/liveinstall.patch; then @@ -57,10 +48,6 @@ patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch fi -# disabled for now - if you reenable, don't forget correct_live_install -# bnc#382158 -# patch -p0 < /etc/YaST2/policy.patch - for i in /rpmkeys/gpg*.asc; do # the import fails if kiwi already had this key rpm --import $i || true @@ -68,8 +55,6 @@ done rmdir /rpmkeys -insserv - rm -rf /var/cache/zypp/raw/* bash -x /var/lib/livecd/geturls.sh @@ -113,8 +98,6 @@ #USB /usr/bin/correct_live_for_reboot usb #USB /usr/bin/correct_live_install usb -echo '127.0.0.2 linux.site linux' >> /etc/hosts - ln -s /usr/lib/systemd/system/runlevel5.target /etc/systemd/system/default.target baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz ++++++ config.xml.in ++++++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200 @@ -6,14 +6,7 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="overlay" hybrid="true" hybridpersistent="true" image="iso" editbootconfig="isopatch.sh" firmware="uefi" volid="@VOLID@"/>  - <type boot="oemboot/suse-@VERSION@" filesystem="ext4" image="oem">  - <oemconfig>  - <oem-swap>false</oem-swap>  - <oem-boot-title>USB</oem-boot-title>  - </oemconfig>  - <size unit="M">3000</size>  - </type>  + <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="overlay" hybrid="true" hybridpersistent="true" image="iso" editbootconfig="isopatch.sh" firmware="uefi" volid="@VOLID@"/> <version>2.8.0</version> <bootloader-theme>openSUSE</bootloader-theme> <bootsplash-theme>openSUSE</bootsplash-theme> ++++++ correct_live_for_reboot ++++++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200 @@ -13,8 +13,7 @@ if test -e /etc/init.d/boot.compcache; then chkconfig boot.compcache off fi -rm /etc/systemd/system/multi-user.target.wants/clicfs.service /usr/lib/systemd/system/sysinit.target.wants/langset.service -rm /etc/systemd/system/clicfs.service /etc/systemd/system/multi-user.target.wants/clicfs.service +rm /usr/lib/systemd/system/sysinit.target.wants/langset.service rm /usr/lib/systemd/system/langset.service /usr/lib/systemd/system/sysinit.target.wants/langset.service ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.mXg0f2/_old 2014-09-10 17:03:10.000000000 +0200 +++ /var/tmp/diff_new_pack.mXg0f2/_new 2014-09-10 17:03:10.000000000 +0200 @@ -32,8 +32,6 @@ rm -rf /etc/langset/ cd / -# patch -R -p0 < /etc/YaST2/policy.patch -rm /etc/YaST2/policy.patch patch -R -p0 < /etc/YaST2/liveinstall.patch rm /etc/YaST2/liveinstall.patch -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-Image-ExifTool for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package perl-Image-ExifTool for openSUSE:Factory checked in at 2014-09-10 17:02:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-Image-ExifTool (Old) and /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-Image-ExifTool" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-Image-ExifTool/perl-Image-ExifTool.changes 2014-03-09 18:39:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.perl-Image-ExifTool.new/perl-Image-ExifTool.changes 2014-09-10 17:03:06.000000000 +0200 @@ -1,0 +2,81 @@ +Tue Sep 9 23:40:12 UTC 2014 - Greg.Freemyer(a)gmail.com + +Update to Version 9.70 (production release) + + - Improved verbose dump for LFP images + - Patched to repair incorrect list types in XMP structures when writing + - Patched to avoid MPEG Layer 3 check for files with a "MUS" extension + - Fixed incorrect behaviour of -addTagsFromFile when adding list items from + multiple variable-named source files + +July 27, 2014 - Version 9.69 + + - Added ability to write PNG PhysicalPixel (PNG-pHYs) tags + - Added minor warning when creating EXIF or IPTC in PNG images + - API Changes: + - Shift.pl now autoloads when ShiftTime() is called + - The 3rd argument to ShiftTime() is now optional + +July 19, 2014 - Version 9.68 + + - Added read support for Lytro LFP files + - Allow Composite tag to have no Require'd or Desire'd tags + - Improved -geotag verbose output + - Changed so XMP tags take priority when reading QuickTime-format files + - Changed PSD file description to "Photoshop Document" + - Fixed problem where -geotag option could fail if -v4 was used + - Fixed problem writing SonyDateTime2 + +July 6, 2014 - Version 9.67 + + - Fixed inaccuracies in decoding some SigmaRaw tags from the X3F header + +July 1, 2014 - Version 9.66 + + - Swap "GPS track start/end" labels in -geotag -v2 output if track is stored + in reverse chronological order + - Changed handling of IPTC groups so that standard IPTC always has a family 1 + group name of "IPTC", and takes priority over non-standard IPTC when + duplicates are not allowed + - Fixed problem parsing some NMEA sentences, and added support for GPZDA + +June 20, 2014 - Version 9.65 + + - Added a print conversion for Unknown ICC_Profile MeasurementGeometry + - Added LargeTags shortcut + - Avoid loading data for some tags with large binary data values if they were + specifically excluded by the command + - Patched potential "subscript -1" runtime error when reading EPS files + +June 14, 2014 - Version 9.64 + + - Added write-only TestName tag for dry-run tests of file renaming feature + - Patched to avoid structure warnings when copying tags from ZIP-based files + - Fixed problem using advanced formatting feature in a -if condition + - Fixed problem parsing Canon VignettingCorr for some newer PowerShot models + - API Changes: + - Added 'Test' option to SetFileName() + +May 31, 2014 - Version 9.63 + + - Added ability to combine -lang option with -listx to extract only one language + - Remove leading XML comment from XMP if it exists when writing as a block + - Another attempt to patch problem obtaining a consistent "full path" for + source files when importing a CSV database in Windows + +May 24, 2014 - Version 9.62 + + - Added message about SourceFile names to -v2 output when importing a database + with -csv= or -json= + - Changed -n option for GPSTimeStamp to return nanosecond precision + +May 18, 2014 - Version 9.61 + + - Added ability to combine -l with -listf, -listr or -listwf to add + descriptions of the file type + - Fixed quirk where ExifTool could incorrectly report that a file was changed + when conditionally deleting a non-existent tag as a block + + .... see Changes for more, especially all device specific release notes + +------------------------------------------------------------------- Old: ---- Image-ExifTool-9.53.tar.gz New: ---- Image-ExifTool-9.70.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-Image-ExifTool.spec ++++++ --- /var/tmp/diff_new_pack.HFddlf/_old 2014-09-10 17:03:08.000000000 +0200 +++ /var/tmp/diff_new_pack.HFddlf/_new 2014-09-10 17:03:08.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-Image-ExifTool -Version: 9.53 +Version: 9.70 Release: 0 %define cpan_name Image-ExifTool Summary: Perl module to read and write meta information ++++++ Image-ExifTool-9.53.tar.gz -> Image-ExifTool-9.70.tar.gz ++++++ ++++ 47628 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-qt5 for openSUSE:Factory checked in at 2014-09-10 17:02:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-qt5 (Old) and /work/SRC/openSUSE:Factory/.python-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/python-qt5/python-qt5.changes 2014-07-10 14:56:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-qt5.new/python-qt5.changes 2014-09-10 17:03:05.000000000 +0200 @@ -1,0 +2,7 @@ +Wed Sep 10 06:29:27 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Added add_dep.patch: make the buildsystem know that QtPrintSUpport + module is needed for QtWebkitWidgets one, previously the build + only succeeded due to QTBUG-39249 + +------------------------------------------------------------------- python3-qt5.changes: same change New: ---- add_dep.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-qt5.spec ++++++ --- /var/tmp/diff_new_pack.UbsW0I/_old 2014-09-10 17:03:06.000000000 +0200 +++ /var/tmp/diff_new_pack.UbsW0I/_new 2014-09-10 17:03:06.000000000 +0200 @@ -31,6 +31,9 @@ Patch2: disable-rpaths.diff # PATCH-FIX-UPSTREAM: fix_qreal_check.diff -- check if qreal is double based on sizeof Patch3: fix_qreal_check.diff +# PATCH-FIX-UPSTREAM: add_dep.patch -- make the buildsystem know that QtPrintSUpport +# module is needed for QtWebkitWidgets one, previously the build only succeeded due to QTBUG-39249 +Patch4: add_dep.patch BuildRequires: dbus-1-python-devel BuildRequires: fdupes BuildRequires: gdb @@ -104,6 +107,7 @@ #PATCH-FIX-OPENSUSE: Disable RPATH when building PyQt5. %patch2 #patch3 -p1 +%patch4 -p1 %build export CXXFLAGS="%{optflags}" python3-qt5.spec: same change ++++++ add_dep.patch ++++++ --- PyQt-gpl-5.3.1/configure.py 2014-07-04 11:09:11.000000000 +0200 +++ PyQt-gpl-5.3.1.new/configure.py 2014-09-09 03:13:52.351527684 +0200 @@ -86,7 +86,7 @@ MODULE_METADATA = { 'QtSvg': ModuleMetadata(qmake_QT=['svg']), 'QtTest': ModuleMetadata(qmake_QT=['testlib', 'widgets']), 'QtWebKit': ModuleMetadata(qmake_QT=['webkit', 'network']), - 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets']), + 'QtWebKitWidgets': ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport']), 'QtWebSockets': ModuleMetadata(qmake_QT=['websockets']), 'QtWidgets': ModuleMetadata(qmake_QT=['widgets']), 'QtWinExtras': ModuleMetadata(qmake_QT=['winextras', 'widgets']), -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit telepathy-qt5 for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2014-09-10 17:02:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt5/telepathy-qt5.changes 2014-07-31 21:51:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2014-09-10 17:03:00.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 9 22:49:03 UTC 2014 - hrvoje.senjan(a)gmail.com + +- Update to 0.9.5: + * Added more service side bindings + * Service bindings now enabled by default + * Bump Farstream version + * Allow subclass of Tp::ReceivedMessage + * Workaround invalid channelRequests when delegating, fdo#77986 +- Drop search-for-gstreamer1.0.diff and search-for-farstream0.2.diff, + merged upstream +- Provide telepathy-qt5-service-devel-static, due to newly enabled + service library + +------------------------------------------------------------------- Old: ---- search-for-farstream0.2.diff search-for-gstreamer1.0.diff telepathy-qt-0.9.4.tar.gz New: ---- telepathy-qt-0.9.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ --- /var/tmp/diff_new_pack.dcJQeC/_old 2014-09-10 17:03:02.000000000 +0200 +++ /var/tmp/diff_new_pack.dcJQeC/_new 2014-09-10 17:03:02.000000000 +0200 @@ -20,7 +20,7 @@ %define major 0 Name: telepathy-qt5 -Version: 0.9.4 +Version: 0.9.5 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ @@ -28,10 +28,6 @@ Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{versi… Source1: baselibs.conf -# PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for farstream0.2, instead of deprecated 0.1 -Patch0: search-for-farstream0.2.diff -# PATCH-FIX-UPSTREAM search-for-gstreamer1.0.diff -- searches for gstreamer1.0, which is only required for includes -Patch1: search-for-gstreamer1.0.diff BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes @@ -74,6 +70,7 @@ %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ +Provides: %{name}-service-devel-static = %{version} Requires: %{libname}-%{major} = %{version} Requires: %{libname}-farstream%{major} = %{version} Requires: pkgconfig(gstreamer-1.0) @@ -84,8 +81,6 @@ %prep %setup -q -n telepathy-qt-%{version} -%patch0 -p1 -%patch1 -p1 %build if [ %{_lib} = lib64 ]; then @@ -131,6 +126,7 @@ %doc AUTHORS ChangeLog README COPYING HACKING NEWS %{_includedir}/telepathy-qt5/ %{_libdir}/libtelepathy-qt5*.so +%{_libdir}/libtelepathy-qt5-service.a %{_libdir}/pkgconfig/TelepathyQt5*.pc %{_libdir}/cmake/TelepathyQt5*/ ++++++ telepathy-qt-0.9.4.tar.gz -> telepathy-qt-0.9.5.tar.gz ++++++ ++++ 622423 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit perl-MIME-Types for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package perl-MIME-Types for openSUSE:Factory checked in at 2014-09-10 17:02:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/perl-MIME-Types (Old) and /work/SRC/openSUSE:Factory/.perl-MIME-Types.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "perl-MIME-Types" Changes: -------- --- /work/SRC/openSUSE:Factory/perl-MIME-Types/perl-MIME-Types.changes 2014-08-28 21:05:53.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.perl-MIME-Types.new/perl-MIME-Types.changes 2014-09-10 17:02:58.000000000 +0200 @@ -1,0 +2,35 @@ +Tue Sep 9 17:38:25 UTC 2014 - mardnh(a)gmx.de + +- update to version 2.0.8 + + - version 2.08: Fri Sep 5 15:29:52 CEST 2014 + + Fixes: + - fix test t/40mojo.t which mojo is not installed + rt.cpan.org#98639 [Chris] + + Improvements: + - remove dependency on Scalar::Util + - documentation fixes + + - version 2.07: Fri Sep 5 12:08:06 CEST 2014 + + Fixes: + - MIME::Type::equals() did cmp not eq + + Improvements: + - new httpAccept() wth tests in t/21accept.t + - new httpAcceptBest() and httpAcceptSelect() with tests + in t/22accbest.t + - add MojoX::MIME::Types with tests in t/40mojo.t + - now depends on List::Util and Scalar::Util + + - version 2.06: Thu Aug 28 16:28:43 CEST 2014 + + Improvements: + - needed other file from broofa :( + rt.cpan.org#98308 [Lars Dɪᴇᴄᴋᴏᴡ] + - fix scan of freedesktop definitions + rt.cpan.org #98385 [Russell Jenkins] + +------------------------------------------------------------------- Old: ---- MIME-Types-2.05.tar.gz New: ---- MIME-Types-2.08.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ perl-MIME-Types.spec ++++++ --- /var/tmp/diff_new_pack.VRMziM/_old 2014-09-10 17:03:00.000000000 +0200 +++ /var/tmp/diff_new_pack.VRMziM/_new 2014-09-10 17:03:00.000000000 +0200 @@ -17,7 +17,7 @@ Name: perl-MIME-Types -Version: 2.05 +Version: 2.08 Release: 0 %define cpan_name MIME-Types Summary: MIME-Type Determination @@ -55,5 +55,7 @@ %doc %{_mandir}/man?/* %{perl_vendorarch}/auto/MIME %{perl_vendorlib}/MIME +%{perl_vendorlib}/MojoX +%{perl_vendorlib}/MojoX/MIME %changelog ++++++ MIME-Types-2.05.tar.gz -> MIME-Types-2.08.tar.gz ++++++ ++++ 1669 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit puppet for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package puppet for openSUSE:Factory checked in at 2014-09-10 17:02:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/puppet (Old) and /work/SRC/openSUSE:Factory/.puppet.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "puppet" Changes: -------- --- /work/SRC/openSUSE:Factory/puppet/puppet.changes 2014-08-05 13:00:37.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.puppet.new/puppet.changes 2014-09-10 17:02:53.000000000 +0200 @@ -1,0 +2,15 @@ +Fri Sep 5 16:57:18 UTC 2014 - darin(a)darins.net + +- Update to 3.7.0 + * A nearly-final implementation of the Puppet 4 language + * Preview support for a new, fast, natively compiled Facter + * 64-bit Puppet packages for Windows + * Lots of deprecations to prepare for Puppet 4.0 + + See release notes for update information: + https://docs.puppetlabs.com/puppet/3.7/reference/release_notes.html + + For a full list of bugs fixes see: + https://tickets.puppetlabs.com/issues/?filter=12643 + +------------------------------------------------------------------- Old: ---- puppet-3.6.2.tar.gz New: ---- puppet-3.7.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ puppet.spec ++++++ --- /var/tmp/diff_new_pack.NUfh6W/_old 2014-09-10 17:02:57.000000000 +0200 +++ /var/tmp/diff_new_pack.NUfh6W/_new 2014-09-10 17:02:57.000000000 +0200 @@ -22,7 +22,7 @@ %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services Name: puppet -Version: 3.6.2 +Version: 3.7.0 Release: 0 Summary: A network tool for managing many disparate systems License: Apache-2.0 ++++++ puppet-3.6.2.tar.gz -> puppet-3.7.0.tar.gz ++++++ ++++ 71822 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit python-libnacl for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package python-libnacl for openSUSE:Factory checked in at 2014-09-10 17:02:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-libnacl (Old) and /work/SRC/openSUSE:Factory/.python-libnacl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-libnacl" Changes: -------- --- /work/SRC/openSUSE:Factory/python-libnacl/python-libnacl.changes 2014-09-03 08:30:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-libnacl.new/python-libnacl.changes 2014-09-10 17:02:51.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 9 21:14:30 UTC 2014 - aboe76(a)gmail.com + +- Updated to 1.3.5 + + only updates for py3 + +------------------------------------------------------------------- Old: ---- libnacl-1.3.4.tar.gz New: ---- libnacl-1.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-libnacl.spec ++++++ --- /var/tmp/diff_new_pack.eZTsrB/_old 2014-09-10 17:02:53.000000000 +0200 +++ /var/tmp/diff_new_pack.eZTsrB/_new 2014-09-10 17:02:53.000000000 +0200 @@ -16,7 +16,7 @@ # Name: python-libnacl -Version: 1.3.4 +Version: 1.3.5 Release: 0 License: Apache-2.0 Summary: Python bindings for libsodium/tweetnacl based on ctypes ++++++ libnacl-1.3.4.tar.gz -> libnacl-1.3.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnacl-1.3.4/PKG-INFO new/libnacl-1.3.5/PKG-INFO --- old/libnacl-1.3.4/PKG-INFO 2014-09-01 01:46:16.000000000 +0200 +++ new/libnacl-1.3.5/PKG-INFO 2014-09-03 20:27:24.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: libnacl -Version: 1.3.4 +Version: 1.3.5 Summary: Python bindings for libsodium/tweetnacl based on ctypes Home-page: https://libnacl.readthedocs.org/ Author: Thomas S Hatch diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnacl-1.3.4/doc/conf.py new/libnacl-1.3.5/doc/conf.py --- old/libnacl-1.3.4/doc/conf.py 2014-09-01 01:37:44.000000000 +0200 +++ new/libnacl-1.3.5/doc/conf.py 2014-09-03 20:26:34.000000000 +0200 @@ -53,7 +53,7 @@ # built documents. # # The short X.Y version. -version = '1.3.4' +version = '1.3.5' # The full version, including alpha/beta/rc tags. release = version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnacl-1.3.4/libnacl/__init__.py new/libnacl-1.3.5/libnacl/__init__.py --- old/libnacl-1.3.4/libnacl/__init__.py 2014-09-01 01:34:16.000000000 +0200 +++ new/libnacl-1.3.5/libnacl/__init__.py 2014-09-03 20:25:13.000000000 +0200 @@ -46,7 +46,7 @@ return ctypes.cdll.LoadLibrary('libsodium.so') except OSError: pass - for soname_ver in xrange(4, __MAX_SONAME_VER + 1): + for soname_ver in range(4, __MAX_SONAME_VER + 1): try: return ctypes.cdll.LoadLibrary( 'libsodium.so.{0}'.format(soname_ver) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libnacl-1.3.4/libnacl/version.py new/libnacl-1.3.5/libnacl/version.py --- old/libnacl-1.3.4/libnacl/version.py 2014-09-01 01:37:23.000000000 +0200 +++ new/libnacl-1.3.5/libnacl/version.py 2014-09-03 20:26:18.000000000 +0200 @@ -1 +1 @@ -__version__ = '1.3.4' +__version__ = '1.3.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 geary for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package geary for openSUSE:Factory checked in at 2014-09-10 17:02:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/geary (Old) and /work/SRC/openSUSE:Factory/.geary.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "geary" Changes: -------- --- /work/SRC/openSUSE:Factory/geary/geary.changes 2014-08-25 11:05:31.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.geary.new/geary.changes 2014-09-10 17:02:49.000000000 +0200 @@ -1,0 +2,11 @@ +Sun Sep 7 09:52:13 UTC 2014 - zaitor(a)opensuse.org + +- Update to version 0.6.3: + + Warn user of TLS certificate issues when connecting + (bgo#713247). + + Fix wrong timestamp in composed email Date: header + (bgo#714376). + + Compile with Vala 0.25 and better. +- Add pkgconfig(gcr-3) BuildRequires: New dependency. + +------------------------------------------------------------------- Old: ---- geary-0.6.2.tar.xz New: ---- geary-0.6.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ geary.spec ++++++ --- /var/tmp/diff_new_pack.6nPdFJ/_old 2014-09-10 17:02:50.000000000 +0200 +++ /var/tmp/diff_new_pack.6nPdFJ/_new 2014-09-10 17:02:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: geary -Version: 0.6.2 +Version: 0.6.3 Release: 0 Summary: A lightweight email reader for the GNOME desktop License: LGPL-2.0+ @@ -29,6 +29,7 @@ BuildRequires: intltool BuildRequires: update-desktop-files BuildRequires: xml2po +BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gee-0.8) >= 0.8.5 BuildRequires: pkgconfig(gio-2.0) >= 2.28.0 BuildRequires: pkgconfig(glib-2.0) >= 2.32.0 ++++++ geary-0.6.2.tar.xz -> geary-0.6.3.tar.xz ++++++ ++++ 3377 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit ppc64-diag for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package ppc64-diag for openSUSE:Factory checked in at 2014-09-10 17:02:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ppc64-diag (Old) and /work/SRC/openSUSE:Factory/.ppc64-diag.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ppc64-diag" Changes: -------- --- /work/SRC/openSUSE:Factory/ppc64-diag/ppc64-diag.changes 2014-07-25 09:09:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ppc64-diag.new/ppc64-diag.changes 2014-09-10 17:02:48.000000000 +0200 @@ -1,0 +2,17 @@ +Tue Sep 9 11:44:11 UTC 2014 - dvlaeev(a)suse.com + +- Fix download service + +------------------------------------------------------------------- +Mon Sep 8 11:11:06 UTC 2014 - jloeser(a)suse.com + +- version update to 2.6.7 (BNC#894846) + no upstream changelog provided + +- modified patches: + * ppc64-diag-tmpraces.patch + * ppc64-diag.add_ncurses_include_path.patch + * ppc64-diag.opal_errd.patch + * ppc64-diag.rtas_errd.patch + * ppc64-diag.varunused.patch +------------------------------------------------------------------- Old: ---- opal_errd.service ppc64-diag-2.6.6.tar.gz rtas_errd.service New: ---- ppc64-diag-2.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ppc64-diag.spec ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -18,7 +18,7 @@ Url: http://sourceforge.net/projects/linux-diag/files/ppc64-diag Name: ppc64-diag -Version: 2.6.6 +Version: 2.6.7 Release: 0 Summary: Linux for Power Platform Diagnostics License: EPL-1.0 @@ -34,6 +34,7 @@ BuildRequires: gcc-c++ BuildRequires: librtas-devel BuildRequires: libservicelog-devel +BuildRequires: libudev-devel BuildRequires: libvpd2-devel BuildRequires: ncurses-devel BuildRequires: sqlite3-devel @@ -46,9 +47,7 @@ PreReq: %insserv_prereq PreReq: aaa_base BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v%{version}/… -Source1: rtas_errd.service -Source2: opal_errd.service +Source0: http://downloads.sourceforge.net/project/linux-diag/ppc64-diag/v.%{version}… #PATCH-FIX-OPENSUSE - ppc64-diag.rtas_errd.patch - fix rtas_errd initscript to comply with openSUSE standards Patch1: %{name}.rtas_errd.patch #PATCH-FIX-OPENSUSE - ppc64-diag.varunused.patch - fix unused variables @@ -81,6 +80,13 @@ %patch5 -p1 %build +%if 0%{?has_systemd} + sed -i '/LIBEXEC_DIR/c\LIBEXEC_DIR = \%{_libexecdir}' rules.mk + sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/opal_errd.service + sed -i 's@/usr/libexec/ppc64-diag@%{_libexecdir}@g' scripts/rtas_errd.service +%else + sed -i '/LIBEXEC_DIR/c\LIBEXEC_DIR = \%{_initddir}' rules.mk +%endif make %install @@ -89,11 +95,9 @@ mkdir $RPM_BUILD_ROOT/etc/ppc64-diag/ses_pages ln -sf /usr/sbin/usysattn $RPM_BUILD_ROOT/usr/sbin/usysfault %if 0%{?has_systemd} - rm $RPM_BUILD_ROOT/etc/init.d/rtas_errd - rm $RPM_BUILD_ROOT/etc/init.d/opal_errd mkdir -p $RPM_BUILD_ROOT/%{_unitdir} - install -D -m0644 %{S:1} %{buildroot}%{_unitdir}/ - install -D -m0644 %{S:2} %{buildroot}%{_unitdir}/ + install -D -m0644 scripts/rtas_errd.service %{buildroot}%{_unitdir}/ + install -D -m0644 scripts/opal_errd.service %{buildroot}%{_unitdir}/ ln -s /sbin/service %{buildroot}/usr/sbin/rcrtas_errd ln -s /sbin/service %{buildroot}/usr/sbin/rcopal_errd %else @@ -118,13 +122,18 @@ %{_mandir}/man8/usysattn.8.gz %{_mandir}/man8/usysfault.8.gz %{_mandir}/man8/usysident.8.gz +%{_mandir}/man8/opal-dump-parse.8.gz +%{_mandir}/man8/opal-elog-parse.8.gz +%{_mandir}/man8/opal_errd.8.gz %if 0%{?has_systemd} %{_unitdir}/rtas_errd.service %{_unitdir}/opal_errd.service + %{_libexecdir}/rtas_errd + %{_libexecdir}/opal_errd %else - %config %attr(755,root,root) /etc/init.d/rtas_errd - %config %attr(755,root,root) /etc/init.d/opal_errd + %config %attr(755,root,root) %{_initddir}/rtas_errd + %config %attr(755,root,root) %{_initddir}/opal_errd %endif %if 1 @@ -235,7 +244,6 @@ %service_add_pre rtas_errd.service %service_add_pre opal_errd.service %endif - %endif %changelog ++++++ ppc64-diag-2.6.6.tar.gz -> ppc64-diag-2.6.7.tar.gz ++++++ ++++ 143403 lines of diff (skipped) ++++++ ppc64-diag-tmpraces.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,7 +1,8 @@ -diff -ur ppc64-diag-2.6.1_orig/lpd/test/lpd_ela_test.sh ppc64-diag-2.6.1/lpd/test/lpd_ela_test.sh ---- ppc64-diag-2.6.1_orig/lpd/test/lpd_ela_test.sh 2014-07-18 13:33:08.351629000 +0200 -+++ ppc64-diag-2.6.1/lpd/test/lpd_ela_test.sh 2014-07-18 13:33:15.323767000 +0200 -@@ -22,7 +22,7 @@ +Index: ppc64-diag-2.6.7/lpd/test/lpd_ela_test.sh +=================================================================== +--- ppc64-diag-2.6.7.orig/lpd/test/lpd_ela_test.sh ++++ ppc64-diag-2.6.7/lpd/test/lpd_ela_test.sh +@@ -22,7 +22,7 @@ EXECUTION_LOG="$LOG_DIR/$SCRIPT_NAME.log ERROR_LOG="$LOG_DIR/$SCRIPT_NAME.err" TMP_DIR="/var/tmp/ras" @@ -10,10 +11,11 @@ MESSAGE_FILE="$TMP_DIR/messages" TMP_FILE="$TMP_DIR/$SCRIPT_NAME.tmp" -diff -ur ppc64-diag-2.6.1_orig/rtas_errd/diag_support.c ppc64-diag-2.6.1/rtas_errd/diag_support.c ---- ppc64-diag-2.6.1_orig/rtas_errd/diag_support.c 2014-07-18 13:33:08.473633000 +0200 -+++ ppc64-diag-2.6.1/rtas_errd/diag_support.c 2014-07-18 13:36:43.569643000 +0200 -@@ -230,27 +230,23 @@ +Index: ppc64-diag-2.6.7/rtas_errd/diag_support.c +=================================================================== +--- ppc64-diag-2.6.7.orig/rtas_errd/diag_support.c ++++ ppc64-diag-2.6.7/rtas_errd/diag_support.c +@@ -230,27 +230,23 @@ get_dt_status(char *dev) char loc_file[80]; char target[80]; char *ptr; @@ -47,7 +49,7 @@ return NULL; } if (fscanf(fp2, "%s", target_status)) { -@@ -259,6 +255,7 @@ +@@ -259,6 +255,7 @@ get_dt_status(char *dev) } else { fprintf(stderr, "read failed on %s\n", loc_file); @@ -55,7 +57,7 @@ return NULL; } -@@ -270,6 +267,7 @@ +@@ -270,6 +267,7 @@ get_dt_status(char *dev) fp2 = fopen(loc_file, "r"); if (fp2 == 0) { fprintf(stderr, "open failed on %s\n", loc_file); @@ -63,7 +65,7 @@ return NULL; } -@@ -278,6 +276,8 @@ +@@ -278,6 +276,8 @@ get_dt_status(char *dev) target, loc_file); if (strcmp(dev, target) == 0) { dbg("status = \"%s\"", target_status); @@ -72,7 +74,7 @@ return target_status; } -@@ -285,11 +285,12 @@ +@@ -285,11 +285,12 @@ get_dt_status(char *dev) } else { fprintf(stderr, "read failed on %s\n", loc_file); @@ -86,10 +88,11 @@ fprintf(stderr, "error: status NOT FOUND\n"); return NULL; } -diff -ur ppc64-diag-2.6.1_orig/scripts/ppc64_diag_mkrsrc ppc64-diag-2.6.1/scripts/ppc64_diag_mkrsrc ---- ppc64-diag-2.6.1_orig/scripts/ppc64_diag_mkrsrc 2014-07-18 13:33:08.189631000 +0200 -+++ ppc64-diag-2.6.1/scripts/ppc64_diag_mkrsrc 2014-07-18 13:33:15.384788000 +0200 -@@ -123,7 +123,7 @@ +Index: ppc64-diag-2.6.7/scripts/ppc64_diag_mkrsrc +=================================================================== +--- ppc64-diag-2.6.7.orig/scripts/ppc64_diag_mkrsrc ++++ ppc64-diag-2.6.7/scripts/ppc64_diag_mkrsrc +@@ -136,7 +136,7 @@ if (-e "/proc/device-tree/ibm,converged- } # Retrieve Extended Error Data (EED) ++++++ ppc64-diag.add_ncurses_include_path.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,8 +1,8 @@ -Index: ppc64-diag-2.6.6/rules.mk +Index: ppc64-diag-2.6.7/rules.mk =================================================================== ---- ppc64-diag-2.6.6.orig/rules.mk -+++ ppc64-diag-2.6.6/rules.mk -@@ -93,6 +93,9 @@ CFLAGS += -g -DDEBUG +--- ppc64-diag-2.6.7.orig/rules.mk ++++ ppc64-diag-2.6.7/rules.mk +@@ -94,6 +94,9 @@ CFLAGS += -g -DDEBUG # Build with common directory included CFLAGS += -I $(ROOT_DIR)/$(COM_DIR) ++++++ ppc64-diag.opal_errd.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,13 +1,11 @@ -Index: ppc64-diag-2.6.4/scripts/opal_errd +Index: ppc64-diag-2.6.7/scripts/opal_errd =================================================================== ---- ppc64-diag-2.6.4.orig/scripts/opal_errd -+++ ppc64-diag-2.6.4/scripts/opal_errd -@@ -20,8 +20,10 @@ - - ### BEGIN INIT INFO +--- ppc64-diag-2.6.7.orig/scripts/opal_errd ++++ ppc64-diag-2.6.7/scripts/opal_errd +@@ -22,6 +22,10 @@ # Provides: opal_errd --# Required-Start: $local_fs $syslog $time --# Required-Stop: + # Required-Start: $local_fs $syslog $time + # Required-Stop: +# Should-Start: $remote_fs $syslog $time +# Should-Stop: $null +# Required-Start: $null @@ -15,18 +13,18 @@ # Default-Start: 2 3 5 # Default-Stop: 0 1 4 6 # Short-Description: Daemon to retrieve platform errors/events -@@ -58,8 +60,8 @@ opal_errd_start() +@@ -58,8 +62,8 @@ opal_errd_start() daemon $OE_BIN pid=`pidof opal_errd` - if [[ -n "$pid" ]]; then + if [ -n "$pid" ]; then - echo $pid > /var/run/opal_errd.pid - touch /var/lock/subsys/opal_errd + echo $pid > /var/run/rcopal_errd.pid -+ touch /var/run/rcopal_errd ++ touch /var/run/rcopal_errd fi fi } -@@ -71,8 +73,8 @@ opal_errd_stop() +@@ -71,8 +75,8 @@ opal_errd_stop() rc_status -v else killproc opal_errd -TERM ++++++ ppc64-diag.rtas_errd.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -2,27 +2,25 @@ scripts/rtas_errd | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -Index: ppc64-diag-2.6.4/scripts/rtas_errd +Index: ppc64-diag-2.6.7/scripts/rtas_errd =================================================================== ---- ppc64-diag-2.6.4.orig/scripts/rtas_errd -+++ ppc64-diag-2.6.4/scripts/rtas_errd -@@ -19,8 +19,10 @@ - - ### BEGIN INIT INFO +--- ppc64-diag-2.6.7.orig/scripts/rtas_errd ++++ ppc64-diag-2.6.7/scripts/rtas_errd +@@ -21,6 +21,10 @@ # Provides: rtas_errd --# Required-Start: $local_fs $syslog $time --# Required-Stop: -+# Should-Start: $remote_fs $syslog $time -+# Should-Stop: $null -+# Required-Start: $null -+# Required-Stop: $null + # Required-Start: $local_fs $syslog $time + # Required-Stop: ++# Should-Start: $remote_fs $syslog $time ++# Should-Stop: $null ++# Required-Start: $null ++# Required-Stop: $null # Default-Start: 2 3 5 # Default-Stop: 0 1 4 6 # Short-Description: Daemon to retrieve platform errors -@@ -63,8 +65,8 @@ case "$1" in +@@ -63,8 +67,8 @@ case "$1" in daemon $RE_BIN pid=`pidof rtas_errd` - if [[ -n "$pid" ]]; then + if [ -n "$pid" ]; then - echo $pid > /var/run/rtas_errd.pid - touch /var/lock/subsys/rtas_errd + echo $pid > /var/run/rcrtas_errd.pid @@ -30,7 +28,7 @@ fi echo fi -@@ -77,8 +79,8 @@ case "$1" in +@@ -77,8 +81,8 @@ case "$1" in rc_status -v else killproc rtas_errd -TERM ++++++ ppc64-diag.varunused.patch ++++++ --- /var/tmp/diff_new_pack.TXQBNq/_old 2014-09-10 17:02:49.000000000 +0200 +++ /var/tmp/diff_new_pack.TXQBNq/_new 2014-09-10 17:02:49.000000000 +0200 @@ -1,7 +1,7 @@ -Index: ppc64-diag-2.6.4/diags/7031_D24_T24.c +Index: ppc64-diag-2.6.7/diags/7031_D24_T24.c =================================================================== ---- ppc64-diag-2.6.4.orig/diags/7031_D24_T24.c -+++ ppc64-diag-2.6.4/diags/7031_D24_T24.c +--- ppc64-diag-2.6.7.orig/diags/7031_D24_T24.c ++++ ppc64-diag-2.6.7/diags/7031_D24_T24.c @@ -69,7 +69,8 @@ get_enclosure_scsi_id(struct pearl_diag_ static int print_drive_status(uint32_t status) @@ -32,10 +32,10 @@ int buf_len = sizeof(dp); int ps1, ps2, fan1, fan2, fan3, rpt, vpd_card; -Index: ppc64-diag-2.6.4/rtas_errd/ela.c +Index: ppc64-diag-2.6.7/rtas_errd/ela.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/ela.c -+++ ppc64-diag-2.6.4/rtas_errd/ela.c +--- ppc64-diag-2.6.7.orig/rtas_errd/ela.c ++++ ppc64-diag-2.6.7/rtas_errd/ela.c @@ -1787,7 +1787,7 @@ process_v1_epow(struct event *event, int int class; int ext_epow; @@ -45,10 +45,10 @@ /* * The following EPOW error logs found in CHRP, Ver. 1 -Index: ppc64-diag-2.6.4/rtas_errd/epow.c +Index: ppc64-diag-2.6.7/rtas_errd/epow.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/epow.c -+++ ppc64-diag-2.6.4/rtas_errd/epow.c +--- ppc64-diag-2.6.7.orig/rtas_errd/epow.c ++++ ppc64-diag-2.6.7/rtas_errd/epow.c @@ -48,7 +48,7 @@ static int time_remaining = 0; void epow_timer_handler(int sig, siginfo_t siginfo, void *context) @@ -76,10 +76,10 @@ /* * Dissect the EPOW extended error information; -Index: ppc64-diag-2.6.4/rtas_errd/files.c +Index: ppc64-diag-2.6.7/rtas_errd/files.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/files.c -+++ ppc64-diag-2.6.4/rtas_errd/files.c +--- ppc64-diag-2.6.7.orig/rtas_errd/files.c ++++ ppc64-diag-2.6.7/rtas_errd/files.c @@ -161,7 +161,7 @@ setup_rtas_event_scenario(void) { struct stat sbuf; @@ -89,10 +89,10 @@ int i; if (scenario_file == NULL) -Index: ppc64-diag-2.6.4/rtas_errd/guard.c +Index: ppc64-diag-2.6.7/rtas_errd/guard.c =================================================================== ---- ppc64-diag-2.6.4.orig/rtas_errd/guard.c -+++ ppc64-diag-2.6.4/rtas_errd/guard.c +--- ppc64-diag-2.6.7.orig/rtas_errd/guard.c ++++ ppc64-diag-2.6.7/rtas_errd/guard.c @@ -40,7 +40,7 @@ run_drmgr(enum resource_dealloc_type res unsigned int value, int wait) { -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit subversion for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package subversion for openSUSE:Factory checked in at 2014-09-10 17:02:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/subversion (Old) and /work/SRC/openSUSE:Factory/.subversion.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "subversion" Changes: -------- --- /work/SRC/openSUSE:Factory/subversion/subversion.changes 2014-08-13 08:49:19.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.subversion.new/subversion.changes 2014-09-10 17:02:45.000000000 +0200 @@ -1,0 +2,36 @@ +Tue Sep 9 06:57:54 UTC 2014 - andreas.stieger(a)gmx.de + +- Re-enable optional running full regression test suite, + cleanup of dependencies only for network based tests. +- make build with ctypesgen optional, off as it is not in Factory + +------------------------------------------------------------------- +Mon Sep 8 22:41:18 UTC 2014 - andreas.stieger(a)gmx.de + +- move autogen to %build to not break quilt setup + +------------------------------------------------------------------- +Thu Sep 4 13:38:53 UTC 2014 - tchvatal(a)suse.com + +- Use python_sitearch properly + +------------------------------------------------------------------- +Thu Sep 4 11:50:04 UTC 2014 - tchvatal(a)suse.com + +- Cleanup with spec-cleaner, remove crufty conditionals to reduce + the in-build conditions +- Install only systemd packages where needed +- Drop support of really old stuff (sle10) +- Run only basic tests and run them always +- Unbundle everything. For older distros rather use linkpac +- Removed patches: + * subversion.libtool-pie-flags.patch + * subversion.perl.LD_RUN_PATH.patch + * swig.noembed.patch +- Added patches: + * subversion-1.8.0-rpath.patch + * subversion-fix-parallel-build-support-for-perl-bindings.patch + * subversion-perl-underlinking.patch + * subversion-swig-perl-Wall.patch + +------------------------------------------------------------------- Old: ---- sqlite-amalgamation-3071501.zip subversion.libtool-pie-flags.patch subversion.perl.LD_RUN_PATH.patch swig-1.3.36.tar.gz swig.noembed.patch New: ---- subversion-1.8.0-rpath.patch subversion-fix-parallel-build-support-for-perl-bindings.patch subversion-perl-underlinking.patch subversion-swig-perl-Wall.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ ++++ 1001 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/subversion/subversion.spec ++++ and /work/SRC/openSUSE:Factory/.subversion.new/subversion.spec ++++++ _constraints ++++++ --- /var/tmp/diff_new_pack.Jn23zs/_old 2014-09-10 17:02:47.000000000 +0200 +++ /var/tmp/diff_new_pack.Jn23zs/_new 2014-09-10 17:02:47.000000000 +0200 @@ -2,7 +2,7 @@ <constraints> <hardware> <memory> - <size unit="M">768</size> + <size unit="M">1024</size> </memory> </hardware> </constraints> ++++++ subversion-1.8.0-rpath.patch ++++++ Prevent the linker from adding an rpath to shared libraries. Original patch by David Kimdon <dwhedon(a)debian.org>. The basic theory is: - Split the $(LINK) makefile macro into $(LINK) and $(LINK_LIB). - Comment out LD_RUN_PATH in the Perl makefiles. - Use libtool instead of apxs to install the apache modules. libtool relinks without rpath in this case, apxs obviously doesn't. --- a/Makefile.in +++ b/Makefile.in @@ -216,10 +216,10 @@ # special compilation for files destined for cxxhl COMPILE_CXXHL_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=compile $(COMPILE_CXX) $(LT_CFLAGS) $(CXXHL_INCLUDES) -o $@ -c -LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir) -LINK_LIB = $(LINK) $(LT_SO_VERSION) -LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir) -LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) +LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir) +LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir) # special link rule for mod_dav_svn LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS) @@ -777,7 +777,9 @@ ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL - cd $(SWIG_PL_DIR)/native; $(PERL) Makefile.PL + cd $(SWIG_PL_DIR)/native; \ + $(PERL) Makefile.PL INSTALLDIRS=vendor; \ + sed -i -e '/^LD_RUN_PATH/s/^/#/' Makefile Makefile.[a-z]* # There is a "readlink -f" command on some systems for the same purpose, # but it's not as portable (e.g. Mac OS X doesn't have it). These should --- a/build.conf +++ b/build.conf @@ -502,7 +502,7 @@ lang = python path = subversion/bindings/swig/python/libsvn_swig_py libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) +link-cmd = $(LINK_LIB) $(SWIG_PY_LIBS) install = swig-py-lib # need special build rule to include -DSWIGPYTHON compile-cmd = $(COMPILE_SWIG_PY) @@ -525,7 +525,7 @@ lang = ruby path = subversion/bindings/swig/ruby/libsvn_swig_ruby libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr -link-cmd = $(LINK) $(SWIG_RB_LIBS) +link-cmd = $(LINK_LIB) $(SWIG_RB_LIBS) install = swig-rb-lib # need special build rule to include compile-cmd = $(COMPILE_SWIG_RB) --- a/build/generator/gen_base.py +++ b/build/generator/gen_base.py @@ -415,7 +415,7 @@ self.install = options.get('install') self.compile_cmd = options.get('compile-cmd') self.sources = options.get('sources', '*.c *.cpp') - self.link_cmd = options.get('link-cmd', '$(LINK)') + self.link_cmd = options.get('link-cmd', '$(LINK_LIB)') self.external_lib = options.get('external-lib') self.external_project = options.get('external-project') @@ -467,6 +467,7 @@ extmap = self.gen_obj._extension_map self.objext = extmap['exe', 'object'] self.filename = build_path_join(self.path, name + extmap['exe', 'target']) + self.link_cmd = '$(LINK)' self.manpages = options.get('manpages', '') self.testing = options.get('testing') ++++++ subversion-fix-parallel-build-support-for-perl-bindings.patch ++++++ --- Makefile.in 2011-07-16 13:50:53.000000000 +0200 +++ Makefile.in.new 2012-03-11 12:13:57.000000000 +0100 @@ -732,7 +732,7 @@ extraclean-swig-headers: clean-swig-headers $(EXTRACLEAN_SWIG_HEADERS) -$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in +$(SWIG_PL_DIR)/native/Makefile.PL: $(SWIG_SRC_DIR)/perl/native/Makefile.PL.in libsvn_swig_perl ./config.status subversion/bindings/swig/perl/native/Makefile.PL $(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL ++++++ subversion-perl-underlinking.patch ++++++ diff -urN subversion-1.8.10.old/Makefile.in subversion-1.8.10/Makefile.in --- subversion-1.8.10.old/Makefile.in 2014-08-19 14:05:55.226069730 +0200 +++ subversion-1.8.10/Makefile.in 2014-08-19 14:55:21.696069376 +0200 @@ -791,7 +791,7 @@ if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \ ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \ fi - cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)" + cd $(SWIG_PL_DIR)/native; $(MAKE) check-swig-pl: swig-pl swig-pl-lib cd $(SWIG_PL_DIR)/native; $(MAKE) test diff -urN subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in --- subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:05:55.198069730 +0200 +++ subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:41:23.190069476 +0200 @@ -86,7 +86,7 @@ " -I$svnlib_builddir", " -I$swig_srcdir -g"), OBJECT => q/$(O_FILES)/, - LIBS => [join(' ', $apr_ldflags, + LIBS => [join(' ', $apr_ldflags, '-lpthread -lapr-1 -lperl', (map {"-L$_"} @ldpaths), @ldmodules, '-lsvn_swig_perl-1', `$swig -perl -ldflags`)], ++++++ subversion-swig-perl-Wall.patch ++++++ Don't drop -Wall in the swig Perl bindings, otherwise building with e.g. -Wformat-security might break. https://bugzilla.redhat.com/show_bug.cgi?id=1037341 --- subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in.swigplWall +++ subversion-1.8.5/subversion/bindings/swig/perl/native/Makefile.PL.in @@ -54,7 +54,6 @@ my $includes = ' -I/usr/include/apr-1 # SWIG is using C++ style comments in an extern "C" code. $cflags =~ s/-ansi\s+//g; $cflags =~ s/-std=c89\s+//g; -$cflags =~ s/-Wall//g; $cflags =~ s/-Wunused//g; $cflags =~ s/-Wshadow//g; $cflags =~ s/-Wstrict-prototypes//g; -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit librtas for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package librtas for openSUSE:Factory checked in at 2014-09-10 17:02:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/librtas (Old) and /work/SRC/openSUSE:Factory/.librtas.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "librtas" Changes: -------- --- /work/SRC/openSUSE:Factory/librtas/librtas.changes 2014-07-11 06:45:46.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.librtas.new/librtas.changes 2014-09-10 17:02:43.000000000 +0200 @@ -1,0 +2,12 @@ +Fri Sep 5 09:50:17 UTC 2014 - jengelh(a)inai.de + +- RPM group classification; add project web locations + +------------------------------------------------------------------- +Fri Sep 5 09:08:06 UTC 2014 - jloeser(a)suse.com + +- version update to 1.3.12 (BNC#894854) + - get_sensor, set_sensor: Handle big endian data in little endian + - fix for sc_platform_dump endian handling + +------------------------------------------------------------------- Old: ---- librtas-1.3.11.tar.gz New: ---- librtas-1.3.12.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ librtas.spec ++++++ --- /var/tmp/diff_new_pack.WTo7RG/_old 2014-09-10 17:02:45.000000000 +0200 +++ /var/tmp/diff_new_pack.WTo7RG/_new 2014-09-10 17:02:45.000000000 +0200 @@ -17,19 +17,21 @@ Name: librtas -BuildRequires: doxygen -Version: 1.3.11 +Version: 1.3.12 Release: 0 -BuildRequires: fdupes Summary: Libraries to provide access to RTAS calls and RTAS events License: CPL-1.0 -Group: System/Libraries -BuildRoot: %{_tmppath}/%{name}-%{version}-build -ExclusiveArch: ppc ppc64 ppc64le +Group: Development/Libraries/C and C++ Url: http://librtas.ozlabs.org/ + +#Git-Clone: git://git.code.sf.net/p/librtas/code Source0: http://sourceforge.net/projects/librtas/files/librtas-%{version}.tar.gz Source1: baselibs.conf Patch: librtas-failedmagic.patch +BuildRequires: doxygen +BuildRequires: fdupes +BuildRoot: %{_tmppath}/%{name}-%{version}-build +ExclusiveArch: ppc ppc64 ppc64le %description The librtas shared library provides userspace with an interface through ++++++ librtas-1.3.11.tar.gz -> librtas-1.3.12.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.11/Changelog new/librtas-1.3.12/Changelog --- old/librtas-1.3.11/Changelog 2014-06-25 21:37:10.000000000 +0200 +++ new/librtas-1.3.12/Changelog 2014-08-13 20:22:51.000000000 +0200 @@ -1,3 +1,31 @@ +Changelog for librtas-1.3.12 +======================================= +commit 1f045d8df135cfdc232a49f0992ab60913c0b043 +Author: Anshuman Khandual <khandual(a)linux.vnet.ibm.com> +Date: Wed Aug 13 13:04:29 2014 -0500 + + get_sensor, set_sensor: Handle big endian data in little endian + + This patch handles big endian location code length data in little endian + platform. This enables the tools to work on little endian platform after + having passed big endian buffer data. + + Signed-off-by: Anshuman Khandual <khandual(a)linux.vnet.ibm.com> + Reviewed-by: Vasant Hegde <hegdevasant(a)linux.vnet.ibm.com> + +commit 18f353d3477fb137e9773bcda0c1f60fb071d5b7 +Author: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> +Date: Wed Aug 13 13:02:17 2014 -0500 + + librtas: fix for sc_platform_dump endian handling + + Some mistakes were made in adding little endian support for the + sc_platform_dump function. As the values being handled are 64-bit integers, + it makes much more sense to use the 64-bit byteswap function. The + endianness of seq_next also needs to be handled. + + Signed-off-by: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> + Changelog for librtas-1.3.11 ======================================= commit 129fdb4875c8c679418b70c55df9b8b7fe8d6180 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.11/librtas.spec.in new/librtas-1.3.12/librtas.spec.in --- old/librtas-1.3.11/librtas.spec.in 2014-06-25 21:37:10.000000000 +0200 +++ new/librtas-1.3.12/librtas.spec.in 2014-08-13 20:22:51.000000000 +0200 @@ -1,5 +1,5 @@ %define name librtas -%define version 1.3.11 +%define version 1.3.12 %define release 1 Summary: Libraries to provide access to RTAS calls and RTAS events. Name: %{name} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/librtas-1.3.11/librtas_src/syscall_calls.c new/librtas-1.3.12/librtas_src/syscall_calls.c --- old/librtas-1.3.11/librtas_src/syscall_calls.c 2014-06-25 21:37:10.000000000 +0200 +++ new/librtas-1.3.12/librtas_src/syscall_calls.c 2014-08-13 20:22:51.000000000 +0200 @@ -568,7 +568,7 @@ int status; int rc; - size = *(uint32_t *)loc_code + sizeof(uint32_t); + size = be32toh(*(uint32_t *)loc_code) + sizeof(uint32_t); rc = sc_get_rmo_buffer(size, &locbuf, &loc_pa); if (rc) @@ -965,12 +965,9 @@ if (kernbuf) (void)sc_free_rmo_buffer(kernbuf, kernbuf_pa, length); - next_hi = be32toh(next_hi); - next_lo = be32toh(next_lo); - bytes_hi = be32toh(bytes_hi); - bytes_lo = be32toh(bytes_lo); - - *bytes_ret = BITS64(be32toh(bytes_hi), be32toh(bytes_lo)); + *bytes_ret = BITS64(bytes_hi, bytes_lo); + *seq_next = be64toh(*seq_next); + *bytes_ret = be64toh(*bytes_ret); dbg1("(0x%llx, 0x%llx, %p, %d, %p, %p) = %d, 0x%llx, 0x%llx\n", dump_tag, sequence, buffer, length, seq_next, bytes_ret, @@ -1074,7 +1071,7 @@ int status; int rc; - size = *(uint32_t *)loc_code + sizeof(uint32_t); + size = be32toh(*(uint32_t *)loc_code) + sizeof(uint32_t); rc = sc_get_rmo_buffer(size, &locbuf, &loc_pa); if (rc) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libservicelog for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libservicelog for openSUSE:Factory checked in at 2014-09-10 17:02:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libservicelog (Old) and /work/SRC/openSUSE:Factory/.libservicelog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libservicelog" Changes: -------- --- /work/SRC/openSUSE:Factory/libservicelog/libservicelog.changes 2014-01-23 15:48:30.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libservicelog.new/libservicelog.changes 2014-09-10 17:02:42.000000000 +0200 @@ -1,0 +2,23 @@ +Thu Sep 4 13:26:49 UTC 2014 - jengelh(a)inai.de + +- baselibs.conf did not match with the shared library package +- Remove libservicelog-lib_version.patch, there is no reason + provided to have it in the first place. +- Remove libservicelog-pkgconfig.patch; there is nothing wrong + with -L${libdir} in .pc files. +- Remove dlopen hacks; the packages ppc64-diag and servicelog which + OBS lists as dependants use no visible call to dlopen but do + a compile-time link. +- As the public header servicelog.h #includes <sqlite3.h>, + Reqiures: sqlite3-devel is needed for libservicelog-devel. + +------------------------------------------------------------------- +Thu Sep 4 12:56:42 UTC 2014 - jloeser(a)suse.com + +- version update to 1.1.15 (BNC#894856) + - Cleanup build tools (configure.ac and Makefile.am) + +- modified patches: + * libservicelog-lib_version.patch + * libservicelog-pkgconfig.patch +------------------------------------------------------------------- Old: ---- libservicelog-1.1.14.tar.gz libservicelog-lib_version.patch libservicelog-pkgconfig.patch New: ---- libservicelog-1.1.15.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libservicelog.spec ++++++ --- /var/tmp/diff_new_pack.JsjrRL/_old 2014-09-10 17:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.JsjrRL/_new 2014-09-10 17:02:43.000000000 +0200 @@ -16,15 +16,22 @@ # -%define so_version 1 - Name: libservicelog -Version: 1.1.14 +%define lname libservicelog-1_1-1 +Version: 1.1.15 Release: 0 Summary: Servicelog Database and Library License: LGPL-2.0+ Group: System/Libraries -Requires: libservicelog-library +Url: http://linux-diag.sourceforge.net/servicelog/ + +#Git-Clone: git://git.code.sf.net/p/linux-diag/libservicelog +#Git-Web: http://sourceforge.net/p/linux-diag/libservicelog/ +Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz +Source1: baselibs.conf +Source2: libservicelog-rpmlintrc +PreReq: %{_sbindir}/groupadd +Patch2: libservicelog-printf_types.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: librtas-devel @@ -32,15 +39,7 @@ BuildRequires: pkg-config BuildRequires: sqlite3-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -Url: http://linux-diag.sourceforge.net/servicelog/ ExclusiveArch: ppc ppc64 ppc64le -Source0: http://downloads.sourceforge.net/linux-diag/%{name}-%{version}.tar.gz -Source1: baselibs.conf -Source2: libservicelog-rpmlintrc -PreReq: %{_sbindir}/groupadd -Patch0: libservicelog-pkgconfig.patch -Patch1: libservicelog-lib_version.patch -Patch2: libservicelog-printf_types.patch %description The libservicelog package contains a library to create and maintain a @@ -49,13 +48,12 @@ the logging of service procedures that have been performed upon the system. - -%package -n %{name}%{so_version} +%package -n %lname Summary: Servicelog Database and Library Group: System/Libraries -Provides: libservicelog-library +Requires: %name -%description -n %{name}%{so_version} +%description -n %lname The libservicelog package contains a library to create and maintain a database for storing events related to system service. This database allows for the logging of serviceable and informational events, and for @@ -65,17 +63,15 @@ %package devel Summary: Development files for libservicelog Group: Development/Libraries/Other -Requires: %{name} = %{version} -Requires: %{name}%{so_version} = %{version} +Requires: %lname = %version Requires: glibc-devel +Requires: sqlite3-devel %description devel Contains header files for building with libservicelog. %prep %setup -q -%patch0 -%patch1 %patch2 -p1 %build @@ -84,31 +80,29 @@ make %{?_smp_mflags} %install -%{makeinstall} +%make_install %__rm -f %{buildroot}%{_libdir}/*.la %pre /usr/sbin/groupadd -r service || echo groupadd service failed -%post -n %{name}%{so_version} -p /sbin/ldconfig - -%postun -n %{name}%{so_version} -p /sbin/ldconfig +%post -n %lname -p /sbin/ldconfig +%postun -n %lname -p /sbin/ldconfig %files %defattr(-,root,root,-) -%doc COPYING NEWS AUTHORS +%doc COPYING AUTHORS %attr( 754, root, service ) %dir /var/lib/servicelog %attr( 644, root, service ) /var/lib/servicelog/servicelog.db -%files -n %{name}%{so_version} +%files -n %lname %defattr(-,root,root,-) %{_libdir}/lib*.so.* -# dlopen object -%{_libdir}/*.so %files devel %defattr(-,root,root,-) %{_includedir}/servicelog-1 %{_libdir}/pkgconfig/servicelog-1.pc +%{_libdir}/*.so %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.JsjrRL/_old 2014-09-10 17:02:43.000000000 +0200 +++ /var/tmp/diff_new_pack.JsjrRL/_new 2014-09-10 17:02:43.000000000 +0200 @@ -1,6 +1,6 @@ -libservicelog-1_0-1 +libservicelog-1_1-1 obsoletes "libservicelog-<targettype> <= <version>" provides "libservicelog-<targettype> = <version>" libservicelog-devel requires -libservicelog-<targettype> - requires "libservicelog-1_0-1-<targettype> = <version>" + requires "libservicelog-1_1-1-<targettype> = <version>" ++++++ libservicelog-1.1.14.tar.gz -> libservicelog-1.1.15.tar.gz ++++++ ++++ 52289 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit lsvpd for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package lsvpd for openSUSE:Factory checked in at 2014-09-10 17:02:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/lsvpd (Old) and /work/SRC/openSUSE:Factory/.lsvpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "lsvpd" Changes: -------- --- /work/SRC/openSUSE:Factory/lsvpd/lsvpd.changes 2014-05-06 14:02:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.lsvpd.new/lsvpd.changes 2014-09-10 17:02:40.000000000 +0200 @@ -2 +2,11 @@ -Fri May 2 14:57:16 UTC 2014 - jloeser(a)suse.com +Thu Sep 4 13:49:25 UTC 2014 - jloeser(a)suse.com + +- version update to 1.7.5 (BNC#894845) + - Added LE support + - Fixed couple of issues in build tools + - Removed outdated debian build code + +- removed patches: + * lsvpd.grant_permission_to_link_with_librtas_library.patch +------------------------------------------------------------------- +Fri May 2 14:52:38 UTC 2014 - jloeser(a)suse.com @@ -9 +19 @@ -Mon Mar 17 15:25:18 UTC 2014 - jloeser(a)suse.com +Mon Mar 17 15:07:35 UTC 2014 - jloeser(a)suse.com @@ -37,4 +46,0 @@ - -- Drop upstreamed patches: - gcc47-fix.patch - invscout-no-return-fix.patch Old: ---- lsvpd-1.7.4.tar.gz lsvpd.grant_permission_to_link_with_librtas_library.patch New: ---- lsvpd-1.7.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ lsvpd.spec ++++++ --- /var/tmp/diff_new_pack.mVDsz6/_old 2014-09-10 17:02:42.000000000 +0200 +++ /var/tmp/diff_new_pack.mVDsz6/_new 2014-09-10 17:02:42.000000000 +0200 @@ -17,7 +17,7 @@ Name: lsvpd -Version: 1.7.4 +Version: 1.7.5 Release: 0 Summary: VPD Hardware Inventory Utilities for Linux License: GPL-2.0+ @@ -35,7 +35,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: ppc ppc64 ppc64le Patch0: lsvpd.no-return-in-nonvoid-function.patch -Patch1: lsvpd.grant_permission_to_link_with_librtas_library.patch %description The lsvpd package contains both the lsvpd, lscfg and lsmcode commands. @@ -50,7 +49,6 @@ %prep %setup -q %patch0 -p1 -%patch1 -p1 %build export CFLAGS="%{optflags} -UPCI_IDS -DPCI_IDS='\"/usr/share/pci.ids\"' -UUSB_IDS -DUSB_IDS='\"/usr/share/usb.ids\"'" ++++++ lsvpd-1.7.4.tar.gz -> lsvpd-1.7.5.tar.gz ++++++ ++++ 32318 lines of diff (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit powerpc-utils for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package powerpc-utils for openSUSE:Factory checked in at 2014-09-10 17:02:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/powerpc-utils (Old) and /work/SRC/openSUSE:Factory/.powerpc-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "powerpc-utils" Changes: -------- --- /work/SRC/openSUSE:Factory/powerpc-utils/powerpc-utils.changes 2014-07-18 14:03:54.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.powerpc-utils.new/powerpc-utils.changes 2014-09-10 17:02:39.000000000 +0200 @@ -1,0 +2,21 @@ +Thu Sep 4 13:06:31 UTC 2014 - jloeser(a)suse.com + +- version update to 1.2.22 (BNC#894855) + - ppc64_cpu: Be verbose about inconsistant SMT state + - ppc64_cpu: Remove parameter from do_info + - nvram: Handle endianness in the nvram --unzip option + - drmgr/lsslot: increase number of max cpu threads + - lsslot/drmgr: little endian support for memory + - lsslot/drmgr: little endian support for cpu + +- removed patches: + * powerpc-utils.endianness_for_unzip_option.patch +------------------------------------------------------------------- +Wed Jul 16 13:58:42 UTC 2014 - jloeser(a)suse.com + +- fix for nvram --unzip option to handle endianness (BNC#887275) +- added patch: + * powerpc-utils.endianness_for_unzip_option.patch + + +------------------------------------------------------------------- @@ -4 +25 @@ -- Update to 1.2.21: +- Update to 1.2.21 (bnc#884709): Old: ---- powerpc-utils-1.2.21.tar.gz New: ---- powerpc-utils-1.2.22.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ powerpc-utils.spec ++++++ --- /var/tmp/diff_new_pack.8cjiRv/_old 2014-09-10 17:02:40.000000000 +0200 +++ /var/tmp/diff_new_pack.8cjiRv/_new 2014-09-10 17:02:40.000000000 +0200 @@ -33,7 +33,7 @@ Recommends: powerpc-utils-python BuildRequires: librtas-devel BuildRequires: zlib-devel -Version: 1.2.21 +Version: 1.2.22 Release: 0 Url: http://sourceforge.net/projects/powerpc-utils Summary: Utilities for PowerPC Hardware ++++++ powerpc-utils-1.2.21.tar.gz -> powerpc-utils-1.2.22.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/Changelog new/powerpc-utils-1.2.22/Changelog --- old/powerpc-utils-1.2.21/Changelog 2014-06-25 23:24:47.000000000 +0200 +++ new/powerpc-utils-1.2.22/Changelog 2014-08-13 16:44:05.000000000 +0200 @@ -1,3 +1,78 @@ +powerpc-utils-1.2.22 +===================================================================== +commit 0a67ffbb5d40c49347cd85a74921693457331f82 +Author: Joel Stanley <joel(a)jms.id.au> +Date: Wed Aug 13 09:38:20 2014 -0500 + + ppc64_cpu: Be verbose about inconsistant SMT state + + With the use of splitcore, users are more likely to end up in a strange + SMT state. Be kind and display what the online state of all our CPUs is, + and explain how to get out of this hole. + + Signed-off-by: Joel Stanley <joel(a)jms.id.au> + +commit d3e016e9e5683a565824b9ec185901ff7feb25ed +Author: Joel Stanley <joel(a)jms.id.au> +Date: Wed Aug 13 09:36:27 2014 -0500 + + ppc64_cpu: Remove parameter from do_info + + It is unused. + + Also add a forward declaration at the top so we can call do_info in other + interesting places. + + Signed-off-by: Joel Stanley <joel(a)jms.id.au> + +commit 2af3d960442be3d36d8aa8ac914928d4047a0f18 +Author: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> +Date: Wed Aug 13 08:39:17 2014 -0500 + + nvram: Handle endianness in the nvram --unzip option. + + Handle endianness of the oops log size in the --unzip + option. + + Signed-off-by: Aruna Balakrishnaiah <aruna(a)linux.vnet.ibm.com> + Acked-by: Vasant Hegde <hegdevasant(a)linux.vnet.ibm.com> + +commit 48d45ca2ba2f098a4a565dac6e74cafe8db808f9 +Author: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> +Date: Wed Aug 13 08:35:30 2014 -0500 + + drmgr/lsslot: increase number of max cpu threads. + + The Power8 cpu can support eight threads per cpu core. This + patch increases the maximum number of threads from four to eight. + + Signed-off-by: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> + +commit 23872cbdce2107562b1b997cf306d6279ddf5d50 +Author: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> +Date: Wed Aug 13 08:22:37 2014 -0500 + + lsslot/drmgr: little endian support for memory + + This patch adds some support in retrieving memory slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing memory via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> + Signed-off-by: Nathan Fontenot <nfont(a)linux.vnet.ibm.com> + +commit c0e6665d9da9797df4b7516f2ef14d7a45f5cb81 +Author: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> +Date: Wed Aug 13 08:00:52 2014 -0500 + + lsslot/drmgr: little endian support for cpu + + This patch adds some support in retrieving cpu slot information + on little endian systems. These changes have only been tested using + lsslot. Adding or removing cpu's via drmgr has not been attempted. + + Signed-off-by: Thomas Falcon <tlfalcon(a)linux.vnet.ibm.com> + powerpc-utils-1.2.21 ===================================================================== commit a529515e6a78bc8d39b58122b99e009291048a78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/configure new/powerpc-utils-1.2.22/configure --- old/powerpc-utils-1.2.21/configure 2014-06-25 23:26:04.000000000 +0200 +++ new/powerpc-utils-1.2.22/configure 2014-08-13 16:44:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.21. +# Generated by GNU Autoconf 2.63 for powerpc-utils 1.2.22. # # Report bugs to <nfont(a)linux.vnet.ibm.com>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='powerpc-utils' PACKAGE_TARNAME='powerpc-utils' -PACKAGE_VERSION='1.2.21' -PACKAGE_STRING='powerpc-utils 1.2.21' +PACKAGE_VERSION='1.2.22' +PACKAGE_STRING='powerpc-utils 1.2.22' PACKAGE_BUGREPORT='nfont(a)linux.vnet.ibm.com' ac_unique_file="src/rtas_ibm_get_vpd.c" @@ -1289,7 +1289,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures powerpc-utils 1.2.21 to adapt to many kinds of systems. +\`configure' configures powerpc-utils 1.2.22 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1355,7 +1355,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of powerpc-utils 1.2.21:";; + short | recursive ) echo "Configuration of powerpc-utils 1.2.22:";; esac cat <<\_ACEOF @@ -1447,7 +1447,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -powerpc-utils configure 1.2.21 +powerpc-utils configure 1.2.22 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by powerpc-utils $as_me 1.2.21, which was +It was created by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2182,7 +2182,7 @@ # Define the identity of the package. PACKAGE='powerpc-utils' - VERSION='1.2.21' + VERSION='1.2.22' cat >>confdefs.h <<_ACEOF @@ -8142,7 +8142,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by powerpc-utils $as_me 1.2.21, which was +This file was extended by powerpc-utils $as_me 1.2.22, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8196,7 +8196,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -powerpc-utils config.status 1.2.21 +powerpc-utils config.status 1.2.22 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/configure.ac new/powerpc-utils-1.2.22/configure.ac --- old/powerpc-utils-1.2.21/configure.ac 2014-06-25 23:25:34.000000000 +0200 +++ new/powerpc-utils-1.2.22/configure.ac 2014-08-13 16:44:14.000000000 +0200 @@ -1,6 +1,6 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([ppu_version], 1.2.21) +m4_define([ppu_version], 1.2.22) AC_PREREQ([2.63]) AC_INIT([powerpc-utils], ppu_version, [nfont(a)linux.vnet.ibm.com]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/common_cpu.c new/powerpc-utils-1.2.22/src/drmgr/common_cpu.c --- old/powerpc-utils-1.2.21/src/drmgr/common_cpu.c 2014-05-28 01:51:48.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/common_cpu.c 2014-08-13 15:00:02.000000000 +0200 @@ -205,7 +205,7 @@ { struct stat sb; char intserv_path[DR_PATH_MAX]; - int rc; + int rc, i; if (path) { snprintf(cpu->ofdt_path, DR_PATH_MAX, "%s", path); @@ -220,11 +220,15 @@ /* Skip past CPU_OFDT_BASE plus the '/' */ cpu->name = cpu->ofdt_path + strlen(CPU_OFDT_BASE) + 1; - memset(&cpu->cpu_intserv_nums, -1, sizeof(cpu->cpu_intserv_nums)); rc = get_property(cpu->ofdt_path, "ibm,ppc-interrupt-server#s", &cpu->cpu_intserv_nums, sizeof(cpu->cpu_intserv_nums)); + + /* Making sure the intserv_nums are in correct endian format */ + for (i = 0; i < MAX_CPU_INTSERV_NUMS; i++) + cpu->cpu_intserv_nums[i] = be32toh(cpu->cpu_intserv_nums[i]); + if (rc) { say(ERROR, "Could not retrieve ibm,ppc-interrupt-server#s " "property for %s\n", cpu->name); @@ -244,8 +248,7 @@ else cpu->cpu_nthreads = sb.st_size / 4; - rc = get_property(cpu->ofdt_path, "reg", &cpu->cpu_reg, - sizeof(cpu->cpu_reg)); + rc = get_ofdt_uint_property(cpu->ofdt_path, "reg", &cpu->cpu_reg); if (rc) { say(ERROR, "Could not retrieve reg property for %s\n", cpu->name); @@ -254,8 +257,7 @@ /* l2-cache may not exist */ cpu->cpu_l2cache = 0xffffffff; - get_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache, - sizeof(cpu->cpu_l2cache)); + get_ofdt_uint_property(cpu->ofdt_path, "l2-cache", &cpu->cpu_l2cache); get_cpu_threads(cpu, dr_info->all_threads); cpu->is_owned = 1; @@ -543,9 +545,8 @@ cache->next = cache_list; cache_list = cache; - rc = get_property(cache->path, "ibm,phandle", - &cache->phandle, - sizeof(cache->phandle)); + rc = get_ofdt_uint_property(cache->path, "ibm,phandle", + &cache->phandle); if (rc) { say(ERROR, "Could not retreive ibm,phandle " "property for %s\n", cache->path); @@ -555,8 +556,8 @@ /* l3-caches do not have a l2-cache property */ cache->l2cache = 0xffffffff; - get_property(cache->path, "l2-cache", &cache->l2cache, - sizeof(cache->l2cache)); + get_ofdt_uint_property(cache->path, "l2-cache", + &cache->l2cache); say(DEBUG, "Found cache %s\n", cache->name); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/drslot_chrp_mem.c new/powerpc-utils-1.2.22/src/drmgr/drslot_chrp_mem.c --- old/powerpc-utils-1.2.21/src/drmgr/drslot_chrp_mem.c 2014-06-25 22:03:21.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/drslot_chrp_mem.c 2014-08-13 15:19:27.000000000 +0200 @@ -43,18 +43,15 @@ * @param int * pointer to phandle */ int -get_phandle(char *path, int *phandle) +get_phandle(char *path, uint *phandle) { int rc1,rc2; /* get "linux,phandle" property */ - rc1 = get_property(path, "linux,phandle", phandle, - sizeof(*phandle)); + rc1 = get_ofdt_uint_property(path, "linux,phandle", phandle); /* overwrite with "ibm,handle" if it exists */ - rc2 = get_property(path, "ibm,phandle", phandle, - sizeof(*phandle)); - + rc2 = get_ofdt_uint_property(path, "ibm,phandle", phandle); /* return bad if both gets failed */ if (rc1 && rc2) return rc1; @@ -158,7 +155,7 @@ return rc; } - lmb->lmb_size = regs[3]; + lmb->lmb_size = be32toh(regs[3]); return 0; } @@ -263,6 +260,10 @@ rc = get_property(DYNAMIC_RECONFIG_MEM, "ibm,lmb-size", &lmb_sz, sizeof(lmb_sz)); + + /* convert for LE systems */ + lmb_sz = be64toh(lmb_sz); + if (rc) { say(DEBUG, "Could not retrieve drconf LMB size\n"); return rc; @@ -288,12 +289,20 @@ /* The first integer of the buffer is the number of entries */ num_entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + num_entries = be32toh(num_entries); + /* Followed by the actual entries */ drmem = (struct drconf_mem *) (lmb_list->drconf_buf + sizeof(num_entries)); for (i = 0; i < num_entries; i++) { struct dr_node *lmb; + /* convert for LE systems */ + drmem->address = be64toh(drmem->address); + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + for (lmb = lmb_list->lmbs; lmb; lmb = lmb->next) { if (lmb->drc_index == drmem->drc_index) break; @@ -553,16 +562,24 @@ size_t prop_buf_sz; char *tmp; struct drconf_mem *drmem; - int phandle; + uint phandle; int i, entries; int rc; /* The first int of the buffer is the number of entries */ entries = *(int *)lmb_list->drconf_buf; + /* convert for LE systems */ + entries = be32toh(entries); + drmem = (struct drconf_mem *)(lmb_list->drconf_buf + sizeof(entries)); for (i = 0; i < entries; i++) { + + /* convert for LE systems */ + drmem->drc_index = be32toh(drmem->drc_index); + drmem->flags = be32toh(drmem->flags); + if (drmem->drc_index != lmb->drc_index) { drmem++; continue; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/drmgr/ofdt.h new/powerpc-utils-1.2.22/src/drmgr/ofdt.h --- old/powerpc-utils-1.2.21/src/drmgr/ofdt.h 2014-05-28 01:51:48.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/drmgr/ofdt.h 2014-08-13 15:35:03.000000000 +0200 @@ -14,7 +14,7 @@ #define DR_PATH_MAX 1024 #define DR_STR_MAX 128 -#define MAX_CPU_INTSERV_NUMS 4 +#define MAX_CPU_INTSERV_NUMS 8 struct dr_connector { char name[DRC_STR_MAX]; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/nvram.c new/powerpc-utils-1.2.22/src/nvram.c --- old/powerpc-utils-1.2.21/src/nvram.c 2014-06-25 23:05:24.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/nvram.c 2014-08-13 15:38:37.000000000 +0200 @@ -1113,7 +1113,7 @@ start = (char*) phead; next = start + sizeof(*phead); /* Skip partition header. */ next += sizeof(struct err_log_info); /* Skip sub-header. */ - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(unsigned short); /* New format oops header, zipped_length > OOPS_PARTITION_SZ @@ -1121,7 +1121,7 @@ * and from where the compressed data starts. */ if (zipped_length > OOPS_PARTITION_SZ) { - zipped_length = *((unsigned short*) next); + zipped_length = be16toh(*((unsigned short*) next)); next += sizeof(struct oops_log_info) - sizeof(unsigned short); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/powerpc-utils-1.2.21/src/ppc64_cpu.c new/powerpc-utils-1.2.22/src/ppc64_cpu.c --- old/powerpc-utils-1.2.21/src/ppc64_cpu.c 2014-06-25 22:31:29.000000000 +0200 +++ new/powerpc-utils-1.2.22/src/ppc64_cpu.c 2014-08-13 16:37:51.000000000 +0200 @@ -57,6 +57,8 @@ static int cpus_in_system = 0; static int threads_in_system = 0; +static int do_info(void); + static int test_sysattr(char *attribute, int perms) { char path[SYSFS_PATH_MAX]; @@ -1068,7 +1070,9 @@ smt_state = get_smt_state(); if (smt_state == -1) { - printf("Bad or inconsistent SMT state\n"); + printf("Bad or inconsistent SMT state: use ppc64_cpu --smt=on|off to set all\n" + "cores to have the same number of online threads to continue.\n"); + do_info(); return -1; } @@ -1126,7 +1130,7 @@ return 0; } -static int do_info(char *arg) +static int do_info(void) { int i, j, thread_num; char online; @@ -1287,7 +1291,7 @@ else if (!strcmp(action, "threads-per-core")) do_threads_per_core(); else if (!strcmp(action, "info")) - rc = do_info(action_arg); + rc = do_info(); else if (!strcmp(action, "version")) printf("ppc64_cpu: version %s\n", PPC64_CPU_VERSION); else -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libvmime for openSUSE:Factory
by root＠hilbert.suse.de 10 Sep '14

10 Sep '14

Hello community, here is the log from the commit of package libvmime for openSUSE:Factory checked in at 2014-09-10 17:02:10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libvmime (Old) and /work/SRC/openSUSE:Factory/.libvmime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libvmime" Changes: -------- --- /work/SRC/openSUSE:Factory/libvmime/libvmime.changes 2013-12-30 10:22:27.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libvmime.new/libvmime.changes 2014-09-10 17:02:36.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Aug 25 05:27:53 UTC 2014 - dap(a)open.by, jengelh(a)inai.de + +- Update to new git snapshot + 30ea54f269efa673a1eb5bc07e71715b67607dbc +* No upstream changelog was provided +- Turn on SASL, TLS support +- Remove vmime-0.9.2-header-value-on-next-line.diff + (no longer applies) + +------------------------------------------------------------------- Old: ---- libvmime-0.9.1+git175.tar.xz vmime-0.9.2-header-value-on-next-line.diff New: ---- libvmime-0.9.1+git432.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libvmime.spec ++++++ --- /var/tmp/diff_new_pack.gfraJC/_old 2014-09-10 17:02:38.000000000 +0200 +++ /var/tmp/diff_new_pack.gfraJC/_new 2014-09-10 17:02:38.000000000 +0200 @@ -17,7 +17,7 @@ Name: libvmime -%define lname libvmime-0_9_2-1 +%define lname libvmime-0_9_2-2 Summary: Library for working with MIME messages and IMAP/POP/SMTP License: GPL-3.0+ Group: Development/Libraries/C and C++ @@ -25,24 +25,28 @@ Release: 0 Url: http://vmime.org/ -#Svn-Clone: https://vmime.svn.sourceforge.net/svnroot/vmime/trunk +#Git-Clone: git://github.com/kisli/vmime +#Git-Web: https://github.com/kisli/vmime +#Snapshot: v0.9.1-432-g674c369 #Source: http://downloads.sf.net/vmime/%name-%version.tar.bz2 -Source: %name-0.9.1+git175.tar.xz +Source: %name-0.9.1+git432.tar.xz Patch1: libvmime-nodatetime.diff Patch2: libvmime-sotag.diff -Patch3: vmime-0.9.2-header-value-on-next-line.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: ImageMagick +%if 0%{?suse_version} < 1310 +BuildRequires: boost-devel +%endif BuildRequires: cmake >= 2.8.3 +BuildRequires: doxygen BuildRequires: gcc-c++ BuildRequires: inkscape +BuildRequires: libgnutls-devel BuildRequires: libgsasl-devel +BuildRequires: libopenssl-devel BuildRequires: pkgconfig BuildRequires: postfix -%if 0%{?suse_version} >= 1130 && "%_repository" != "devel:libraries:c_c++" -# Cannot realistically build because of all the new libs this prj has -# Nothing provides libzzip-0-13 required by texlive -# Nothing provides libMagick++.so.5 required by Inkscape +%if 0%{?suse_version} >= 1130 %define with_pdf 1 %if 0%{?suse_version} < 1300 BuildRequires: texlive-bin-latex @@ -57,16 +61,6 @@ %endif %endif BuildRequires: xz -%if 0%{?suse_version} >= 1100 -BuildRequires: libgnutls-devel -%else -%if 0%{?suse_version} -BuildRequires: gnutls-devel -%endif -%endif -%if 0%{?fedora_version} || 0%{?redhat_version} || 0%{?centos_version} -BuildRequires: gnutls-devel -%endif %description VMime is a powerful C++ class library for working with MIME messages @@ -106,7 +100,7 @@ %prep %setup -qn vmime -%patch -P 1 -P 2 -P 3 -p1 +%patch -P 1 -P 2 -p1 %build %if 0%{?with_pdf} @@ -119,10 +113,19 @@ # sendmail's awesome location. export PATH="$PATH:/usr/sbin"; cmake . \ + -DVMIME_BUILD_SAMPLES:BOOL=OFF \ + -DVMIME_HAVE_SASL_SUPPORT:BOOL=ON \ + -DVMIME_HAVE_TLS_SUPPORT:BOOL=ON \ -DVMIME_BUILD_STATIC_LIBRARY:BOOL=OFF \ - -DCMAKE_RELEASE_TYPE:STRING="Release" \ + -DCMAKE_RELEASE_TYPE:STRING="RelWithDebInfo" \ -DCMAKE_INSTALL_PREFIX:PATH="%_prefix" \ - -DCMAKE_C_FLAGS:STRING="$cf" -DCMAKE_CXX_FLAGS:STRING="$cf" + -DCMAKE_CXX_FLAGS_DEBUG:STRING="-g" \ +%if 0%{?suse_version} >= 1310 + -DCMAKE_CXX_FLAGS:STRING="$cf -std=gnu++11" \ +%else + -DCMAKE_CXX_FLAGS:STRING="$cf" \ +%endif + -DCMAKE_C_FLAGS:STRING="$cf" make %{?_smp_mflags} VERBOSE=1 %install @@ -140,7 +143,7 @@ %files -n %lname %defattr(-,root,root) -%_libdir/%name-%version.so.1* +%_libdir/%name-%version.so.2* %files devel %defattr(-,root,root) ++++++ libvmime-0.9.1+git175.tar.xz -> libvmime-0.9.1+git432.tar.xz ++++++ ++++ 178112 lines of diff (skipped) ++++++ libvmime-nodatetime.diff ++++++ --- /var/tmp/diff_new_pack.gfraJC/_old 2014-09-10 17:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.gfraJC/_new 2014-09-10 17:02:39.000000000 +0200 @@ -4,14 +4,14 @@ Subject: [PATCH] src: avoid __DATE__ and __TIME__ --- - src/base.cpp | 2 +- + src/vmime/base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/base.cpp b/src/base.cpp -index d5f3e78..74bbba7 100644 ---- a/src/base.cpp -+++ b/src/base.cpp -@@ -75,7 +75,7 @@ const string libname() { return (VMIME_PACKAGE); } +Index: vmime/src/vmime/base.cpp +=================================================================== +--- vmime.orig/src/vmime/base.cpp ++++ vmime/src/vmime/base.cpp +@@ -75,7 +75,7 @@ const string libname() { return (VMIME_P * * @return library version */ @@ -20,6 +20,3 @@ /** Return the library API version (eg: "6:1:6"). * --- -1.8.1.4 - ++++++ libvmime-sotag.diff ++++++ --- /var/tmp/diff_new_pack.gfraJC/_old 2014-09-10 17:02:39.000000000 +0200 +++ /var/tmp/diff_new_pack.gfraJC/_new 2014-09-10 17:02:39.000000000 +0200 @@ -8,23 +8,23 @@ that is unique within our distro and distinguishes itself from upstream. --- - CMakeLists.txt | 4 ++-- + CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1c45d89..9760e13 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,7 +50,7 @@ SET(VMIME_VERSION_MICRO 2) +Index: vmime/CMakeLists.txt +=================================================================== +--- vmime.orig/CMakeLists.txt ++++ vmime/CMakeLists.txt +@@ -52,7 +52,7 @@ SET(VMIME_VERSION_MICRO 2) # . Interfaces added/removed/changed: CURRENT++, REVISION=0 # . Interfaces added (upward-compatible changes): AGE++ # . Interfaces removed: AGE=0 -SET(VMIME_API_VERSION_CURRENT 0) -+SET(VMIME_API_VERSION_CURRENT 1) ++SET(VMIME_API_VERSION_CURRENT 2) SET(VMIME_API_VERSION_REVISION 0) SET(VMIME_API_VERSION_AGE 0) -@@ -63,7 +63,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSION_CURRENT}.${VMIME_API_VERSION_REVISION} +@@ -65,7 +65,7 @@ SET(VMIME_API_VERSION ${VMIME_API_VERSIO # VMime Library # Set base name @@ -33,6 +33,3 @@ # Source files FILE( --- -1.8.1.4 - -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0