Hello community,
here is the log from the commit of package yast2-add-on-creator
checked in at Mon Aug 6 17:20:53 CEST 2007.
--------
--- yast2-add-on-creator/yast2-add-on-creator.changes 2007-08-03 21:12:00.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-add-on-creator/yast2-add-on-creator.changes 2007-08-06 14:12:11.211265000 +0200
@@ -1,0 +2,13 @@
+Mon Aug 6 14:07:47 CEST 2007 - jsuchome@suse.cz
+
+- enable entering product name and version before content file
+ dialog, so most of its mandatory keys can be filled
+- 2.15.17
+
+-------------------------------------------------------------------
+Mon Aug 6 10:05:35 CEST 2007 - jsuchome@suse.cz
+
+- command line option for packages resigning (#287447)
+- 2.15.16
+
+-------------------------------------------------------------------
Old:
----
yast2-add-on-creator-2.15.15.tar.bz2
New:
----
yast2-add-on-creator-2.15.17.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-add-on-creator.spec ++++++
--- /var/tmp/diff_new_pack.z23558/_old 2007-08-06 17:20:43.000000000 +0200
+++ /var/tmp/diff_new_pack.z23558/_new 2007-08-06 17:20:43.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-add-on-creator (Version 2.15.15)
+# spec file for package yast2-add-on-creator (Version 2.15.17)
#
# 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.15
+Version: 2.15.17
Release: 1
License: GPL v2 or later
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-add-on-creator-2.15.15.tar.bz2
+Source0: yast2-add-on-creator-2.15.17.tar.bz2
prefix: /usr
Requires: yast2
BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite
@@ -33,7 +33,7 @@
Jiř� Suchomel
%prep
-%setup -n yast2-add-on-creator-2.15.15
+%setup -n yast2-add-on-creator-2.15.17
%build
%{prefix}/bin/y2tool y2autoconf
@@ -70,6 +70,13 @@
%doc %{prefix}/share/doc/packages/yast2-add-on-creator
%changelog
+* Mon Aug 06 2007 - jsuchome@suse.cz
+- enable entering product name and version before content file
+ dialog, so most of its mandatory keys can be filled
+- 2.15.17
+* Mon Aug 06 2007 - jsuchome@suse.cz
+- command line option for packages resigning (#287447)
+- 2.15.16
* Fri Aug 03 2007 - jsuchome@suse.cz
- do not require rpms for creating AddOn (#297165)
- password verification entry (#297168)
++++++ yast2-add-on-creator-2.15.15.tar.bz2 -> yast2-add-on-creator-2.15.17.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.15/src/add-on-creator.ycp new/yast2-add-on-creator-2.15.17/src/add-on-creator.ycp
--- old/yast2-add-on-creator-2.15.15/src/add-on-creator.ycp 2007-06-07 13:19:37.000000000 +0200
+++ new/yast2-add-on-creator-2.15.17/src/add-on-creator.ycp 2007-08-06 12:29:05.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Main file
* Authors: Jiri Suchomel
*
- * $Id: add-on-creator.ycp 38336 2007-06-07 11:19:37Z jsuchome $
+ * $Id: add-on-creator.ycp 39974 2007-08-06 10:29:04Z jsuchome $
*
* Main file for add-on-creator configuration. Uses all other files.
*/
@@ -98,6 +98,7 @@
AddOnCreator::passphrase =
// question on command line
CommandLine::PasswordInput(sformat (_("Passphrase for key %1:"),AddOnCreator::gpg_key));
+ AddOnCreator::resign_packages = haskey (options, "resign_packages");
}
/**
@@ -262,6 +263,9 @@
{
ParseGPGData (options);
}
+ if (!FileUtils::Exists (AddOnCreator::base_output_path)) {
+ SCR::Execute (.target.mkdir, AddOnCreator::base_output_path);
+ }
return true;
}
@@ -427,6 +431,10 @@
"help" : _("Path to file with the passphrase for GPG key"),
"type" : "string",
],
+ "resign_packages" : $[
+ // command line help text for 'passphrase' option
+ "help" : _("Resign all packages with selected key"),
+ ],
"workflow" : $[
// command line help text for 'workflow' option
"help" : _("Path to workflow definition file (installation.xml)"),
@@ -455,17 +463,22 @@
],
"mappings" : $[
"create" : [ "content", "rpm_dir", "package_descriptions_dir",
- "patterns_dir", "output_dir", "create_iso", "iso_name", "gpg_key", "passphrase",
- "passphrase_file", "workflow", "y2update", "y2update_packages_dir", "license",
- "do_not_sign", "iso_output_dir"
+ "patterns_dir", "output_dir", "create_iso", "iso_name", "gpg_key",
+ "passphrase", "passphrase_file", "workflow", "y2update",
+ "y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
+ "resign_packages",
],
"clone" : [ "existing", "generate_descriptions", "content",
- "package_descriptions_dir", "patterns_dir", "output_dir", "create_iso", "iso_name",
+ "package_descriptions_dir", "patterns_dir", "output_dir",
+ "create_iso", "iso_name",
"gpg_key", "passphrase", "passphrase_file", "workflow", "y2update",
- "y2update_packages_dir", "license", "do_not_sign", "iso_output_dir"
+ "y2update_packages_dir", "license", "do_not_sign", "iso_output_dir",
+ "resign_packages",
+ ],
+ "sign" : [ "addon_dir", "gpg_key", "passphrase",
+ "passphrase_file", "create_iso", "iso_name", "iso_output_dir",
+ "resign_packages"
],
- "sign" : [ "addon_dir", "gpg_key", "passphrase", "passphrase_file", "create_iso",
- "iso_name", "iso_output_dir" ]
]
];
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.15/src/AddOnCreator.ycp new/yast2-add-on-creator-2.15.17/src/AddOnCreator.ycp
--- old/yast2-add-on-creator-2.15.15/src/AddOnCreator.ycp 2007-08-03 14:56:20.000000000 +0200
+++ new/yast2-add-on-creator-2.15.17/src/AddOnCreator.ycp 2007-08-06 13:16:17.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: AddOnCreator settings, input and output functions
* Authors: Jiri Suchomel
*
- * $Id: AddOnCreator.ycp 39906 2007-08-02 14:59:56Z jsuchome $
+ * $Id: AddOnCreator.ycp 39943 2007-08-03 14:32:08Z jsuchome $
*
* Representation of the configuration of add-on-creator.
* Input and output routines.
@@ -35,6 +35,7 @@
module "AddOnCreator";
textdomain "add-on-creator";
+import "Arch";
import "Directory";
import "FileUtils";
import "Mode";
@@ -743,6 +744,8 @@
else
content_descr[key,"allowed_values"] = [];
}
+ if (key == "DEFAULTBASE")
+ content_descr[key,"value"] = Arch::architecture ();
i = i + 1;
});
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.15/src/complex.ycp new/yast2-add-on-creator-2.15.17/src/complex.ycp
--- old/yast2-add-on-creator-2.15.15/src/complex.ycp 2007-08-03 14:56:14.000000000 +0200
+++ new/yast2-add-on-creator-2.15.17/src/complex.ycp 2007-08-06 13:30:33.000000000 +0200
@@ -24,7 +24,7 @@
* Summary: Dialogs definitions
* Authors: Jiri Suchomel
*
- * $Id: complex.ycp 39906 2007-08-02 14:59:56Z jsuchome $
+ * $Id: complex.ycp 39943 2007-08-03 14:32:08Z jsuchome $
*/
{
@@ -203,10 +203,23 @@
AddOnCreator::rpm_path = "";
string old_requires = requires;
+ string product = AddOnCreator::content_map["PRODUCT"]:"";
+ string old_product = product == "" ? nil : product;
+
+ string version = AddOnCreator::content_map["VERSION"]:"";
+ string old_version = version;
+
// dialog caption
string caption = _("Add-On Product Creator");
term contents = `HBox (`HSpacing (), `VBox (
+ `HBox (
+ // textentry label
+ `TextEntry (`id (`product), _("&Add-On Product Name"), product),
+ // textentry label
+ `TextEntry (`id (`version), _("&Version"), version)
+ ),
+ `VSpacing (0.7),
`Frame (_("Required Product"), `HBox (`HSpacing (0.5), `VBox (
`VSpacing (0.4),
`RadioButtonGroup (`id(`rd),
@@ -268,7 +281,7 @@
Wizard::SetContentsButtons(caption, contents, HELPS["sources"]:"",
Label::BackButton(), Label::NextButton());
- UI::SetFocus (`id(`rpm_path));
+ UI::SetFocus (`id(`product));
if (UI::QueryWidget (`id(`rd), `Value) == nil)
{
@@ -286,6 +299,8 @@
string dir = (string) UI::QueryWidget (`id(`rpm_path), `Value);
string req_dir = (string)
UI::QueryWidget (`id(`required_rpm_path), `Value);
+ product = (string) UI::QueryWidget (`id(`product), `Value);
+ version = (string) UI::QueryWidget (`id(`version), `Value);
if (ret == `browse_rpm) {
dir = UI::AskForExistingDirectory (dir, "");
@@ -358,8 +373,17 @@
if (requires == "")
requires = (string) UI::QueryWidget (`id(`other_val), `Value);
AddOnCreator::content_map["REQUIRES"] = requires;
+ AddOnCreator::content_map["PRODUCT"] = product;
+ AddOnCreator::content_map["VERSION"] = version;
+ if (product != "" &&
+ AddOnCreator::content_map["DISTPRODUCT"]:"" == "")
+ AddOnCreator::content_map["DISTPRODUCT"] = product;
+ if (version != "" &&
+ AddOnCreator::content_map["DISTVERSION"]:"" == "")
+ AddOnCreator::content_map["DISTVERSION"] = version;
- if (requires == old_requires && dir == old_dir)
+ if (requires == old_requires && dir == old_dir &&
+ product == old_product && version == old_version)
ret = `skip_gen;
break;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.15/src/helps.ycp new/yast2-add-on-creator-2.15.17/src/helps.ycp
--- old/yast2-add-on-creator-2.15.15/src/helps.ycp 2007-07-31 07:35:04.000000000 +0200
+++ new/yast2-add-on-creator-2.15.17/src/helps.ycp 2007-08-06 13:21:52.000000000 +0200
@@ -58,7 +58,13 @@
_("<p>When basing the new product on an existing product, check <b>Generate Package Descriptions</b> to generate new descriptions of packages in the existing product.</p>"),
// help text for initial data (paragraph title)
- "sources" : _("<p><b>Required Product</b></p>") +
+ "sources" : _("<p><b>Name and Version</b></p>") +
+
+ // help text for initial data, cont.
+ _("<p>Enter the name and version of add-on product.</p>") +
+
+ // help text for initial data, cont.
+ _("<p><b>Required Product</b></p>") +
// help text for initial data, cont.
_("<p>Select the product to which the new add-on product can be applied. This selection forms the <b>REQUIRES</b> value of the <tt>content</tt> file.</p>") +
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-creator-2.15.15/VERSION new/yast2-add-on-creator-2.15.17/VERSION
--- old/yast2-add-on-creator-2.15.15/VERSION 2007-08-03 15:40:17.000000000 +0200
+++ new/yast2-add-on-creator-2.15.17/VERSION 2007-08-06 14:08:27.000000000 +0200
@@ -1 +1 @@
-2.15.15
+2.15.17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org