Author: mvidner Date: Fri Oct 7 15:10:10 2011 New Revision: 66339 URL: http://svn.opensuse.org/viewcvs/yast?rev=66339&view=rev Log: - create-spec: added spec file license - create-spec: adjusted whitespace to comply with prepare_spec - create-spec: use %version to minimize diffs svn merge -c65922 -c65933 -c65941 http://svn.opensuse.org/svn/yast/trunk/devtools Modified: branches/SuSE-Code-11-SP2-Branch/devtools/ (props changed) branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Modified: branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec?rev=66339&r1=66338&r2=66339&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/devtools/bin/create-spec Fri Oct 7 15:10:10 2011 @@ -74,24 +74,38 @@ "\@HEADER-COMMENT\@" => "# -# spec file for package $RPMNAME (Version $VERSION) +# spec file for package $RPMNAME # -# norootforbuild", -#", +# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An \"Open Source License\" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +# norootforbuild # The group tag is only a dummy entry. The correct one is inserted by # prepare_spec. +", "\@HEADER\@" => -"Name: $RPMNAME -Version: $VERSION -Release: 0 +"Name: $RPMNAME +Version: $VERSION +Release: 0 License: $LICENSE Group: System/YaST -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: $RPMNAME-$VERSION.tar.bz2 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source0: $RPMNAME-%{version}.tar.bz2 -prefix: /usr +Prefix: /usr $provides_locale", # The group tag is only a dummy entry. The correct one is inserted by @@ -104,13 +118,13 @@ "\@HEADER-INSTSYS\@" => "\%package instsys -Group: SuSE internal", +Group: SuSE internal", ##### PREP ##### "\@PREP\@" => "\%prep -\%setup -n $RPMNAME-$VERSION", +\%setup -n $RPMNAME-%{version}", ##### BUILD ##### Modified: branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes?rev=66339&r1=66338&r2=66339&view=diff ============================================================================== --- branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes (original) +++ branches/SuSE-Code-11-SP2-Branch/devtools/package/yast2-devtools.changes Fri Oct 7 15:10:10 2011 @@ -1,7 +1,10 @@ ------------------------------------------------------------------- Fri Oct 7 14:56:33 CEST 2011 - mvidner@suse.cz -- create_spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). +- create-spec: Specify the license: GPL-2.0+ instead of just GPL (bnc#709814). +- create-spec: added spec file license +- create-spec: adjusted whitespace to comply with prepare_spec +- create-spec: use %version to minimize diffs ------------------------------------------------------------------- Thu Oct 6 15:00:59 CEST 2011 - visnov@suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org