September 2010 - openSUSE Commits - openSUSE Mailing Lists

commit wodim for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wodim for openSUSE:Factory checked in at Tue Sep 28 22:55:08 CEST 2010. -------- --- wodim/wodim.changes 2010-02-22 23:00:41.000000000 +0100 +++ /mounts/work_src_done/STABLE/wodim/wodim.changes 2010-09-28 12:36:53.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Sep 28 10:32:53 UTC 2010 - reddwarf(a)opensuse.org + +- updated to 1.1.10: + * genisoimage: add support for sha256 and sha512 checksum generation + when making jigdo files. + * genisoimage: checksumming with lots of algorithms can be very + time-consuming, so split it out into multiple threads if possible. + * genisoimage: allow user to specify which checksum algorithms to run + on the command line. + * Fix FTBFS with missing xconfig.h. Thanks to Matt Kraai for the patch. + * genisoimage: fix string overflow breakage when using the -root + option (https://bugzilla.redhat.com/show_bug.cgi?id=508449) + * librols: remove or rename several functions that clash with POSIX. + Fix up callers. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- cdrkit-1.1.9-glibc-2.10.patch cdrkit-1.1.9.tar.bz2 New: ---- _service _service:download_url:cdrkit-1.1.10.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wodim.spec ++++++ --- /var/tmp/diff_new_pack.D4TcjK/_old 2010-09-28 22:53:33.000000000 +0200 +++ /var/tmp/diff_new_pack.D4TcjK/_new 2010-09-28 22:53:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wodim (Version 1.1.9) +# spec file for package wodim (Version 1.1.10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,19 +20,18 @@ Name: wodim BuildRequires: cmake file-devel gcc-c++ libcap-devel zlib-devel -License: GPLv2 ; GPLv2+ +License: GPLv2+ Group: Productivity/Multimedia/CD/Record PreReq: permissions /bin/cp AutoReqProv: on -Version: 1.1.9 -Release: 4 -Source: cdrkit-%{version}.tar.bz2 +Version: 1.1.10 +Release: 1 +Source: cdrkit-%{version}.tar.gz Source1: scan_scsi.linux Source2: cdinfo.c Source5: README.SUSE -Patch1: cdrkit-%{version}-cmake.patch +Patch1: cdrkit-1.1.9-cmake.patch Patch2: genisoimage-multi-extent.patch -Patch3: cdrkit-%{version}-glibc-2.10.patch Patch4: cdrkit-1.1.9-zlib-check.patch Patch5: cdrkit-1.1.9-fix-buffer-overflows.patch Url: http://cdrkit.org/ @@ -141,7 +140,6 @@ %setup -q -n cdrkit-%{version} %patch1 %patch2 -%patch3 -p1 %patch4 %patch5 -p1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine-gecko for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wine-gecko for openSUSE:Factory checked in at Tue Sep 28 22:53:17 CEST 2010. -------- --- wine-gecko/wine-gecko.changes 2009-11-13 16:00:15.000000000 +0100 +++ /mounts/work_src_done/STABLE/wine-gecko/wine-gecko.changes 2010-09-25 10:04:23.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Sep 25 08:01:41 UTC 2010 - meissner(a)novell.com + +- updated to 1.1.0 version for Wine 1.3.2 and later + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine_gecko-1.0.0-x86.cab New: ---- wine_gecko-1.1.0-x86.cab ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine-gecko.spec ++++++ --- /var/tmp/diff_new_pack.Ggs2NW/_old 2010-09-28 22:53:05.000000000 +0200 +++ /var/tmp/diff_new_pack.Ggs2NW/_new 2010-09-28 22:53:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine-gecko (Version 1.0.0) +# spec file for package wine-gecko (Version 1.1.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,8 +22,8 @@ License: MPL 1.1 or later Group: Development/Tools/Other AutoReqProv: on -Summary: A Friendly Greeting Program -Version: 1.0.0 +Summary: The Wine specific Gecko HTML rendering engine +Version: 1.1.0 Release: 1 Source0: http://downloads.sourceforge.net/wine/wine_gecko-%{version}-x86.cab # Source of this CAB is at: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Tue Sep 28 22:52:51 CEST 2010. -------- --- wine/wine.changes 2010-09-15 15:25:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/wine/wine.changes 2010-09-27 14:43:38.000000000 +0200 @@ -1,0 +2,14 @@ +Mon Sep 20 13:11:42 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.3 development snapshot + - Improved support for right-to-left text. + - Support for CMYK JPEG images. + - Beginnings of a Game Explorer implementation. + - Improved 64-bit support in MSI. + - Stub inetcpl control panel applet. + - A number of fixes to crypto support. + - Translation updates. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- @@ -4,0 +19,38 @@ + +------------------------------------------------------------------- +Mon Sep 6 12:55:46 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.2 development snapshot + - Update of the Gecko engine, now including a 64-bit version. + - New implementation of console support on Unix terminals. + - Many new functions in the C runtime dlls. + - Various bug fixes. +- updated winetricks + +------------------------------------------------------------------- +Sun Aug 22 12:51:50 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.1 development snapshot + - Support for drag & drop between X11 and OLE. + - New ipconfig.exe builtin tool. + - Support for favorites in builtin Internet Explorer. + - Beginnings of a shell Explorer control. + - A number of DirectDraw code cleanups. + - Improvements to the calendar control. + - Various bug fixes. + +------------------------------------------------------------------- +Sun Aug 1 16:31:57 CEST 2010 - meissner(a)suse.de + +- Updated to 1.3.0 development snapshot + - Beginnings of a user interface for the builtin Internet Explorer. + - Support for cross-process OLE drag & drop. + - New builtin wscript.exe (Windows Script Host) program. + - Open/save dialogs remember the last used directory. + - Translation updates. + - Various bug fixes. +- updated winetricks + - various new loaders + - bugfixes +- updated wisotool + - lots of fixes calling whatdependson for head-i586 Old: ---- wine-1.2.tar.bz2 New: ---- susepatches.patch wine-1.3.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.TViZdH/_old 2010-09-28 22:51:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TViZdH/_new 2010-09-28 22:51:46.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.2) +# spec file for package wine (Version 1.3.3) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,16 +27,19 @@ License: LGPLv2.1+ Group: System/Emulators/PC AutoReqProv: on -Version: 1.2 -Release: 2 +Version: 1.3.3 +Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com +# vanilla Wine release Source0: wine-%version.tar.bz2 Source1: http://kegel.com/wine/winetricks Source2: http://kegel.com/wine/wisotool Source3: README.SuSE Source4: wine.desktop Source5: ubuntuwine.tar.bz2 +# SUSE specific patches +Patch0: susepatches.patch Recommends: wine-gecko wine-mp3 Requires: wine-32bit = %version # for winetricks: @@ -91,6 +94,7 @@ %prep %setup -q +%patch0 -p1 # cp %{S:3} . # ++++++ susepatches.patch ++++++ diff --git a/dlls/crypt32/str.c b/dlls/crypt32/str.c index 914ccaa..6d0fb5b 100644 --- a/dlls/crypt32/str.c +++ b/dlls/crypt32/str.c @@ -190,6 +190,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, static const char crlfSep[] = "\r\n"; static const char plusSep[] = " + "; static const char spaceSep[] = " "; + static const char quoteSep[] = "\""; DWORD ret = 0, bytes = 0; BOOL bRet; CERT_NAME_INFO *info; @@ -204,7 +205,7 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, if (bRet) { DWORD i, j, sepLen, rdnSepLen; - LPCSTR sep, rdnSep; + LPCSTR sep, rdnSep, quote; BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; const CERT_RDN *rdn = info->rgRDN; @@ -222,11 +223,16 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, else rdnSep = plusSep; rdnSepLen = strlen(rdnSep); + if (dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) + quote = NULL; + else + quote = quoteSep; for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; + int needquote = 0; char prefixBuf[10]; /* big enough for GivenName */ LPCSTR prefix = NULL; @@ -255,13 +261,44 @@ DWORD WINAPI CertNameToStrA(DWORD dwCertEncodingType, PCERT_NAME_BLOB pName, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ + /* FIXME: quoting still misses " (which is replaced by "") */ chars = CertRDNValueToStrA( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); - if (chars) + + /* poor mans memmem(), for , seperation */ + if (psz && quote && chars) { + int xx; + for (xx=0;xx<chars-1;xx++) { + if ((psz[ret+xx] == ',') || + (psz[ret+xx] == ';')) + { + needquote = 1; + break; + } + } + } + if (psz && quote && chars && needquote) { + /* - 1 is needed to account for the null terminator. */ + if (psz && ret < csz - strlen(quote) - 1) + memcpy (psz + ret, quote, strlen(quote)); + ret += strlen(quote); + + chars = CertRDNValueToStrA( + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, + psz ? csz - ret : 0); ret += chars - 1; + if (psz && ret < csz - strlen(quote) - 1) + memcpy (psz + ret, quote, strlen(quote)); + ret += strlen(quote); + } else { + if (chars) + ret += chars - 1; + } + + /* FIXME: handle quoting */ if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) @@ -353,6 +390,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, static const WCHAR crlfSep[] = { '\r','\n',0 }; static const WCHAR plusSep[] = { ' ','+',' ',0 }; static const WCHAR spaceSep[] = { ' ',0 }; + static const WCHAR quoteSep[] = { '"',0 }; DWORD ret = 0, bytes = 0; BOOL bRet; CERT_NAME_INFO *info; @@ -365,7 +403,7 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, if (bRet) { DWORD i, j, sepLen, rdnSepLen; - LPCWSTR sep, rdnSep; + LPCWSTR sep, rdnSep, quote; BOOL reverse = dwStrType & CERT_NAME_STR_REVERSE_FLAG; const CERT_RDN *rdn = info->rgRDN; @@ -383,11 +421,16 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, else rdnSep = plusSep; rdnSepLen = lstrlenW(rdnSep); + if (dwStrType & CERT_NAME_STR_NO_QUOTING_FLAG) + quote = NULL; + else + quote = quoteSep; for (i = 0; (!psz || ret < csz) && i < info->cRDN; i++) { for (j = 0; (!psz || ret < csz) && j < rdn->cRDNAttr; j++) { DWORD chars; + int needquote = 0; LPCSTR prefixA = NULL; LPCWSTR prefixW = NULL; @@ -435,13 +478,43 @@ DWORD cert_name_to_str_with_indent(DWORD dwCertEncodingType, DWORD indentLevel, psz ? psz + ret : NULL, psz ? csz - ret - 1 : 0); ret += chars; } - /* FIXME: handle quoting */ + /* FIXME: quoting still misses " (which is replaced by "") */ chars = CertRDNValueToStrW( rdn->rgRDNAttr[j].dwValueType, &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, psz ? csz - ret : 0); - if (chars) + + /* poor mans memmem(), for , seperation */ + if (psz && quote && chars) { + int xx; + for (xx=0;xx<chars-1;xx++) { + if ((psz[ret+xx] == ',') || + (psz[ret+xx] == ';')) + { + needquote = 1; + break; + } + } + } + if (psz && quote && chars && needquote) { + /* - 1 is needed to account for the NULL terminator. */ + if (psz && ret < csz - lstrlenW(quote) - 1) + memcpy (psz + ret, quote, lstrlenW(quote) * sizeof(WCHAR)); + ret += lstrlenW(quote); + + chars = CertRDNValueToStrW( + rdn->rgRDNAttr[j].dwValueType, + &rdn->rgRDNAttr[j].Value, psz ? psz + ret : NULL, + psz ? csz - ret : 0); ret += chars - 1; + if (psz && ret < csz - lstrlenW(quote) - 1) + memcpy (psz + ret, quote, lstrlenW(quote) * sizeof(WCHAR)); + ret += lstrlenW(quote); + } else { + if (chars) + ret += chars - 1; + } + if (j < rdn->cRDNAttr - 1) { if (psz && ret < csz - rdnSepLen - 1) diff --git a/dlls/crypt32/tests/str.c b/dlls/crypt32/tests/str.c index ebc3342..2549bcc 100644 --- a/dlls/crypt32/tests/str.c +++ b/dlls/crypt32/tests/str.c @@ -67,12 +67,12 @@ static const BYTE cert[] = 0x73,0x6f,0x74,0x61,0x31,0x14,0x30,0x12,0x6,0x3,0x55,0x4,0x7,0x13,0xb,0x4d, 0x69,0x6e,0x6e,0x65,0x61,0x70,0x6f,0x6c,0x69,0x73,0x31,0x14,0x30,0x12,0x6,0x3, 0x55,0x4,0xa,0x13,0xb,0x43,0x6f,0x64,0x65,0x57,0x65,0x61,0x76,0x65,0x72,0x73, - 0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb,0x13,0x10,0x57,0x69,0x6e,0x65,0x20, + 0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb,0x13,0x10,0x57,0x69,0x6e,0x65,0x2c, 0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d,0x65,0x6e,0x74,0x31,0x12,0x30,0x10, 0x6,0x3,0x55,0x4,0x3,0x13,0x9,0x6c,0x6f,0x63,0x61,0x6c,0x68,0x6f,0x73,0x74, 0x31,0x23,0x30,0x21,0x6,0x9,0x2a,0x86,0x48,0x86,0xf7,0xd,0x1,0x9,0x1,0x16, 0x14,0x61,0x72,0x69,0x63,0x40,0x63,0x6f,0x64,0x65,0x77,0x65,0x61,0x76,0x65, - 0x72,0x73,0x2e,0x63,0x6f,0x6d,0x30,0x1e,0x17,0xd,0x30,0x36,0x30,0x31,0x32, + 0x72,0x73,0x3b,0x63,0x6f,0x6d,0x30,0x1e,0x17,0xd,0x30,0x36,0x30,0x31,0x32, 0x35,0x31,0x33,0x35,0x37,0x32,0x34,0x5a,0x17,0xd,0x30,0x36,0x30,0x32,0x32, 0x34,0x31,0x33,0x35,0x37,0x32,0x34,0x5a,0x30,0x81,0xa1,0x31,0xb,0x30,0x9,0x6, 0x3,0x55,0x4,0x6,0x13,0x2,0x55,0x53,0x31,0x12,0x30,0x10,0x6,0x3,0x55,0x4,0x8, @@ -80,11 +80,11 @@ static const BYTE cert[] = 0x3,0x55,0x4,0x7,0x13,0xb,0x4d,0x69,0x6e,0x6e,0x65,0x61,0x70,0x6f,0x6c,0x69, 0x73,0x31,0x14,0x30,0x12,0x6,0x3,0x55,0x4,0xa,0x13,0xb,0x43,0x6f,0x64,0x65, 0x57,0x65,0x61,0x76,0x65,0x72,0x73,0x31,0x19,0x30,0x17,0x6,0x3,0x55,0x4,0xb, - 0x13,0x10,0x57,0x69,0x6e,0x65,0x20,0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d, + 0x13,0x10,0x57,0x69,0x6e,0x65,0x2c,0x44,0x65,0x76,0x65,0x6c,0x6f,0x70,0x6d, 0x65,0x6e,0x74,0x31,0x12,0x30,0x10,0x6,0x3,0x55,0x4,0x3,0x13,0x9,0x6c,0x6f, 0x63,0x61,0x6c,0x68,0x6f,0x73,0x74,0x31,0x23,0x30,0x21,0x6,0x9,0x2a,0x86,0x48, 0x86,0xf7,0xd,0x1,0x9,0x1,0x16,0x14,0x61,0x72,0x69,0x63,0x40,0x63,0x6f,0x64, - 0x65,0x77,0x65,0x61,0x76,0x65,0x72,0x73,0x2e,0x63,0x6f,0x6d,0x30,0x81,0x9f, + 0x65,0x77,0x65,0x61,0x76,0x65,0x72,0x73,0x3b,0x63,0x6f,0x6d,0x30,0x81,0x9f, 0x30,0xd,0x6,0x9,0x2a,0x86,0x48,0x86,0xf7,0xd,0x1,0x1,0x1,0x5,0x0,0x3,0x81, 0x8d,0x0,0x30,0x81,0x89,0x2,0x81,0x81,0x0,0x9b,0xb5,0x8f,0xaf,0xfb,0x9a,0xaf, 0xdc,0xa2,0x4d,0xb1,0xc8,0x72,0x44,0xef,0x79,0x7f,0x28,0xb6,0xfe,0x50,0xdc, @@ -107,71 +107,71 @@ static const BYTE cert[] = 0x91,0x8a,0xf8,0x5,0xef,0x5b,0x3b,0x49,0xbf,0x5f,0x2b}; static char issuerStr[] = - "US, Minnesota, Minneapolis, CodeWeavers, Wine Development, localhost, aric(a)codeweavers.com"; + "US, Minnesota, Minneapolis, CodeWeavers, \"Wine,Development\", localhost, \"aric@codeweavers;com\""; static char issuerStrSemicolon[] = - "US; Minnesota; Minneapolis; CodeWeavers; Wine Development; localhost; aric(a)codeweavers.com"; + "US; Minnesota; Minneapolis; CodeWeavers; \"Wine,Development\"; localhost; \"aric@codeweavers;com\""; static char issuerStrCRLF[] = - "US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\nWine Development\r\nlocalhost\r\naric(a)codeweavers.com"; + "US\r\nMinnesota\r\nMinneapolis\r\nCodeWeavers\r\n\"Wine,Development\"\r\nlocalhost\r\n\"aric@codeweavers;com\""; static char subjectStr[] = - "2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=Wine Development, 2.5.4.3=localhost, 1.2.840.113549.1.9.1=aric(a)codeweavers.com"; + "2.5.4.6=US, 2.5.4.8=Minnesota, 2.5.4.7=Minneapolis, 2.5.4.10=CodeWeavers, 2.5.4.11=\"Wine,Development\", 2.5.4.3=localhost, 1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; static char subjectStrSemicolon[] = - "2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=Wine Development; 2.5.4.3=localhost; 1.2.840.113549.1.9.1=aric(a)codeweavers.com"; + "2.5.4.6=US; 2.5.4.8=Minnesota; 2.5.4.7=Minneapolis; 2.5.4.10=CodeWeavers; 2.5.4.11=\"Wine,Development\"; 2.5.4.3=localhost; 1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; static char subjectStrCRLF[] = - "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=Wine Development\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=aric(a)codeweavers.com"; -static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=Wine Development, CN=localhost, E=aric(a)codeweavers.com"; -static char x500SubjectStrSemicolonReverse[] = "E=aric(a)codeweavers.com; CN=localhost; OU=Wine Development; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; + "2.5.4.6=US\r\n2.5.4.8=Minnesota\r\n2.5.4.7=Minneapolis\r\n2.5.4.10=CodeWeavers\r\n2.5.4.11=\"Wine,Development\"\r\n2.5.4.3=localhost\r\n1.2.840.113549.1.9.1=\"aric@codeweavers;com\""; +static char x500SubjectStr[] = "C=US, S=Minnesota, L=Minneapolis, O=CodeWeavers, OU=\"Wine,Development\", CN=localhost, E=\"aric@codeweavers;com\""; +static char x500SubjectStrSemicolonReverse[] = "E=\"aric@codeweavers;com\"; CN=localhost; OU=\"Wine,Development\"; O=CodeWeavers; L=Minneapolis; S=Minnesota; C=US"; static WCHAR issuerStrW[] = { 'U','S',',',' ','M','i','n','n','e','s','o','t','a',',',' ','M','i','n','n', 'e','a','p','o','l','i','s',',',' ','C','o','d','e','W','e','a','v','e','r', - 's',',',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ',',' ','l','o','c','a','l','h','o','s','t',',',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 's',',',' ','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"', + ',',' ','l','o','c','a','l','h','o','s','t',',',' ','"','a','r','i','c','@','c', + 'o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR issuerStrSemicolonW[] = { 'U','S',';',' ','M','i','n','n','e','s','o','t','a',';',' ','M','i','n','n', 'e','a','p','o','l','i','s',';',' ','C','o','d','e','W','e','a','v','e','r', - 's',';',' ','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t', - ';',' ','l','o','c','a','l','h','o','s','t',';',' ','a','r','i','c','@','c', - 'o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 's',';',' ','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"', + ';',' ','l','o','c','a','l','h','o','s','t',';',' ','"','a','r','i','c','@','c', + 'o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR issuerStrCRLFW[] = { 'U','S','\r','\n','M','i','n','n','e','s','o','t','a','\r','\n','M','i','n', 'n','e','a','p','o','l','i','s','\r','\n','C','o','d','e','W','e','a','v','e', - 'r','s','\r','\n','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n', - 't','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','a','r','i','c', - '@','c','o','d','e','w','e','a','v','e','r','s','.','c','o','m',0 }; + 'r','s','\r','\n','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n', + 't','"','\r','\n','l','o','c','a','l','h','o','s','t','\r','\n','"','a','r','i','c', + '@','c','o','d','e','w','e','a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrW[] = { '2','.','5','.','4','.','6','=','U','S',',',' ','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a',',',' ','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s',',',' ','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',',',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"',',',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t',',',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrSemicolonW[] = { '2','.','5','.','4','.','6','=','U','S',';',' ','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a',';',' ','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s',';',' ','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s',';',' ','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"',';',' ','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t',';',' ','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR subjectStrCRLFW[] = { '2','.','5','.','4','.','6','=','U','S','\r','\n','2','.','5','.','4','.','8', '=','M','i','n','n','e','s','o','t','a','\r','\n','2','.','5','.','4','.','7', '=','M','i','n','n','e','a','p','o','l','i','s','\r','\n','2','.','5','.','4', '.','1','0','=','C','o','d','e','W','e','a','v','e','r','s','\r','\n','2','.', - '5','.','4','.','1','1','=','W','i','n','e',' ','D','e','v','e','l','o','p', - 'm','e','n','t','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', + '5','.','4','.','1','1','=','"','W','i','n','e',',','D','e','v','e','l','o','p', + 'm','e','n','t','"','\r','\n','2','.','5','.','4','.','3','=','l','o','c','a','l', 'h','o','s','t','\r','\n','1','.','2','.','8','4','0','.','1','1','3','5','4', - '9','.','1','.','9','.','1','=','a','r','i','c','@','c','o','d','e','w','e', - 'a','v','e','r','s','.','c','o','m',0 }; + '9','.','1','.','9','.','1','=','"','a','r','i','c','@','c','o','d','e','w','e', + 'a','v','e','r','s',';','c','o','m','"',0 }; static WCHAR x500SubjectStrSemicolonReverseW[] = { - 'E','=','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s','.','c', - 'o','m',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', - '=','W','i','n','e',' ','D','e','v','e','l','o','p','m','e','n','t',';',' ','O', + 'E','=','"','a','r','i','c','@','c','o','d','e','w','e','a','v','e','r','s',';','c', + 'o','m','"',';',' ','C','N','=','l','o','c','a','l','h','o','s','t',';',' ','O','U', + '=','"','W','i','n','e',',','D','e','v','e','l','o','p','m','e','n','t','"',';',' ','O', '=','C','o','d','e','W','e','a','v','e','r','s',';',' ','L','=','M','i','n','n', 'e','a','p','o','l','i','s',';',' ','S','=','M','i','n','n','e','s','o','t','a', ';',' ','C','=','U','S',0 }; @@ -399,11 +399,8 @@ static void test_NameToStrConversionW(PCERT_NAME_BLOB pName, DWORD dwStrType, sizeof(buffer) / sizeof(buffer[0])); ok(i == lstrlenW(expected) + 1, "Expected %d chars, got %d\n", lstrlenW(expected) + 1, i); - ok(!lstrcmpW(buffer, expected), "Unexpected value\n"); -#ifdef DUMP_STRINGS - trace("Expected %s, got %s\n", + ok(!lstrcmpW(buffer, expected), "Expected %s, got %s\n", wine_dbgstr_w(expected), wine_dbgstr_w(buffer)); -#endif } static void test_CertNameToStrW(void) diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 1c9cf22..054683c 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -1753,13 +1753,13 @@ LPITEMIDLIST _ILCreateEntireNetwork(void) TRACE("\n"); - pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[sizeof("Entire Network")])); + pidlOut = _ILAlloc(PT_NETWORK, FIELD_OFFSET(PIDLDATA, u.network.szNames[strlen("Entire Network")+1])); if (pidlOut) { LPPIDLDATA pData = _ILGetDataPointer(pidlOut); pData->u.network.dummy = 0; - strcpy(pData->u.network.szNames, "Entire Network"); + memcpy(pData->u.network.szNames, "Entire Network", strlen("Entire Network")+1); } return pidlOut; } ++++++ wine-1.2.tar.bz2 -> wine-1.3.3.tar.bz2 ++++++ wine/wine-1.2.tar.bz2 /mounts/work_src_done/STABLE/wine/wine-1.3.3.tar.bz2 differ: char 11, line 1 ++++++ winetricks ++++++ ++++ 1231 lines (skipped) ++++ between wine/winetricks ++++ and /mounts/work_src_done/STABLE/wine/winetricks ++++++ wisotool ++++++ ++++ 3458 lines (skipped) ++++ between wine/wisotool ++++ and /mounts/work_src_done/STABLE/wine/wisotool ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit smartmontools for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package smartmontools for openSUSE:Factory checked in at Tue Sep 28 22:50:02 CEST 2010. -------- --- smartmontools/smartmontools.changes 2010-06-28 08:51:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/smartmontools/smartmontools.changes 2010-09-28 18:56:23.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Sep 28 17:20:37 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Fix patch to remove build Dates +- Update to a newer version of 5.39.1 branch in order + to support libcap-ng so smartd can drop privileges + +------------------------------------------------------------------- +Sun Aug 29 18:56:43 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- Do not include build enviroment infon in the binaries + including date and time of compilation, makes build-compare + happier. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- smartmontools-5.39.1.tar.bz2 New: ---- smartmontools-5.39.1-nobuild-date.patch smartmontools-5.39.1_git201009281647.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ smartmontools.spec ++++++ --- /var/tmp/diff_new_pack.Gc0Hsr/_old 2010-09-28 22:48:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Gc0Hsr/_new 2010-09-28 22:48:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package smartmontools (Version 5.39.1) +# spec file for package smartmontools (Version 5.39.1_git201009281647) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,8 +21,8 @@ Name: smartmontools License: GPLv2+ Group: Hardware/Other -Version: 5.39.1 -Release: 6 +Version: 5.39.1_git201009281647 +Release: 1 Source: %{name}-%{version}.tar.bz2 Source1: README.SATA Source2: smartmontools.sysconfig @@ -33,6 +33,7 @@ Patch5: smartmontools-init-update.patch Patch6: smartmontools-sysconfig.patch Patch7: smartmontools-strict-aliasing.patch +Patch8: smartmontools-5.39.1-nobuild-date.patch PreReq: %insserv_prereq %fillup_prereq coreutils %if %suse_version <= 1100 Requires: powersave @@ -43,10 +44,13 @@ %endif Url: http://smartmontools.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ libstdc++-devel +BuildRequires: gcc-c++ %if %suse_version >= 1110 BuildRequires: libselinux-devel %endif +%if %suse_version >= 1130 +BuildRequires: libcap-ng-devel +%endif Summary: Monitor for S.M.A.R.T. Disks and Devices Obsoletes: smartctl smartd ucsc-smartsuite smartsuite @@ -85,6 +89,7 @@ %patch5 %patch6 %patch7 +%patch8 %build AUTOMAKE=/usr/bin/automake-1.11 ./autogen.sh ++++++ smartmontools-5.39.1-nobuild-date.patch ++++++ --- utility.cpp.orig 2010-07-13 12:51:30.000000000 +0200 +++ utility.cpp 2010-09-28 18:48:37.773996000 +0200 @@ -88,11 +88,7 @@ unsigned char debugmode = 0; std::string format_version_info(const char * prog_name, bool full /*= false*/) { std::string info = strprintf( - "%s "PACKAGE_VERSION" "SMARTMONTOOLS_SVN_DATE" r"SMARTMONTOOLS_SVN_REV - " [%s] "BUILD_INFO"\n" - "Copyright (C) 2002-10 by Bruce Allen, http://smartmontools.sourceforge.net\n", - prog_name, smi()->get_os_version_str().c_str() - ); + "Copyright (C) 2002-10 by Bruce Allen, http://smartmontools.sourceforge.net\n"); if (!full) return info; @@ -105,19 +101,6 @@ std::string format_version_info(const ch "\n", prog_name ); - info += strprintf( - "smartmontools release "PACKAGE_VERSION - " dated "SMARTMONTOOLS_RELEASE_DATE" at "SMARTMONTOOLS_RELEASE_TIME"\n" - "smartmontools SVN rev "SMARTMONTOOLS_SVN_REV - " dated "SMARTMONTOOLS_SVN_DATE" at "SMARTMONTOOLS_SVN_TIME"\n" - "smartmontools build host: "SMARTMONTOOLS_BUILD_HOST"\n" - "smartmontools build configured: "SMARTMONTOOLS_CONFIGURE_DATE "\n" - "%s compile dated "__DATE__" at "__TIME__"\n" - "smartmontools configure arguments: ", - prog_name - ); - info += (sizeof(SMARTMONTOOLS_CONFIGURE_ARGS) > 1 ? - SMARTMONTOOLS_CONFIGURE_ARGS : "[no arguments given]"); info += '\n'; return info; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rfc for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package rfc for openSUSE:Factory checked in at Tue Sep 28 22:48:17 CEST 2010. -------- --- AUTO/all/rfc/rfc.changes 2010-09-27 13:43:17.000000000 +0200 +++ /mounts/work_src_done/STABLE/rfc/rfc.changes 2010-09-28 11:42:59.000000000 +0200 @@ -2 +2 @@ -Mon Sep 27 13:43:16 CEST 2010 - autobuild(a)suse.de +Tue Sep 28 11:42:59 CEST 2010 - autobuild(a)suse.de @@ -4 +4 @@ -- automated update on 2010-09-27 +- automated update on 2010-09-28 calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rfc.spec ++++++ --- /var/tmp/diff_new_pack.uy90xM/_old 2010-09-28 22:48:05.000000000 +0200 +++ /var/tmp/diff_new_pack.uy90xM/_new 2010-09-28 22:48:05.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rfc (Version 2010.9.27) +# spec file for package rfc (Version 2010.9.28) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -25,7 +25,7 @@ Summary: The RFCs (Request For Comments) Source: rfc.tgz BuildArch: noarch -Version: 2010.9.27 +Version: 2010.9.28 Release: 1 Url: ftp://ftp.isi.edu/in-notes BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ rfc.tgz ++++++ AUTO/all/rfc/rfc.tgz /mounts/work_src_done/STABLE/rfc/rfc.tgz differ: char 5, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rakudo for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package rakudo for openSUSE:Factory checked in at Tue Sep 28 22:47:54 CEST 2010. -------- --- rakudo/rakudo.changes 2010-08-27 15:17:50.000000000 +0200 +++ /mounts/work_src_done/STABLE/rakudo/rakudo.changes 2010-09-27 15:26:14.000000000 +0200 @@ -1,0 +2,9 @@ +Mon Sep 27 15:23:07 CEST 2010 - mls(a)suse.de + +- update to 2010.09 version + * the specification for temporal objects is now completely implemented + * several performance improvements were implemented + * the series operator has been refactored + * enumeration objects now conform much closer to the current spec + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- rakudo-2010.08.tar.bz2 New: ---- rakudo-2010.09.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rakudo.spec ++++++ --- /var/tmp/diff_new_pack.q1mtD8/_old 2010-09-28 22:47:48.000000000 +0200 +++ /var/tmp/diff_new_pack.q1mtD8/_new 2010-09-28 22:47:48.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package rakudo (Version 2010.08) +# spec file for package rakudo (Version 2010.09) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: rakudo -Version: 2010.08 +Version: 2010.09 Release: 1 Summary: Perl 6 implemenation that runs on Parrot License: Artistic 2.0 ++++++ rakudo-2010.08.tar.bz2 -> rakudo-2010.09.tar.bz2 ++++++ ++++ 7444 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit parrot for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package parrot for openSUSE:Factory checked in at Tue Sep 28 22:47:13 CEST 2010. -------- --- parrot/parrot.changes 2010-09-06 16:17:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/parrot/parrot.changes 2010-09-27 15:25:59.000000000 +0200 @@ -1,0 +2,9 @@ +Tue Sep 21 13:51:10 CEST 2010 - mls(a)suse.de + +- update to parrot-2.8.0 + * improved charset and string encoding + * inlined hashing and comparison functions + * implemented Exception clone vtable function + * command line argument "--gc-threshold" added + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- parrot-2.7.0.tar.bz2 New: ---- parrot-2.8.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ parrot.spec ++++++ --- /var/tmp/diff_new_pack.602nIt/_old 2010-09-28 22:45:35.000000000 +0200 +++ /var/tmp/diff_new_pack.602nIt/_new 2010-09-28 22:45:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package parrot (Version 2.7.0) +# spec file for package parrot (Version 2.8.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,9 +18,9 @@ Name: parrot -Version: 2.7.0 -Release: 2 -%define pversion 2_7_0 +Version: 2.8.0 +Release: 1 +%define pversion 2_8_0 Summary: Parrot Virtual Machine License: Artistic 2.0 Group: Development/Libraries ++++++ parrot-2.7.0.tar.bz2 -> parrot-2.8.0.tar.bz2 ++++++ ++++ 124392 lines of diff (skipped) ++++++ parrot.diff ++++++ --- /var/tmp/diff_new_pack.602nIt/_old 2010-09-28 22:45:37.000000000 +0200 +++ /var/tmp/diff_new_pack.602nIt/_new 2010-09-28 22:45:37.000000000 +0200 @@ -20,27 +20,3 @@ (size_t)current_regstore_top); #else /* !__ia64__ */ ---- ./tools/dev/pbc_to_exe.pir.orig 2010-08-06 11:23:31.000000000 +0000 -+++ ./tools/dev/pbc_to_exe.pir 2010-09-06 14:14:59.000000000 +0000 -@@ -521,10 +521,11 @@ END_OF_FUNCTION - .param int install :optional - - $P0 = '_config'() -- .local string cc, ccflags, cc_o_out, osname, build_dir, slash -+ .local string cc, ccflags, optimize, cc_o_out, osname, build_dir, slash - .local string installed, includepath, versiondir - cc = $P0['cc'] - ccflags = $P0['ccflags'] -+ optimize = $P0['optimize'] - cc_o_out = $P0['cc_o_out'] - osname = $P0['osname'] - build_dir = $P0['build_dir'] -@@ -558,6 +559,8 @@ END_OF_FUNCTION - compile .= pathquote - compile .= ' ' - compile .= ccflags -+ compile .= ' ' -+ compile .= optimize - compile .= ' -c ' - compile .= cfile - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit fuse for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package fuse for openSUSE:Factory checked in at Tue Sep 28 22:38:34 CEST 2010. -------- --- fuse/fuse.changes 2010-05-07 11:59:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/fuse/fuse.changes 2010-09-28 11:56:13.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 28 11:52:41 CEST 2010 - mszeredi(a)suse.cz + +- update to 2.8.5 + * fix option escaping for fusermount [bnc#641480] + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- fuse-2.8.4.tar.bz2 New: ---- fuse-2.8.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fuse.spec ++++++ --- /var/tmp/diff_new_pack.U4siG4/_old 2010-09-28 22:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U4siG4/_new 2010-09-28 22:38:06.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package fuse (Version 2.8.4) +# spec file for package fuse (Version 2.8.5) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,8 +20,8 @@ Name: fuse Summary: User space File System -Version: 2.8.4 -Release: 2 +Version: 2.8.5 +Release: 1 License: GPLv2+ ; LGPLv2.1+ Group: System/Filesystems # http://prdownloads.sourceforge.net/fuse/fuse-2.X/%{version}/fuse-%{version}… ++++++ fuse-2.8.4.tar.bz2 -> fuse-2.8.5.tar.bz2 ++++++ ++++ 2107 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/fuse-2.8.4/ChangeLog new/fuse-2.8.5/ChangeLog --- old/fuse-2.8.4/ChangeLog 2010-04-26 14:27:29.000000000 +0200 +++ new/fuse-2.8.5/ChangeLog 2010-09-28 10:24:13.000000000 +0200 @@ -1,3 +1,19 @@ +2010-09-28 Miklos Szeredi <miklos(a)szeredi.hu> + + * Released 2.8.5 + +2010-09-28 Miklos Szeredi <miklos(a)szeredi.hu> + + * Fix option escaping for fusermount. If the "fsname=" option + contained a comma then the option parser in fusermount was + confused (Novell bugzilla #641480). Fix by escaping commas when + passing them over to fusermount. Reported by Jan Engelhardt + +2010-05-10 Miklos Szeredi <miklos(a)szeredi.hu> + + * Remove "chmod root" from install of fusermount. Reported by + Lucas C. Villa Real + 2010-04-26 Miklos Szeredi <miklos(a)szeredi.hu> * Released 2.8.4 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/fuse-2.8.4/INSTALL new/fuse-2.8.5/INSTALL --- old/fuse-2.8.4/INSTALL 2010-04-26 14:23:31.000000000 +0200 +++ new/fuse-2.8.5/INSTALL 2010-09-28 11:23:54.000000000 +0200 @@ -4,8 +4,10 @@ Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. - This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. + Copying and distribution of this file, with or without modification, +are permitted in any medium without royalty provided the copyright +notice and this notice are preserved. This file is offered as-is, +without warranty of any kind. Basic Installation ================== @@ -13,7 +15,11 @@ Briefly, the shell commands `./configure; make; make install' should configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for -instructions specific to this package. +instructions specific to this package. Some packages provide this +`INSTALL' file but do not implement all of the features documented +below. The lack of an optional feature in a given package is not +necessarily a bug. More recommendations for GNU packages can be found +in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for various system-dependent variables used during compilation. It uses @@ -42,7 +48,7 @@ you want to change it or regenerate `configure' using a newer version of `autoconf'. -The simplest way to compile this package is: + The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type `./configure' to configure the package for your system. @@ -53,12 +59,22 @@ 2. Type `make' to compile the package. 3. Optionally, type `make check' to run any self-tests that come with - the package. + the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and - documentation. + documentation. When installing into a prefix owned by root, it is + recommended that the package be configured and built as a regular + user, and only the `make install' phase executed with root + privileges. + + 5. Optionally, type `make installcheck' to repeat any self-tests, but + this time using the binaries in their final installed location. + This target does not install anything. Running this target as a + regular user, particularly if the prior `make install' required + root privileges, verifies that the installation completed + correctly. - 5. You can remove the program binaries and object files from the + 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for a different kind of computer), type `make distclean'. There is @@ -67,8 +83,15 @@ all sorts of other programs in order to regenerate files that came with the distribution. - 6. Often, you can also type `make uninstall' to remove the installed - files again. + 7. Often, you can also type `make uninstall' to remove the installed + files again. In practice, not all packages have tested that + uninstallation works correctly, even though it is required by the + GNU Coding Standards. + + 8. Some packages, particularly those that use Automake, provide `make + distcheck', which can by used by developers to test that all other + targets like `make install' and `make uninstall' work correctly. + This target is generally not run by end users. Compilers and Options ===================== @@ -93,7 +116,8 @@ own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the -source code in the directory that `configure' is in and in `..'. +source code in the directory that `configure' is in and in `..'. This +is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one architecture at a time in the source code directory. After you have @@ -120,7 +144,8 @@ By default, `make install' installs the package's commands under `/usr/local/bin', include files under `/usr/local/include', etc. You can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. +`configure' the option `--prefix=PREFIX', where PREFIX must be an +absolute file name. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you @@ -131,15 +156,46 @@ In addition, if you use an unusual directory layout you can give options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. +you can set and what kinds of files go in them. In general, the +default for these options is expressed in terms of `${prefix}', so that +specifying just `--prefix' will affect all of the other directory +specifications that were not explicitly provided. + + The most portable way to affect installation locations is to pass the +correct locations to `configure'; however, many packages provide one or +both of the following shortcuts of passing variable assignments to the +`make install' command line to change installation locations without +having to reconfigure or recompile. + + The first method involves providing an override variable for each +affected directory. For example, `make install +prefix=/alternate/directory' will choose an alternate location for all +directory configuration variables that were expressed in terms of +`${prefix}'. Any directories that were specified during `configure', +but not in terms of `${prefix}', must each be overridden at install +time for the entire installation to be relocated. The approach of +makefile variable overrides for each directory variable is required by +the GNU Coding Standards, and ideally causes no recompilation. +However, some platforms have known limitations with the semantics of +shared libraries that end up requiring recompilation when using this +method, particularly noticeable in packages that use GNU Libtool. + + The second method involves providing the `DESTDIR' variable. For +example, `make install DESTDIR=/alternate/directory' will prepend +`/alternate/directory' before all installation names. The approach of +`DESTDIR' overrides is not required by the GNU Coding Standards, and +does not work on platforms that have drive letters. On the other hand, +it does better at avoiding recompilation issues, and works well even +when some directory options were not specified in terms of `${prefix}' +at `configure' time. + +Optional Features +================= If the package supports it, you can cause programs to be installed with an extra prefix or suffix on their names by giving `configure' the option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. -Optional Features -================= - Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE @@ -152,6 +208,13 @@ you can use the `configure' options `--x-includes=DIR' and `--x-libraries=DIR' to specify their locations. + Some packages offer the ability to configure how verbose the +execution of `make' will be. For these packages, running `./configure +--enable-silent-rules' sets the default to minimal output, which can be +overridden with `make V=1'; while running `./configure +--disable-silent-rules' sets the default to verbose, which can be +overridden with `make V=0'. + Particular systems ================== @@ -288,7 +351,7 @@ `configure' can determine that directory automatically. `--prefix=DIR' - Use DIR as the installation prefix. *Note Installation Names:: + Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. 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/fuse-2.8.4/compile new/fuse-2.8.5/compile --- old/fuse-2.8.4/compile 2010-04-26 14:23:30.000000000 +0200 +++ new/fuse-2.8.5/compile 2010-09-28 11:23:53.000000000 +0200 @@ -1,7 +1,7 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2009-04-28.21; # UTC +scriptversion=2009-10-06.20; # UTC # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software # Foundation, Inc. @@ -124,9 +124,9 @@ ret=$? if test -f "$cofile"; then - mv "$cofile" "$ofile" + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" elif test -f "${cofile}bj"; then - mv "${cofile}bj" "$ofile" + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" fi rmdir "$lockdir" 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/fuse-2.8.4/config.rpath new/fuse-2.8.5/config.rpath --- old/fuse-2.8.4/config.rpath 2010-04-26 14:23:19.000000000 +0200 +++ new/fuse-2.8.5/config.rpath 2010-09-28 11:23:42.000000000 +0200 @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2007 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996 # @@ -47,7 +47,7 @@ done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ ;; esac ;; - mingw* | cygwin* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -76,7 +76,13 @@ ;; linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -124,7 +130,7 @@ esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -132,7 +138,7 @@ hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -158,7 +164,7 @@ # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -182,7 +188,7 @@ ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -254,7 +260,7 @@ hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -264,7 +270,7 @@ # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -326,7 +332,7 @@ ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -494,7 +500,7 @@ fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. # Unlike libtool.m4, here we don't care about _all_ names of the library, but # only about the one the linker finds when passed -lNAME. This is the last # element of library_names_spec in libtool.m4, or possibly two of them if the @@ -505,7 +511,7 @@ aix3*) library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) library_names_spec='$libname$shrext' ;; amigaos*) @@ -517,7 +523,7 @@ bsdi[45]*) library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll library_names_spec='$libname.dll.a $libname.lib' ;; 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/fuse-2.8.4/configure.in new/fuse-2.8.5/configure.in --- old/fuse-2.8.4/configure.in 2010-04-26 14:20:20.000000000 +0200 +++ new/fuse-2.8.5/configure.in 2010-09-28 11:23:20.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT(fuse, 2.8.4) +AC_INIT(fuse, 2.8.5) AC_CONFIG_MACRO_DIR([m4]) AC_CANONICAL_TARGET AM_INIT_AUTOMAKE 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/fuse-2.8.4/lib/Makefile.am new/fuse-2.8.5/lib/Makefile.am --- old/fuse-2.8.4/lib/Makefile.am 2010-04-26 14:21:18.000000000 +0200 +++ new/fuse-2.8.5/lib/Makefile.am 2010-09-28 11:23:33.000000000 +0200 @@ -35,7 +35,7 @@ $(iconv_source) \ $(mount_source) -libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:4 \ +libfuse_la_LDFLAGS = @libfuse_libs@ -version-number 2:8:5 \ -Wl,--version-script,$(srcdir)/fuse_versionscript libulockmgr_la_SOURCES = ulockmgr.c 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/fuse-2.8.4/lib/mount.c new/fuse-2.8.5/lib/mount.c --- old/fuse-2.8.4/lib/mount.c 2010-04-26 14:11:30.000000000 +0200 +++ new/fuse-2.8.5/lib/mount.c 2010-09-28 10:04:13.000000000 +0200 @@ -200,7 +200,7 @@ return fuse_opt_add_opt(&mo->kernel_opts, arg); case KEY_FUSERMOUNT_OPT: - return fuse_opt_add_opt(&mo->fusermount_opts, arg); + return fuse_opt_add_opt_escaped(&mo->fusermount_opts, arg); case KEY_SUBTYPE_OPT: return fuse_opt_add_opt(&mo->subtype_opt, arg); 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/fuse-2.8.4/util/Makefile.am new/fuse-2.8.5/util/Makefile.am --- old/fuse-2.8.4/util/Makefile.am 2009-05-08 14:01:59.000000000 +0200 +++ new/fuse-2.8.5/util/Makefile.am 2010-09-28 10:03:09.000000000 +0200 @@ -14,7 +14,6 @@ ulockmgr_server_LDFLAGS = -pthread install-exec-hook: - -chown root $(DESTDIR)$(bindir)/fusermount -chmod u+s $(DESTDIR)$(bindir)/fusermount @if test ! -e $(DESTDIR)/dev/fuse; then \ $(mkdir_p) $(DESTDIR)/dev; \ 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/fuse-2.8.4/util/fusermount.c new/fuse-2.8.5/util/fusermount.c --- old/fuse-2.8.4/util/fusermount.c 2010-04-26 14:15:36.000000000 +0200 +++ new/fuse-2.8.5/util/fusermount.c 2010-09-28 10:04:13.000000000 +0200 @@ -649,7 +649,9 @@ static int get_string_opt(const char *s, unsigned len, const char *opt, char **val) { + int i; unsigned opt_len = strlen(opt); + char *d; if (*val) free(*val); @@ -659,8 +661,15 @@ return 0; } - memcpy(*val, s + opt_len, len - opt_len); - (*val)[len - opt_len] = '\0'; + d = *val; + s += opt_len; + len -= opt_len; + for (i = 0; i < len; i++) { + if (s[i] == '\\' && i + 1 < len) + i++; + *d++ = s[i]; + } + *d = '\0'; return 1; } @@ -691,7 +700,12 @@ unsigned len; const char *fsname_str = "fsname="; const char *subtype_str = "subtype="; - for (len = 0; s[len] && s[len] != ','; len++); + for (len = 0; s[len]; len++) { + if (s[len] == '\\' && s[len + 1]) + len++; + else if (s[len] == ',') + break; + } if (begins_with(s, fsname_str)) { if (!get_string_opt(s, len, fsname_str, &fsname)) goto err; ++++++ fuse-install-fix.diff ++++++ --- /var/tmp/diff_new_pack.U4siG4/_old 2010-09-28 22:38:06.000000000 +0200 +++ /var/tmp/diff_new_pack.U4siG4/_new 2010-09-28 22:38:06.000000000 +0200 @@ -1,10 +1,9 @@ ---- util/Makefile.in.orig 2009-09-07 00:26:57.000000000 +0200 -+++ util/Makefile.in 2009-09-07 00:27:50.000000000 +0200 -@@ -541,27 +541,14 @@ +--- util/Makefile.in.orig 2010-09-28 11:23:54.000000000 +0200 ++++ util/Makefile.in 2010-09-28 11:59:48.000000000 +0200 +@@ -583,26 +583,14 @@ uninstall-am: uninstall-binPROGRAMS unin install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -28,14 +27,13 @@ uninstall-local: rm -f $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse ---- util/Makefile.am.orig 2009-09-07 00:26:13.000000000 +0200 -+++ util/Makefile.am 2009-09-07 00:27:36.000000000 +0200 -@@ -13,15 +13,6 @@ +--- util/Makefile.am.orig 2010-09-28 10:03:09.000000000 +0200 ++++ util/Makefile.am 2010-09-28 11:59:48.000000000 +0200 +@@ -13,14 +13,6 @@ ulockmgr_server_SOURCES = ulockmgr_serve ulockmgr_server_CPPFLAGS = -D_FILE_OFFSET_BITS=64 -D_REENTRANT ulockmgr_server_LDFLAGS = -pthread -install-exec-hook: -- -chown root $(DESTDIR)$(bindir)/fusermount - -chmod u+s $(DESTDIR)$(bindir)/fusermount - @if test ! -e $(DESTDIR)/dev/fuse; then \ - $(mkdir_p) $(DESTDIR)/dev; \ @@ -46,7 +44,7 @@ EXTRA_DIST = udev.rules init_script MOUNT_FUSE_PATH = @MOUNT_FUSE_PATH@ -@@ -33,14 +24,8 @@ +@@ -32,14 +24,8 @@ install-exec-local: $(INSTALL_PROGRAM) $(srcdir)/mount.fuse $(DESTDIR)$(MOUNT_FUSE_PATH)/mount.fuse $(mkdir_p) $(DESTDIR)$(INIT_D_PATH) $(INSTALL_SCRIPT) $(srcdir)/init_script $(DESTDIR)$(INIT_D_PATH)/fuse ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit bundle-lang-common for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package bundle-lang-common for openSUSE:Factory checked in at Tue Sep 28 22:37:36 CEST 2010. -------- --- bundle-lang-common/bundle-lang-common.changes 2010-09-07 10:09:21.000000000 +0200 +++ /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-common.changes 2010-09-28 11:01:26.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 09:00:54 UTC 2010 - coolo(a)novell.com + +- update package list after factory updates + +------------------------------------------------------------------- bundle-lang-gnome-extras.changes: same change bundle-lang-gnome.changes: same change bundle-lang-kde.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ bundle-lang-common.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:12.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-common -BuildRequires: PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang +BuildRequires: PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang wdiff-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 16 +Release: 17 Summary: Translations for a Group of Programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -63,6 +63,8 @@ Provides: locale(gdk-pixbuf:en) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:en) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:en) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:en) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -95,6 +97,8 @@ Provides: locale(upower:en) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:en) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:en) %description en This package groups translations for a dozen of programs which are both @@ -121,6 +125,8 @@ Provides: locale(gdk-pixbuf:de) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:de) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:de) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:de) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -153,6 +159,8 @@ Provides: locale(upower:de) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:de) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:de) %description de This package groups translations for a dozen of programs which are both @@ -179,6 +187,8 @@ Provides: locale(gdk-pixbuf:es) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:es) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:es) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:es) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -211,6 +221,8 @@ Provides: locale(upower:es) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:es) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:es) %description es This package groups translations for a dozen of programs which are both @@ -237,6 +249,8 @@ Provides: locale(gdk-pixbuf:it) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:it) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:it) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:it) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -269,6 +283,8 @@ Provides: locale(upower:it) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:it) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:it) %description it This package groups translations for a dozen of programs which are both @@ -295,6 +311,8 @@ Provides: locale(gdk-pixbuf:fr) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:fr) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:fr) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:fr) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -327,6 +345,8 @@ Provides: locale(upower:fr) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:fr) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:fr) %description fr This package groups translations for a dozen of programs which are both @@ -353,6 +373,8 @@ Provides: locale(gdk-pixbuf:ja) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ja) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ja) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ja) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -385,6 +407,8 @@ Provides: locale(upower:ja) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ja) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ja) %description ja This package groups translations for a dozen of programs which are both @@ -411,6 +435,8 @@ Provides: locale(gdk-pixbuf:zh) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:zh) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:zh) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:zh) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -443,6 +469,8 @@ Provides: locale(upower:zh) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:zh) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:zh) %description zh This package groups translations for a dozen of programs which are both @@ -469,6 +497,8 @@ Provides: locale(gdk-pixbuf:nl) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:nl) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:nl) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:nl) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -501,6 +531,8 @@ Provides: locale(upower:nl) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:nl) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:nl) %description nl This package groups translations for a dozen of programs which are both @@ -527,6 +559,8 @@ Provides: locale(gdk-pixbuf:cs) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:cs) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:cs) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:cs) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -559,6 +593,8 @@ Provides: locale(upower:cs) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:cs) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:cs) %description cs This package groups translations for a dozen of programs which are both @@ -593,6 +629,9 @@ Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:pt) Provides: locale(gimp:pt_BR) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:pt) +Provides: locale(glib-networking:pt_BR) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:pt) Provides: locale(glib2:pt_BR) @@ -641,6 +680,9 @@ Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:pt) Provides: locale(util-linux:pt_BR) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:pt) +Provides: locale(wdiff:pt_BR) %description pt This package groups translations for a dozen of programs which are both @@ -667,6 +709,8 @@ Provides: locale(gdk-pixbuf:pl) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:pl) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:pl) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:pl) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -699,6 +743,8 @@ Provides: locale(upower:pl) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:pl) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:pl) %description pl This package groups translations for a dozen of programs which are both @@ -725,6 +771,8 @@ Provides: locale(gdk-pixbuf:ca) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ca) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ca) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ca) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -757,6 +805,8 @@ Provides: locale(upower:ca) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ca) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ca) %description ca This package groups translations for a dozen of programs which are both @@ -783,6 +833,8 @@ Provides: locale(gdk-pixbuf:ar) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ar) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ar) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ar) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -815,6 +867,8 @@ Provides: locale(upower:ar) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ar) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ar) %description ar This package groups translations for a dozen of programs which are both @@ -841,6 +895,8 @@ Provides: locale(gdk-pixbuf:hu) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:hu) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:hu) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:hu) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -873,6 +929,8 @@ Provides: locale(upower:hu) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:hu) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:hu) %description hu This package groups translations for a dozen of programs which are both @@ -899,6 +957,8 @@ Provides: locale(gdk-pixbuf:ko) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ko) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ko) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ko) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -931,6 +991,8 @@ Provides: locale(upower:ko) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ko) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ko) %description ko This package groups translations for a dozen of programs which are both @@ -957,6 +1019,8 @@ Provides: locale(gdk-pixbuf:da) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:da) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:da) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:da) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -989,6 +1053,8 @@ Provides: locale(upower:da) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:da) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:da) %description da This package groups translations for a dozen of programs which are both @@ -1015,6 +1081,8 @@ Provides: locale(gdk-pixbuf:sv) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:sv) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:sv) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:sv) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1047,6 +1115,8 @@ Provides: locale(upower:sv) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:sv) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:sv) %description sv This package groups translations for a dozen of programs which are both @@ -1073,6 +1143,8 @@ Provides: locale(gdk-pixbuf:ru) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:ru) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:ru) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:ru) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1105,6 +1177,8 @@ Provides: locale(upower:ru) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:ru) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:ru) %description ru This package groups translations for a dozen of programs which are both @@ -1131,6 +1205,8 @@ Provides: locale(gdk-pixbuf:fi) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:fi) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:fi) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:fi) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1163,6 +1239,8 @@ Provides: locale(upower:fi) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:fi) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:fi) %description fi This package groups translations for a dozen of programs which are both @@ -1189,6 +1267,8 @@ Provides: locale(gdk-pixbuf:nb) Provides: gimp-lang = %(rpm -q --queryformat '%{VERSION}' gimp-lang) Provides: locale(gimp:nb) +Provides: glib-networking-lang = %(rpm -q --queryformat '%{VERSION}' glib-networking-lang) +Provides: locale(glib-networking:nb) Provides: glib2-lang = %(rpm -q --queryformat '%{VERSION}' glib2-lang) Provides: locale(glib2:nb) Provides: gnome-keyring-lang = %(rpm -q --queryformat '%{VERSION}' gnome-keyring-lang) @@ -1221,6 +1301,8 @@ Provides: locale(upower:nb) Provides: util-linux-lang = %(rpm -q --queryformat '%{VERSION}' util-linux-lang) Provides: locale(util-linux:nb) +Provides: wdiff-lang = %(rpm -q --queryformat '%{VERSION}' wdiff-lang) +Provides: locale(wdiff:nb) %description nb This package groups translations for a dozen of programs which are both @@ -1234,7 +1316,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang +bash %SOURCE0 PackageKit-lang avahi-lang bash-lang coreutils-lang cpio-lang gconf2-lang gdk-pixbuf-lang gimp-lang glib-networking-lang glib2-lang gnome-keyring-lang gnome-vfs2-lang gpg2-lang gstreamer-0_10-lang gstreamer-0_10-plugins-base-lang gtk2-lang libgphoto2-lang libwnck-lang login-lang mc-lang notification-daemon-lang polkit-gnome-lang tar-lang upower-lang util-linux-lang wdiff-lang if test common = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-gnome-extras.spec ++++++ ++++ 2303 lines (skipped) ++++ between bundle-lang-common/bundle-lang-gnome-extras.spec ++++ and /mounts/work_src_done/STABLE/bundle-lang-common/bundle-lang-gnome-extras.spec ++++++ bundle-lang-gnome.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:12.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:12.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-gnome -BuildRequires: aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang +BuildRequires: PolicyKit-gnome-lang aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop2-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 16 +Release: 17 Summary: Translations for many GNOME programs BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -45,6 +45,8 @@ License: MIT License (or similar) Summary: English translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:en) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:en) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -99,8 +101,8 @@ Provides: locale(gnome-bluetooth:en) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:en) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:en) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:en) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:en) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -271,6 +273,8 @@ License: MIT License (or similar) Summary: German translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:de) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:de) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -325,8 +329,8 @@ Provides: locale(gnome-bluetooth:de) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:de) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:de) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:de) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:de) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -497,6 +501,8 @@ License: GPLv2+ Summary: Spanish translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:es) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:es) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -551,8 +557,8 @@ Provides: locale(gnome-bluetooth:es) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:es) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:es) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:es) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:es) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -723,6 +729,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:it) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:it) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -777,8 +785,8 @@ Provides: locale(gnome-bluetooth:it) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:it) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:it) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:it) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:it) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -949,6 +957,8 @@ License: GPLv2+ Summary: French translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:fr) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:fr) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1003,8 +1013,8 @@ Provides: locale(gnome-bluetooth:fr) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:fr) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:fr) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:fr) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:fr) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1175,6 +1185,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ja) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ja) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1229,8 +1241,8 @@ Provides: locale(gnome-bluetooth:ja) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ja) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ja) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ja) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ja) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1401,6 +1413,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:zh) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:zh) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1455,8 +1469,8 @@ Provides: locale(gnome-bluetooth:zh) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:zh) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:zh) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:zh) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:zh) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1627,6 +1641,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:nl) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:nl) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1681,8 +1697,8 @@ Provides: locale(gnome-bluetooth:nl) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:nl) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:nl) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:nl) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:nl) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -1853,6 +1869,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:cs) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:cs) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -1907,8 +1925,8 @@ Provides: locale(gnome-bluetooth:cs) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:cs) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:cs) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:cs) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:cs) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2079,6 +2097,9 @@ License: GPLv2+ Summary: Portuguese translations for a many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:pt) +Provides: locale(PolicyKit-gnome:pt_BR) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:pt) Provides: locale(aisleriot:pt_BR) @@ -2160,9 +2181,9 @@ Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:pt) Provides: locale(gnome-control-center:pt_BR) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:pt) -Provides: locale(gnome-desktop:pt_BR) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:pt) +Provides: locale(gnome-desktop2:pt_BR) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:pt) Provides: locale(gnome-do:pt_BR) @@ -2414,6 +2435,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:pl) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:pl) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2468,8 +2491,8 @@ Provides: locale(gnome-bluetooth:pl) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:pl) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:pl) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:pl) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:pl) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2640,6 +2663,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ca) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ca) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2694,8 +2719,8 @@ Provides: locale(gnome-bluetooth:ca) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ca) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ca) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ca) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ca) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -2866,6 +2891,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ar) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ar) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -2920,8 +2947,8 @@ Provides: locale(gnome-bluetooth:ar) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ar) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ar) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ar) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ar) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3092,6 +3119,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:hu) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:hu) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3146,8 +3175,8 @@ Provides: locale(gnome-bluetooth:hu) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:hu) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:hu) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:hu) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:hu) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3318,6 +3347,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ko) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ko) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3372,8 +3403,8 @@ Provides: locale(gnome-bluetooth:ko) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ko) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ko) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ko) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ko) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3544,6 +3575,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:da) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:da) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3598,8 +3631,8 @@ Provides: locale(gnome-bluetooth:da) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:da) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:da) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:da) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:da) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3770,6 +3803,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:sv) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:sv) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -3824,8 +3859,8 @@ Provides: locale(gnome-bluetooth:sv) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:sv) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:sv) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:sv) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:sv) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -3996,6 +4031,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:ru) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:ru) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4050,8 +4087,8 @@ Provides: locale(gnome-bluetooth:ru) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:ru) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:ru) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:ru) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:ru) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4222,6 +4259,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:fi) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:fi) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4276,8 +4315,8 @@ Provides: locale(gnome-bluetooth:fi) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:fi) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:fi) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:fi) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:fi) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4448,6 +4487,8 @@ License: MIT License (or similar) Summary: Translations for many GNOME programs Group: System/Localization +Provides: PolicyKit-gnome-lang = %(rpm -q --queryformat '%{VERSION}' PolicyKit-gnome-lang) +Provides: locale(PolicyKit-gnome:nb) Provides: aisleriot-lang = %(rpm -q --queryformat '%{VERSION}' aisleriot-lang) Provides: locale(aisleriot:nb) Provides: alacarte-lang = %(rpm -q --queryformat '%{VERSION}' alacarte-lang) @@ -4502,8 +4543,8 @@ Provides: locale(gnome-bluetooth:nb) Provides: gnome-control-center-lang = %(rpm -q --queryformat '%{VERSION}' gnome-control-center-lang) Provides: locale(gnome-control-center:nb) -Provides: gnome-desktop-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop-lang) -Provides: locale(gnome-desktop:nb) +Provides: gnome-desktop2-lang = %(rpm -q --queryformat '%{VERSION}' gnome-desktop2-lang) +Provides: locale(gnome-desktop2:nb) Provides: gnome-do-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-lang) Provides: locale(gnome-do:nb) Provides: gnome-do-plugins-lang = %(rpm -q --queryformat '%{VERSION}' gnome-do-plugins-lang) @@ -4677,7 +4718,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang +bash %SOURCE0 PolicyKit-gnome-lang aisleriot-lang alacarte-lang at-spi-lang banshee-1-lang brasero-lang bug-buddy-lang cheese-lang clutter-lang compiz-lang dasher-lang deskbar-applet-lang ekiga-lang empathy-lang eog-lang evince-lang evolution-data-server-lang f-spot-lang file-roller-lang gcalctool-lang gconf-editor-lang gdm-lang gedit-lang gftp-common-lang glchess-lang gnome-applets-lang gnome-bluetooth-lang gnome-control-center-lang gnome-desktop2-lang gnome-do-lang gnome-do-plugins-lang gnome-doc-utils-lang gnome-games-support-lang gnome-mag-lang gnome-main-menu-lang gnome-media-lang gnome-menus-lang gnome-nettool-lang gnome-packagekit-lang gnome-panel-lang gnome-phone-manager-lang gnome-power-manager-lang gnome-screensaver-lang gnome-session-lang gnome-settings-daemon-lang gnome-sudoku-lang gnome-system-monitor-lang gnome-terminal-lang gnome-user-docs-lang gnome-user-share-lang gnome-utils-lang gnome-web-photo-lang gnomine-lang gstreamer-0_10-plugins-bad-lang gstreamer-0_10-plugins-good-lang gtk2-engines-lang gtkhtml2-lang gtksourceview-lang gtkspell-lang gucharmap-lang gvfs-lang iagno-lang libbonobo-lang libbonoboui-lang libepc-lang libgdata-lang libgdu-lang libgnome-keyring-lang libgnome-lang libgnomecanvas-lang libgnomecups-lang libgnomekbd-lang libgnomeprint-lang libgnomeprintui-lang libgnomesu-lang libgnomeui-lang libgtop-lang libgweather-lang libiptcdata-lang libpurple-lang libslab-lang libwebkitgtk2-lang liferea-lang lightsoff-lang mahjongg-lang metacity-lang mousetweaks-lang nautilus-lang nautilus-open-terminal-lang nautilus-sendto-lang nautilus-share-lang orca-lang pulseaudio-lang quadrapassel-lang seahorse-lang seahorse-plugins-lang swell-foop-lang system-config-printer-lang tasque-lang tomboy-lang totem-lang totem-pl-parser-lang tracker-lang transmission-common-lang vino-lang vte-lang xchat-lang xdg-user-dirs-gtk-lang yelp-lang zenity-lang if test gnome = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-kde.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -20,13 +20,13 @@ #!BuildIgnore: gimp-unstable Name: bundle-lang-kde -BuildRequires: NetworkManager-kde4-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang +BuildRequires: NetworkManager-kde4-libs-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang BuildRequires: fdupes #!BuildIgnore: xorg-x11-driver-input License: MIT License (or similar) Group: System/Localization Version: 11.3 -Release: 12 +Release: 13 Summary: Translations for a group of KDE applications BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -61,6 +61,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:en) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:en) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:en) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -97,6 +99,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:de) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:de) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:de) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -133,6 +137,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:es) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:es) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:es) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -169,6 +175,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:it) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:it) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:it) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -205,6 +213,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:fr) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:fr) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:fr) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -241,6 +251,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ja) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ja) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ja) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -277,6 +289,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:zh) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:zh) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:zh) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -313,6 +327,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:nl) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:nl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:nl) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -349,6 +365,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:cs) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:cs) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:cs) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -386,6 +404,9 @@ Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:pt) Provides: locale(NetworkManager-kde4-libs:pt_BR) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:pt) +Provides: locale(ggz-client-libs:pt_BR) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:pt) Provides: locale(k3b:pt_BR) @@ -428,6 +449,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:pl) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:pl) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:pl) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -464,6 +487,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ca) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ca) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ca) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -500,6 +525,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ar) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ar) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ar) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -536,6 +563,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:hu) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:hu) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:hu) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -572,6 +601,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ko) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ko) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ko) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -608,6 +639,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:da) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:da) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:da) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -644,6 +677,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:sv) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:sv) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:sv) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -680,6 +715,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:ru) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:ru) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:ru) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -716,6 +753,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:fi) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:fi) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:fi) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -752,6 +791,8 @@ Group: System/Localization Provides: NetworkManager-kde4-libs-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-kde4-libs-lang) Provides: locale(NetworkManager-kde4-libs:nb) +Provides: ggz-client-libs-lang = %(rpm -q --queryformat '%{VERSION}' ggz-client-libs-lang) +Provides: locale(ggz-client-libs:nb) Provides: k3b-lang = %(rpm -q --queryformat '%{VERSION}' k3b-lang) Provides: locale(k3b:nb) Provides: kdebase4-openSUSE-lang = %(rpm -q --queryformat '%{VERSION}' kdebase4-openSUSE-lang) @@ -789,7 +830,7 @@ %install mkdir -p $RPM_BUILD_ROOT cp %SOURCE1 . -bash %SOURCE0 NetworkManager-kde4-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang +bash %SOURCE0 NetworkManager-kde4-libs-lang ggz-client-libs-lang k3b-lang kdebase4-openSUSE-lang kipi-plugins-lang konversation-lang ktorrent-lang libktorrent2-lang if test kde = kde; then # pretty evil hack to keep the symlinks working ++++++ bundle-lang-other.spec ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -22,7 +22,7 @@ License: MIT License (or similar) Group: System/GUI/KDE Version: 11.2 -Release: 35 +Release: 36 Summary: Translations for languages not covered by one of the bundle-lang-*-* packages BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch ++++++ packages.txt ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -1,11 +1,14 @@ NetworkManager-kde4-libs-lang kde PackageKit-lang common +PolicyKit-gnome-lang gnome accerciser-lang gnome-extras aisleriot-lang gnome alacarte-lang gnome +alarm-clock-applet-lang gnome-extras anjuta-extras-lang gnome-extras anjuta-lang gnome-extras aqbanking-lang gnome-extras +arista-lang gnome-extras at-spi-lang gnome at-spi2-atk-lang gnome-extras atk-lang gnome-extras @@ -18,6 +21,7 @@ bug-buddy-lang gnome byzanz-lang gnome-extras cheese-lang gnome +cherrytree-lang gnome-extras claws-mail-extra-plugins-lang gnome-extras claws-mail-lang gnome-extras clutter-lang gnome @@ -33,6 +37,7 @@ deskbar-applet-lang gnome devhelp-lang gnome-extras dia-lang gnome-extras +drapes-lang gnome-extras eiciel-lang gnome-extras ekiga-lang gnome empathy-lang gnome @@ -55,10 +60,12 @@ gdl-lang gnome-extras gdm-lang gnome geany-lang gnome-extras +geany-plugins-lang gnome-extras gedit-lang gnome gedit-plugins-lang gnome-extras genius-lang gnome-extras gftp-common-lang gnome +ggz-client-libs-lang kde ghex-lang gnome-extras giggle-lang gnome-extras gimp-gap-lang gnome-extras @@ -67,6 +74,7 @@ glabels-lang gnome-extras glade3-lang gnome-extras glchess-lang gnome +glib-networking-lang common glib2-lang common glines-lang gnome-extras gnac-lang gnome-extras @@ -81,7 +89,8 @@ gnome-color-manager-lang gnome-extras gnome-commander-lang gnome-extras gnome-control-center-lang gnome -gnome-desktop-lang gnome +gnome-desktop-lang gnome-extras +gnome-desktop2-lang gnome gnome-devel-docs-lang gnome-extras gnome-do-lang gnome gnome-do-plugins-lang gnome @@ -103,6 +112,7 @@ gnome-power-manager-lang gnome gnome-reset-lang gnome-extras gnome-screensaver-lang gnome +gnome-search-tool-lang gnome-extras gnome-session-lang gnome gnome-settings-daemon-lang gnome gnome-shell-lang gnome-extras @@ -161,6 +171,7 @@ kdebase4-openSUSE-lang kde kipi-plugins-lang kde konversation-lang kde +krb5-auth-dialog-lang gnome-extras ktorrent-lang kde last-exit-lang gnome-extras libbonobo-lang gnome @@ -196,6 +207,7 @@ lightsoff-lang gnome login-lang common mahjongg-lang gnome +mail-notification-lang gnome-extras mc-lang common meld-lang gnome-extras memprof-lang gnome-extras @@ -213,8 +225,10 @@ obby-lang gnome-extras orca-lang gnome pan-lang gnome-extras +pango-module-thai-lang gnome-extras pessulus-lang gnome-extras pino-lang gnome-extras +planner-lang gnome-extras polkit-gnome-lang common pulseaudio-lang gnome quadrapassel-lang gnome @@ -224,6 +238,7 @@ scrollkeeper-lang gnome-extras seahorse-lang gnome seahorse-plugins-lang gnome +shotwell-lang gnome-extras simple-scan-lang gnome-extras sound-juicer-lang gnome-extras sparkleshare-lang gnome-extras @@ -242,9 +257,11 @@ twitux-lang gnome-extras upower-lang common util-linux-lang common +vboxgtk-lang gnome-extras vinagre-lang gnome-extras vino-lang gnome vte-lang gnome +wdiff-lang common xchat-gnome-lang gnome-extras xchat-lang gnome xdg-user-dirs-gtk-lang gnome ++++++ update-gnome-extras.sh ++++++ --- /var/tmp/diff_new_pack.CJUJAV/_old 2010-09-28 22:37:13.000000000 +0200 +++ /var/tmp/diff_new_pack.CJUJAV/_new 2010-09-28 22:37:13.000000000 +0200 @@ -44,7 +44,7 @@ LANG=C sort -u -o $PACKAGESFILE $PACKAGESFILE.new -for pack in pango-module-thai-lang alarm-clock-applet-lang drapes-lang geany-plugins-lang krb5-auth-dialog-lang libpeas-lang mail-notification-lang yelp-xsl-lang deja-dup-lang pdfmod-lang konqueror-plugins-lang cherrytree-lang glib-networking-lang shotwell-lang planner-lang; do +for pack in pitivi-lang konqueror-plugins-lang libpeas-lang yelp-xsl-lang pdfmod-lang duplicity-lang deja-dup-lang; do grep -v "^$pack " $PACKAGESFILE > $PACKAGESFILE.new && mv $PACKAGESFILE.new $PACKAGESFILE done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit at for openSUSE:Factory
by root＠hilbert.suse.de 28 Sep '10

28 Sep '10

Hello community, here is the log from the commit of package at for openSUSE:Factory checked in at Tue Sep 28 22:34:11 CEST 2010. -------- --- at/at.changes 2010-07-20 22:30:12.000000000 +0200 +++ /mounts/work_src_done/STABLE/at/at.changes 2010-09-28 06:31:06.000000000 +0200 @@ -1,0 +2,5 @@ +Tue Sep 28 04:53:33 UTC 2010 - cristian.rodriguez(a)opensuse.org + +- /etc/at.deny has wrong account name [bnc#632250] + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- at-3.1.8-denylist.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ at.spec ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -26,7 +26,7 @@ Group: System/Daemons AutoReqProv: on Version: 3.1.8 -Release: 1079 +Release: 1086 Summary: A Job Manager Source: at_3.1.8-11.tar.gz Source1: atd.init @@ -52,6 +52,8 @@ Patch14: %{name}-%{version}-pam-session-as-root.patch # PATCH-FIX-UPSTRAM clean-up opened descriptors (bnc#533454, bnc#523346) Patch15: %{name}-%{version}-leak-fix.patch +#PATCH_FIX-OPENSUSE add proper system users to the deny list +Patch16: at-3.1.8-denylist.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq Recommends: smtp_daemon @@ -84,8 +86,9 @@ %patch11 %patch12 %patch13 -%patch14 -p1 +%patch14 %patch15 +%patch16 %build %{?suse_update_config:%{suse_update_config -f}} ++++++ at-3.1.8-bison.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- parsetime.y +--- parsetime.y.orig +++ parsetime.y -@@ -63,6 +63,7 @@ +@@ -63,6 +63,7 @@ now : NOW time_or_not : time | @@ -8,7 +8,7 @@ time : hr24clock_hr_min | hr24clock_hr_min timezone_name -@@ -112,6 +113,7 @@ +@@ -112,6 +113,7 @@ date : month_name day_number inc_or_dec : increment | decrement @@ -16,7 +16,7 @@ increment : '+' inc_number inc_period { -@@ -288,6 +290,8 @@ +@@ -287,6 +289,8 @@ month_number : INT free($1); } } ++++++ at-3.1.8-cleanup_perm.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- panic.c +--- panic.c.orig +++ panic.c -@@ -58,8 +58,11 @@ +@@ -58,8 +58,11 @@ panic(char *a) /* Something fatal has happened, print error message and exit. */ fprintf(stderr, "%s: %s\n", namep, a); ++++++ at-3.1.8-delete_r.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ at, batch, atq, atrm \- queue, examine o .IR queue ] .RB [ -f .IR file ] @@ -9,7 +9,7 @@ .B TIME .br .B "at -c" -@@ -219,8 +219,8 @@ +@@ -219,8 +219,8 @@ rather than standard input. Is an alias for .B atq. .TP @@ -20,9 +20,9 @@ .B atrm. .TP .TP ---- at.c +--- at.c.orig +++ at.c -@@ -692,7 +692,7 @@ +@@ -692,7 +692,7 @@ main(int argc, char **argv) char *pgm; int program = AT; /* our default program */ @@ -31,7 +31,7 @@ int disp_version = 0; time_t timer; struct passwd *pwe; -@@ -765,6 +765,7 @@ +@@ -765,6 +765,7 @@ main(int argc, char **argv) break; case 'd': @@ -39,9 +39,9 @@ if (program != AT) usage(); ---- panic.c +--- panic.c.orig +++ panic.c -@@ -92,6 +92,7 @@ +@@ -92,6 +92,7 @@ usage(void) /* Print usage and exit. */ fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-m] time\n" ++++++ at-3.1.8-denylist.patch ++++++ --- at.deny.orig +++ at.deny @@ -1,24 +1,12 @@ -alias -backup +root bin daemon -ftp -games -gnats -guest -irc lp mail +news +uucp +games man +wwwrun +ftp nobody -operator -proxy -qmaild -qmaill -qmailp -qmailq -qmailr -qmails -sync -sys -www-data ++++++ at-3.1.8-documentation-dir.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:52.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:52.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -117,7 +117,7 @@ +@@ -117,7 +117,7 @@ and to run a job at 1am tomorrow, you wo .B at 1am tomorrow. .PP The exact definition of the time specification can be found in ++++++ at-3.1.8-eal3-manpages.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,4 +1,4 @@ ---- at.allow.5 +--- /dev/null +++ at.allow.5 @@ -0,0 +1,36 @@ +.Id $Id: at.allow.5,v 1.1 1997/09/28 20:00:28 ig25 Exp $ @@ -37,7 +37,7 @@ +.BR cron (8), +.BR crontab (1), +.BR atd (8). ---- at.deny.5 +--- /dev/null +++ at.deny.5 @@ -0,0 +1,36 @@ +.Id $Id: at.allow.5,v 1.1 1997/09/28 20:00:28 ig25 Exp $ ++++++ at-3.1.8-formatbugs.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- atd.c +--- atd.c.orig +++ atd.c -@@ -293,7 +293,7 @@ +@@ -293,7 +293,7 @@ run_file(const char *filename, uid_t uid if (buf.st_nlink > 2) { perr("Someboy is trying to run a linked script for job %8lu (%.500s)", @@ -9,9 +9,9 @@ } if ((fflags = fcntl(fd_in, F_GETFD)) < 0) perr("Error in fcntl"); ---- daemon.h +--- daemon.h.orig +++ daemon.h -@@ -5,12 +5,12 @@ +@@ -5,12 +5,12 @@ void #ifdef HAVE_ATTRIBUTE_NORETURN __attribute__((noreturn)) #endif @@ -26,9 +26,9 @@ +perr (const char *fmt, ...) __attribute__((__format__(printf,1,2))); extern int daemon_debug; ---- panic.h +--- panic.h.orig +++ panic.h -@@ -26,7 +26,9 @@ +@@ -26,7 +26,9 @@ void #ifdef HAVE_ATTRIBUTE_NORETURN __attribute__((noreturn)) #endif ++++++ at-3.1.8-joblist.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.c +--- at.c.orig +++ at.c -@@ -132,8 +132,10 @@ +@@ -133,8 +133,10 @@ static void sigc(int signo); static void alarmc(int signo); static char *cwdname(void); static void writefile(time_t runtimer, char queue); @@ -12,7 +12,7 @@ /* Signal catching functions */ -@@ -525,8 +527,20 @@ +@@ -526,8 +528,20 @@ writefile(time_t runtimer, char queue) return; } @@ -34,7 +34,7 @@ { /* List all a user's jobs in the queue, by looping through ATJOB_DIR, * or everybody's if we are root -@@ -565,6 +579,10 @@ +@@ -566,6 +580,10 @@ list_jobs() if (sscanf(dirent->d_name, "%c%5lx%8lx", &queue, &jobno, &ctm) != 3) continue; @@ -45,7 +45,7 @@ if (atqueue && (queue != atqueue)) continue; -@@ -742,6 +760,28 @@ +@@ -743,6 +761,28 @@ terr: "out of range or illegal time specification: [[CC]YY]MMDDhhmm[.SS]"); } @@ -74,7 +74,7 @@ /* Global functions */ -@@ -768,9 +808,13 @@ +@@ -769,9 +809,13 @@ main(int argc, char **argv) char *options = "q:f:t:MmvldrhVc"; /* default options for at */ int disp_version = 0; time_t timer; @@ -88,7 +88,7 @@ timer = -1; RELINQUISH_PRIVS -@@ -900,7 +944,9 @@ +@@ -901,7 +945,9 @@ main(int argc, char **argv) case ATQ: REDUCE_PRIV(daemon_uid, daemon_gid) @@ -99,9 +99,9 @@ break; case ATRM: ---- panic.c +--- panic.c.orig +++ panic.c -@@ -95,6 +95,8 @@ +@@ -95,6 +95,8 @@ usage(void) " at [-V] -c job [job ...]\n" " at [-V] -r job [job ...]\n" " at [-V] [-f file] -t [[CC]YY]MMDDhhmm[.SS]\n" ++++++ at-3.1.8-leak-fix.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.c.orig 2009-08-27 11:22:49.000000000 +0200 -+++ at.c 2009-08-27 12:12:58.000000000 +0200 -@@ -600,6 +600,9 @@ +--- at.c.orig ++++ at.c +@@ -600,6 +600,9 @@ list_jobs(long *joblist, int len) else printf("%ld\t%s %c\n", jobno, timestr, queue); } @@ -10,7 +10,7 @@ PRIV_END } -@@ -676,6 +679,11 @@ +@@ -676,6 +679,11 @@ process_jobs(int argc, char **argv, int while ((ch = getc(fp)) != EOF) { putchar(ch); } @@ -22,7 +22,7 @@ } break; -@@ -687,7 +695,13 @@ +@@ -687,7 +695,13 @@ process_jobs(int argc, char **argv, int } } } ++++++ at-3.1.8-massive_batch.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- atd.c +--- atd.c.orig +++ atd.c -@@ -140,9 +140,10 @@ +@@ -137,9 +137,10 @@ static char rcsid[] = "$Id: atd.c,v 1.28 static double load_avg = LOADAVG_MX; static time_t now; static time_t last_chg; @@ -12,7 +12,7 @@ static volatile sig_atomic_t term_signal = 0; -@@ -155,9 +156,10 @@ +@@ -152,9 +153,10 @@ set_term(int dummy) } RETSIGTYPE @@ -25,7 +25,7 @@ return; } -@@ -765,6 +767,7 @@ +@@ -790,6 +792,7 @@ run_loop() return next_job; last_chg = buf.st_mtime; @@ -33,7 +33,7 @@ if ((spool = opendir(".")) == NULL) perr("Cannot read " ATJOB_DIR); -@@ -989,7 +992,7 @@ +@@ -1014,7 +1017,7 @@ main(int argc, char *argv[]) */ sigaction(SIGHUP, NULL, &act); @@ -42,7 +42,7 @@ sigaction(SIGHUP, &act, NULL); sigaction(SIGTERM, NULL, &act); -@@ -1005,9 +1008,10 @@ +@@ -1030,9 +1033,10 @@ main(int argc, char *argv[]) do { now = time(NULL); next_invocation = run_loop(); ++++++ at-3.1.8-pam-session-as-root.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,8 +1,6 @@ -Index: at-3.1.8/atd.c -=================================================================== ---- at-3.1.8.orig/atd.c 2009-05-14 15:47:05.000000000 +0200 -+++ at-3.1.8/atd.c 2009-05-14 15:47:42.000000000 +0200 -@@ -587,11 +587,13 @@ run_file(const char *filename, uid_t uid +--- atd.c.orig ++++ atd.c +@@ -612,11 +612,13 @@ run_file(const char *filename, uid_t uid unlink(filename); #ifdef WITH_PAM @@ -16,7 +14,7 @@ #endif /* The job is now finished. We can delete its input file. -@@ -712,11 +714,13 @@ run_file(const char *filename, uid_t uid +@@ -737,11 +739,13 @@ run_file(const char *filename, uid_t uid waitpid(mail_pid, (int *) NULL, 0); } #ifdef WITH_PAM ++++++ at-3.1.8-pam.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,5 +1,3 @@ -Index: Makefile.in -=================================================================== --- Makefile.in.orig +++ Makefile.in @@ -28,6 +28,7 @@ YACC = @YACC@ @@ -19,8 +17,6 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y -Index: atd.c -=================================================================== --- atd.c.orig +++ atd.c @@ -93,6 +93,17 @@ int selinux_enabled=0; @@ -352,8 +348,6 @@ opterr = 0; errno = 0; run_as_daemon = 1; -Index: config.h.in -=================================================================== --- config.h.in.orig +++ config.h.in @@ -187,3 +187,7 @@ @@ -364,8 +358,6 @@ +/* Define if you are building with_pam */ +#undef WITH_PAM + -Index: configure.in -=================================================================== --- configure.in.orig +++ configure.in @@ -323,4 +323,11 @@ AC_CHECK_LIB(selinux, is_selinux_enabled @@ -380,8 +372,6 @@ +AC_SUBST(PAMLIB) + AC_OUTPUT(Makefile atrun atd.8 atrun.8 at.1 batch) -Index: perm.c -=================================================================== --- perm.c.orig +++ perm.c @@ -109,14 +109,15 @@ user_in_file(const char *path, const cha ++++++ at-3.1.8-pie.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -67,13 +67,13 @@ +@@ -67,13 +67,13 @@ LIST = Filelist Filelist.asc all: at atd atrun at: $(ATOBJECTS) @@ -16,7 +16,7 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y -@@ -85,7 +85,7 @@ +@@ -85,7 +85,7 @@ atrun: atrun.in configure .c.o: ++++++ at-3.1.8-queue-nice-level.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,8 +1,6 @@ -Index: atd.c -=================================================================== --- atd.c.orig +++ atd.c -@@ -457,7 +457,7 @@ run_file(const char *filename, uid_t uid +@@ -482,7 +482,7 @@ run_file(const char *filename, uid_t uid if (chdir(ATJOB_DIR) < 0) perr("Cannot chdir to " ATJOB_DIR); ++++++ at-3.1.8-selinux.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -27,6 +27,7 @@ +@@ -27,6 +27,7 @@ LN_S = @LN_S@ YACC = @YACC@ LEX = @LEX@ LEXLIB = @LEXLIB@ @@ -8,7 +8,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ -@@ -72,7 +73,7 @@ +@@ -72,7 +73,7 @@ at: $(ATOBJECTS) $(LN_S) -f at atrm atd: $(RUNOBJECTS) @@ -17,7 +17,7 @@ y.tab.c y.tab.h: parsetime.y $(YACC) -d parsetime.y ---- atd.c +--- atd.c.orig +++ atd.c @@ -85,6 +85,14 @@ #include <syslog.h> @@ -34,7 +34,7 @@ /* Local headers */ #include "privs.h" -@@ -404,6 +412,76 @@ +@@ -404,6 +412,76 @@ run_file(const char *filename, uid_t uid chdir("/"); @@ -111,7 +111,7 @@ if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) perr("Exec failed for /bin/sh"); -@@ -420,6 +498,13 @@ +@@ -420,6 +498,13 @@ run_file(const char *filename, uid_t uid */ waitpid(pid, (int *) NULL, 0); @@ -125,7 +125,7 @@ /* Send mail. Unlink the output file after opening it, so it * doesn't hang around after the run. */ -@@ -654,6 +739,9 @@ +@@ -654,6 +739,9 @@ main(int argc, char *argv[]) struct passwd *pwe; struct group *ge; @@ -135,7 +135,7 @@ /* We don't need root privileges all the time; running under uid and gid * daemon is fine. */ ---- config.h.in +--- config.h.in.orig +++ config.h.in @@ -184,3 +184,6 @@ #undef DEFAULT_BATCH_QUEUE @@ -144,9 +144,9 @@ + +/* Define if you are building with_selinux */ +#undef WITH_SELINUX ---- configure.in +--- configure.in.orig +++ configure.in -@@ -315,4 +315,12 @@ +@@ -315,4 +315,12 @@ AC_ARG_WITH(daemon_groupname, ) AC_SUBST(DAEMON_GROUPNAME) ++++++ at-3.1.8-ttime.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- at.1.in +--- at.1.in.orig +++ at.1.in -@@ -9,7 +9,7 @@ +@@ -9,7 +9,7 @@ at, batch, atq, atrm \- queue, examine o .IR queue ] .RB [ -f .IR file ] @@ -9,7 +9,7 @@ .B TIME .br .B "at -c" -@@ -235,6 +235,9 @@ +@@ -235,6 +235,9 @@ is set; then, it will be "Thu Feb 20 14: .B \-c cats the jobs listed on the command line to standard output. @@ -19,7 +19,7 @@ .SH FILES .I @ATJBD@ .br ---- at.c +--- at.c.orig +++ at.c @@ -28,6 +28,7 @@ @@ -29,7 +29,7 @@ #ifdef HAVE_SYS_WAIT_H #include <sys/wait.h> -@@ -133,6 +134,7 @@ +@@ -133,6 +134,7 @@ static void alarmc(int signo); static char *cwdname(void); static void writefile(time_t runtimer, char queue); static void list_jobs(void); @@ -37,7 +37,7 @@ /* Signal catching functions */ -@@ -670,6 +672,78 @@ +@@ -670,6 +672,78 @@ process_jobs(int argc, char **argv, int } } /* delete_jobs */ @@ -116,7 +116,7 @@ /* Global functions */ void * -@@ -692,12 +766,13 @@ +@@ -692,12 +766,13 @@ main(int argc, char **argv) char *pgm; int program = AT; /* our default program */ @@ -131,7 +131,7 @@ RELINQUISH_PRIVS if ((pwe = getpwnam(DAEMON_USERNAME)) == NULL) -@@ -781,6 +856,13 @@ +@@ -781,6 +856,13 @@ main(int argc, char **argv) options = "q:V"; break; @@ -145,7 +145,7 @@ case 'b': if (program != AT) usage(); -@@ -834,10 +916,16 @@ +@@ -834,10 +916,16 @@ main(int argc, char **argv) break; case AT: @@ -166,9 +166,9 @@ } if (timer == 0) { ---- panic.c +--- panic.c.orig +++ panic.c -@@ -92,7 +92,9 @@ +@@ -92,7 +92,9 @@ usage(void) /* Print usage and exit. */ fprintf(stderr, "Usage: at [-V] [-q x] [-f file] [-m] time\n" ++++++ at-3.1.8.patch ++++++ --- /var/tmp/diff_new_pack.LBB42c/_old 2010-09-28 22:32:53.000000000 +0200 +++ /var/tmp/diff_new_pack.LBB42c/_new 2010-09-28 22:32:53.000000000 +0200 @@ -1,6 +1,6 @@ ---- Makefile.in +--- Makefile.in.orig +++ Makefile.in -@@ -87,37 +87,35 @@ +@@ -87,37 +87,35 @@ atrun: atrun.in $(CC) -c $(CFLAGS) $(DEFS) $*.c install: all @@ -58,9 +58,9 @@ rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ $(IROOT)$(mandir)/cat1/atq.1* rm -f $(IROOT)$(mandir)/cat1/atd.8* ---- Problems +--- Problems.orig +++ Problems -@@ -5,7 +5,7 @@ +@@ -5,7 +5,7 @@ Possible reasons why at may not run for make -f Makefile.old install @@ -69,9 +69,9 @@ - If you find numerous 'try again' error messages in your syslog files, you have too many processes running; recompile your kernel for a ---- README +--- README.orig +++ README -@@ -23,7 +23,7 @@ +@@ -23,7 +23,7 @@ The new one is to start up an atd daemon The old one is to put @@ -80,7 +80,7 @@ into root's crontab file (or wherever you put the atrun binary; don't forget to start up cron.) ---- atd.c +--- atd.c.orig +++ atd.c @@ -1,4 +1,4 @@ -/* @@ -97,7 +97,7 @@ * /usr/bin/mail aka /usr/bin/mailx require the subject to be * specified on the command line instead of reading it from stdin like * /usr/sbin/sendmail does. For now simply disable MAILC and MAILX, -@@ -121,14 +121,14 @@ +@@ -121,14 +121,14 @@ static int run_as_daemon = 0; static volatile sig_atomic_t term_signal = 0; /* Signal handlers */ @@ -114,7 +114,7 @@ sdummy(int dummy) { /* Empty signal handler */ -@@ -156,7 +156,7 @@ +@@ -156,7 +156,7 @@ release_zombie(int dummy) } return; } @@ -123,7 +123,7 @@ /* Local functions */ -@@ -196,7 +196,7 @@ +@@ -196,7 +196,7 @@ run_file(const char *filename, uid_t uid */ pid_t pid; int fd_out, fd_in; @@ -132,7 +132,7 @@ char *mailname = NULL; char *newname; FILE *stream; -@@ -290,7 +290,12 @@ +@@ -290,7 +290,12 @@ run_file(const char *filename, uid_t uid if ((fflags = fcntl(fd_in, F_GETFD)) < 0) perr("Error in fcntl"); @@ -146,7 +146,7 @@ /* * If the spool directory is mounted via NFS `atd' isn't able to -@@ -299,7 +304,7 @@ +@@ -299,7 +304,7 @@ run_file(const char *filename, uid_t uid * NFS and works with local file systems. It's not clear where * the bug is located. -Joey */ @@ -155,7 +155,7 @@ &nuid, &ngid, mailbuf, &send_mail) != 4) pabort("File %.500s is in wrong format - aborting", filename); -@@ -328,7 +333,7 @@ +@@ -328,7 +333,7 @@ run_file(const char *filename, uid_t uid perr("Cannot chdir to " ATSPOOL_DIR); /* Create a file to hold the output of the job we are about to run. @@ -164,7 +164,7 @@ */ if (unlink(filename) != -1) { -@@ -343,7 +348,7 @@ +@@ -343,7 +348,7 @@ run_file(const char *filename, uid_t uid write_string(fd_out, "Subject: Output from your job "); write_string(fd_out, jobbuf); write_string(fd_out, "\nTo: "); @@ -173,7 +173,7 @@ write_string(fd_out, "\n\n"); fstat(fd_out, &buf); size = buf.st_size; -@@ -394,6 +399,9 @@ +@@ -394,6 +399,9 @@ run_file(const char *filename, uid_t uid if (setuid(uid) < 0) perr("Cannot set user id"); @@ -183,7 +183,7 @@ chdir("/"); if (execle("/bin/sh", "sh", (char *) NULL, nenvp) != 0) -@@ -408,7 +416,7 @@ +@@ -408,7 +416,7 @@ run_file(const char *filename, uid_t uid /* We inherited the master's SIGCHLD handler, which does a non-blocking waitpid. So this blocking one will eventually @@ -192,7 +192,7 @@ */ waitpid(pid, (int *) NULL, 0); -@@ -557,7 +565,8 @@ +@@ -557,7 +565,8 @@ run_loop() /* Something went wrong the last time this was executed. * Let's remove the lockfile and reschedule. */ @@ -202,7 +202,7 @@ lock_name[0] = '='; unlink(lock_name); next_job = now; -@@ -591,7 +600,8 @@ +@@ -591,7 +600,8 @@ run_loop() */ run_batch++; if (strcmp(batch_name, dirent->d_name) > 0) { @@ -212,9 +212,9 @@ batch_uid = buf.st_uid; batch_gid = buf.st_gid; batch_queue = queue; ---- configure.in +--- configure.in.orig +++ configure.in -@@ -126,7 +126,7 @@ +@@ -126,7 +126,7 @@ else fi AC_MSG_CHECKING(location of spool directory) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0