Author: mvidner
Date: Wed Aug 15 18:40:26 2007
New Revision: 40304
URL: http://svn.opensuse.org/viewcvs/yast?rev=40304&view=rev
Log:
Fixed spec creation for non-trans packages.
Modified:
trunk/devtools/VERSION
trunk/devtools/devtools/bin/create-spec
trunk/devtools/package/yast2-devtools.changes
Modified: trunk/devtools/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/VERSION?rev=40304&r1=40303&r2=40304&view=diff
==============================================================================
--- trunk/devtools/VERSION (original)
+++ trunk/devtools/VERSION Wed Aug 15 18:40:26 2007
@@ -1 +1 @@
-2.15.6
+2.15.7
Modified: trunk/devtools/devtools/bin/create-spec
URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/devtools/bin/create-spec?rev=40304&r1=40303&r2=40304&view=diff
==============================================================================
--- trunk/devtools/devtools/bin/create-spec (original)
+++ trunk/devtools/devtools/bin/create-spec Wed Aug 15 18:40:26 2007
@@ -24,13 +24,15 @@
# Authors: Jan Holesovsky , 2001
# Arvin Schnell , 2002
+use strict;
+
# Import the content of some files
-$RPMNAME = `cat RPMNAME`;
-$VERSION = `cat VERSION`;
-$MAINTAINER = `cat MAINTAINER`;
-$LICENSE = -f "YAST_LICENSE" ? "YaST License" : "GPL";
+my $RPMNAME = `cat RPMNAME`;
+my $VERSION = `cat VERSION`;
+my $MAINTAINER = `cat MAINTAINER`;
+my $LICENSE = -f "YAST_LICENSE" ? "YaST License" : "GPL";
-$PREFIX = "/usr";
+my $PREFIX = "/usr";
# Clean them and check them
chomp $RPMNAME;
@@ -42,10 +44,12 @@
}
# Default values
-$yast2dir = "$PREFIX/share/YaST2";
-$execcompdir = "$PREFIX/lib/YaST2";
+my $yast2dir = "$PREFIX/share/YaST2";
+my $execcompdir = "$PREFIX/lib/YaST2";
-$provides_locale = "";
+my $provides_locale = "";
+my $LL = "";
+my $ISO639 = "";
if ($RPMNAME =~ /^yast2-trans-(.*)/) {
$provides_locale = "Provides:\tlocale(yast2:$1)\n";
$LL = "$1";
@@ -60,7 +64,7 @@
}
# Definition of the macros
-%macros =
+my %macros =
(
"\@RPMNAME\@" => "$RPMNAME",
@@ -180,7 +184,7 @@
# And some tiny macros. Must be separate since the big macros contain them.
-%tiny_macros =
+my %tiny_macros =
(
# FIXME: kind of double definition of paths
# we should use configure to create a mapping of paths
@@ -224,18 +228,18 @@
my $warn_defattr = 1;
my $warn_doc = 0;
-$unknown_macro = 0;
+my $unknown_macro = 0;
while (<STDIN>)
{
if (! /^##.*/)
{
- foreach $macro_name ( keys %macros )
+ foreach my $macro_name ( keys %macros )
{
s/$macro_name/$macros{$macro_name}/g;
}
- foreach $macro_name ( keys %tiny_macros )
+ foreach my $macro_name ( keys %tiny_macros )
{
s/$macro_name/$tiny_macros{$macro_name}/g;
}
Modified: trunk/devtools/package/yast2-devtools.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/devtools/package/yast2-devtools.changes?rev=40304&r1=40303&r2=40304&view=diff
==============================================================================
--- trunk/devtools/package/yast2-devtools.changes (original)
+++ trunk/devtools/package/yast2-devtools.changes Wed Aug 15 18:40:26 2007
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Wed Aug 15 18:40:15 CEST 2007 - mvidner@suse.cz
+
+- Fixed spec creation for non-trans packages.
+- 2.15.7
+
+-------------------------------------------------------------------
Wed Aug 15 14:41:31 CEST 2007 - mvidner@suse.cz
- prefixbuild: handle lib64, yast2-metapackage, and *-devel-doc
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
