Hello community, here is the log from the commit of package yast2-add-on-creator checked in at Wed May 30 19:02:11 CEST 2007. -------- --- yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-22 10:56:13.000000000 +0200 +++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-05-30 13:46:38.574889000 +0200 @@ -1,0 +2,6 @@ +Wed May 30 10:09:52 CEST 2007 - jsuchome@suse.cz + +- added support for source rpm's (#279004) +- 2.15.10 + +------------------------------------------------------------------- Old: ---- yast2-add-on-creator-2.15.9.tar.bz2 New: ---- yast2-add-on-creator-2.15.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on-creator.spec ++++++ --- /var/tmp/diff_new_pack.B11779/_old 2007-05-30 19:01:40.000000000 +0200 +++ /var/tmp/diff_new_pack.B11779/_new 2007-05-30 19:01:40.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on-creator (Version 2.15.9) +# spec file for package yast2-add-on-creator (Version 2.15.10) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -11,12 +11,12 @@ # norootforbuild Name: yast2-add-on-creator -Version: 2.15.9 +Version: 2.15.10 Release: 1 License: GNU General Public License (GPL) Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-creator-2.15.9.tar.bz2 +Source0: yast2-add-on-creator-2.15.10.tar.bz2 prefix: /usr Requires: yast2 BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite @@ -33,7 +33,7 @@ Jiř� Suchomel <jsuchome@suse.cz> %prep -%setup -n yast2-add-on-creator-2.15.9 +%setup -n yast2-add-on-creator-2.15.10 %build %{prefix}/bin/y2tool y2autoconf @@ -69,6 +69,9 @@ %doc %{prefix}/share/doc/packages/yast2-add-on-creator %changelog +* Wed May 30 2007 - jsuchome@suse.cz +- added support for source rpm's (#279004) +- 2.15.10 * Tue May 22 2007 - jsuchome@suse.cz - enable rpm directory with .rpm extension (#276861) - 2.15.9 ++++++ yast2-add-on-creator-2.15.9.tar.bz2 -> yast2-add-on-creator-2.15.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp new/yast2-add-on-creator-2.15.10/src/add-on-creator.ycp --- old/yast2-add-on-creator-2.15.9/src/add-on-creator.ycp 2007-05-22 10:42:23.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/add-on-creator.ycp 2007-05-22 10:54:03.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Main file * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: add-on-creator.ycp 37394 2007-04-11 12:01:02Z jsuchome $ + * $Id: add-on-creator.ycp 38074 2007-05-22 08:56:08Z jsuchome $ * * Main file for add-on-creator configuration. Uses all other files. */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.10/src/AddOnCreator.ycp --- old/yast2-add-on-creator-2.15.9/src/AddOnCreator.ycp 2007-05-21 13:32:05.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/AddOnCreator.ycp 2007-05-30 10:09:45.000000000 +0200 @@ -592,6 +592,9 @@ // mapping of package name to full file name global map<string,string> package2filename = $[]; +// mapping of source package name to full file name +global map<string,string> srcpackage2filename = $[]; + // if we want only to sign existing product (and possibly create iso of it) global boolean only_sign_product = false; @@ -1004,17 +1007,23 @@ y2milestone ("asking the RPM's for ARCH and NAME..."); foreach (string f, splitstring (out["stdout"]:"", "\n"), { if (f == "") return; - out = (map) SCR::Execute (.target.bash_output, - sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\"", f)); + sformat ("rpm -q -p %1 --qf \"%%{ARCH}\n%%{NAME}\n%%|SOURCERPM?{bin}:{src}|\"",f)); list lines = splitstring (out["stdout"]:"", "\n"); string arch = lines[0]:""; string name = lines[1]:""; + string sourcerpm = lines[2]:""; + // 'arch' is directory where to put final package + if (sourcerpm == "src") + arch = "src"; if (name != "" && arch != "") { available_packages[arch] = add ( available_packages[arch]:[], name); - package2filename[name] = f; + if (arch != "src") + package2filename[name] = f; + else + srcpackage2filename[name] = f; } }); y2milestone ("... done"); @@ -1437,13 +1446,20 @@ if (arch != "ZZZ_imported" && arch != "ZZZ_required" && FileUtils::Exists (out_dir)) { - if (size (package2filename) > 0) + if (size (package2filename) > 0 && arch != "src") { foreach (string p, (list<string>) pa, { SCR::Execute (.target.bash, sformat ( "/bin/cp %1 '%2/'", package2filename[p]:"", out_dir)); }); } + else if (size (srcpackage2filename) > 0 && arch == "src") + { + foreach (string p, (list<string>) pa, { + SCR::Execute (.target.bash, sformat ( + "/bin/cp %1 '%2/'", srcpackage2filename[p]:"", out_dir)); + }); + } else { foreach (string p, (list<string>) pa, { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/src/complex.ycp new/yast2-add-on-creator-2.15.10/src/complex.ycp --- old/yast2-add-on-creator-2.15.9/src/complex.ycp 2007-05-22 10:42:23.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/src/complex.ycp 2007-05-22 10:54:03.000000000 +0200 @@ -24,7 +24,7 @@ * Summary: Dialogs definitions * Authors: Jiri Suchomel <jsuchome@suse.cz> * - * $Id: complex.ycp 37583 2007-04-19 12:45:25Z jsuchome $ + * $Id: complex.ycp 38074 2007-05-22 08:56:08Z jsuchome $ */ { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.9/VERSION new/yast2-add-on-creator-2.15.10/VERSION --- old/yast2-add-on-creator-2.15.9/VERSION 2007-05-22 10:42:34.000000000 +0200 +++ new/yast2-add-on-creator-2.15.10/VERSION 2007-05-30 10:10:10.000000000 +0200 @@ -1 +1 @@ -2.15.9 +2.15.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org