Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2013-12-13 13:12:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2013-10-20 10:54:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2013-12-13 13:12:30.000000000 +0100 @@ -1,0 +2,21 @@ +Wed Dec 11 18:16:18 UTC 2013 - [email protected] + +- y2autoconf - in perl we need extra backslash escaping +- 3.1.12 + +------------------------------------------------------------------- +Wed Dec 11 14:32:06 UTC 2013 - [email protected] + +- use grep/sed instead of rpm for parsing spec files (rpm prints + the version for each subpackage, moreover it does some dependecy + resolving which might fail) +- 3.1.11 + +------------------------------------------------------------------- +Mon Dec 9 12:58:21 UTC 2013 - [email protected] + +- read the version directly from *.spec file (ignore the VERSION + files so they can be removed) +- 3.1.10 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.9.tar.bz2 New: ---- yast2-devtools-3.1.12.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.HSoejo/_old 2013-12-13 13:12:30.000000000 +0100 +++ /var/tmp/diff_new_pack.HSoejo/_new 2013-12-13 13:12:30.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.9 +Version: 3.1.12 Release: 0 Url: http://github.com/yast/yast-devtools @@ -134,6 +134,7 @@ %{_datadir}/YaST2/clients/ycp2yml.rb %{_datadir}/YaST2/data/devtools/bin/check-textdomain %{_datadir}/YaST2/data/devtools/bin/check_icons +%{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck %{_datadir}/YaST2/data/devtools/bin/rny2rnc ++++++ yast2-devtools-3.1.9.tar.bz2 -> yast2-devtools-3.1.12.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/CONTRIBUTING.md new/yast2-devtools-3.1.12/CONTRIBUTING.md --- old/yast2-devtools-3.1.9/CONTRIBUTING.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.12/CONTRIBUTING.md 2013-12-13 09:58:52.000000000 +0100 @@ -0,0 +1,87 @@ +YaST Contribution Guidelines +============================ + +YaST is an open source project and as such it welcomes all kinds of +contributions. If you decide to contribute, please follow these guidelines to +ensure the process is effective and pleasant both for you and YaST maintainers. + +There are two main forms of contribution: reporting bugs and performing code +changes. + +Bug Reports +----------- + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/enter_bug.cgi?format=guided&product=openSUSE+Factory&component=YaST2) +or [GitHub issues](../../issues). (For Bugzilla, use the [simplified +registration](https://secure-www.novell.com/selfreg/jsp/createSimpleAccount.jsp) +if you don't have an account yet.) + +If you find a problem, please report it either using +[Bugzilla](https://bugzilla.novell.com/) or GitHub issues. We can't guarantee +that every bug will be fixed, but we'll try. + +When creating a bug report, please follow our [bug reporting +guidelines](http://en.opensuse.org/openSUSE:Report_a_YaST_bug). + +Code Changes +------------ + +We welcome all kinds of code contributions, from simple bug fixes to significant +refactorings and implementation of new features. However, before making any +non-trivial contribution, get in touch with us first — this can prevent wasted +effort on both sides. Also, have a look at our [development +documentation](http://en.opensuse.org/openSUSE:YaST_development). + +To send us your code change, use GitHub pull requests. The workflow is as +follows: + + 1. Fork the project. + + 2. Create a topic branch based on `master`. + + 3. Implement your change, including tests (if possible). Make sure you adhere + to the [Ruby style + guide](https://github.com/SUSE/style-guides/blob/master/Ruby.md). + + 4. Make sure your change didn't break anything by building the RPM package + (`rake osc:build`). The build process includes running the full testsuite. + + 5. Publish the branch and create a pull request. + + 6. YaST developers will review your change and possibly point out issues. + Adapt the code under their guidance until they are all resolved. + + 7. Finally, the pull request will get merged or rejected. + +See also [GitHub's guide on +contributing](https://help.github.com/articles/fork-a-repo). + +If you want to do multiple unrelated changes, use separate branches and pull +requests. + +Do not change the `VERSION` and `*.changes` files as this could lead to +conflicts. + +### Commits + +Each commit in the pull request should do only one thing, which is clearly +described by its commit message. Especially avoid mixing formatting changes and +functional changes into one commit. When writing commit messages, adhere to +[widely used +conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html). + +If your commit is related to a bug in Buzgilla or an issue on GitHub, make sure +you mention it in the commit message for cross-reference. Use format like +bnc#775814 or gh#yast/yast-foo#42. See also [GitHub +autolinking](https://help.github.com/articles/github-flavored-markdown#references) +and [openSUSE abbreviation +reference](http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations). + +Additional Information +---------------------- + +If you have any question, feel free to ask at the [development mailing +list](http://lists.opensuse.org/yast-devel/) or at the +[#yast](http://webchat.freenode.net/?channels=%23yast) IRC channel on freenode. +We'll do our best to provide a timely and accurate answer. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/VERSION new/yast2-devtools-3.1.12/VERSION --- old/yast2-devtools-3.1.9/VERSION 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/VERSION 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -3.1.9 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/build-tools/Makefile.am.toplevel new/yast2-devtools-3.1.12/build-tools/Makefile.am.toplevel --- old/yast2-devtools-3.1.9/build-tools/Makefile.am.toplevel 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/build-tools/Makefile.am.toplevel 2013-12-13 09:58:52.000000000 +0100 @@ -9,8 +9,8 @@ #where devtools are Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool -VERSION = $(shell cat $(srcdir)/VERSION) RPMNAME = $(shell cat $(srcdir)/RPMNAME) +VERSION = $(shell grep '^[[:space:]]*Version:' $(srcdir)/package/$(RPMNAME).spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/') SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) @@ -46,7 +46,7 @@ -type f -name "*.pot") EXTRA_DIST = \ - VERSION RPMNAME MAINTAINER configure.in.in \ + RPMNAME MAINTAINER configure.in.in \ $(COPYRIGHT_files) \ $(SUBDIRS_FILE) $(ACINCLUDE_FILE) \ $(if $(IS_DEVTOOLS),Makefile.am.common,$(POT_DST)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/build-tools/cmake/modules/YastCommon.cmake new/yast2-devtools-3.1.12/build-tools/cmake/modules/YastCommon.cmake --- old/yast2-devtools-3.1.9/build-tools/cmake/modules/YastCommon.cmake 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/build-tools/cmake/modules/YastCommon.cmake 2013-12-13 09:58:52.000000000 +0100 @@ -50,7 +50,11 @@ ENDIF (NOT DEFINED RPMNAME) MESSAGE(STATUS "package name set to '${RPMNAME}'") -file (STRINGS ${CMAKE_SOURCE_DIR}/VERSION VERSION) +file (GLOB spec_files "package/*.spec") +execute_process(COMMAND "grep" "^[[:space:]]*Version:" ${spec_files} + COMMAND "sed" "-e" "s/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/" + OUTPUT_VARIABLE VERSION) +message(STATUS "Version: ${VERSION}") INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/build-tools/scripts/y2autoconf new/yast2-devtools-3.1.12/build-tools/scripts/y2autoconf --- old/yast2-devtools-3.1.9/build-tools/scripts/y2autoconf 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/build-tools/scripts/y2autoconf 2013-12-13 09:58:52.000000000 +0100 @@ -6,7 +6,7 @@ # #Available macros in the configure.ac.in: # @RPMNAME@ - reads it from file RPMNAME -# @VERSION@ - reads it from file VERSION +# @VERSION@ - reads it from package/*.spec file # @MAINTAINER@ - reads it from file MAINTAINER # # @YAST2-INIT-COMMON@ - Initialization. The generated configure.ac @@ -37,10 +37,12 @@ } $RPMNAME = `cat RPMNAME`; -$VERSION = `cat VERSION`; -$MAINTAINER = `cat MAINTAINER`; chomp $RPMNAME; + +$VERSION = `grep '^[[:space:]]*Version:' package/$RPMNAME.spec | sed -e 's/Version:[[:space:]]*\\([[:print:]]\\+\\)/\\1/'`; chomp $VERSION; + +$MAINTAINER = `cat MAINTAINER`; chomp $MAINTAINER; # Better finding of subdirs: do not do "find" since that does not diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/build-tools/scripts/y2automake new/yast2-devtools-3.1.12/build-tools/scripts/y2automake --- old/yast2-devtools-3.1.9/build-tools/scripts/y2automake 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/build-tools/scripts/y2automake 2013-12-13 09:58:52.000000000 +0100 @@ -54,7 +54,7 @@ RPMNAME=`cat ./RPMNAME` -if [ ! -e VERSION ]; then +if [ ! -e MAINTAINER ]; then echo "${self} ERROR: Start this only in YaST2 toplevel project directories!" >&2 exit 1 fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/jenkins-tools/README.md new/yast2-devtools-3.1.12/jenkins-tools/README.md --- old/yast2-devtools-3.1.9/jenkins-tools/README.md 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/jenkins-tools/README.md 2013-12-13 09:58:52.000000000 +0100 @@ -1,3 +1,5 @@ +## Jenkins tools + Jenkins tools are intended to help with mass operations on <http://ci.opensuse.org/> @@ -10,3 +12,8 @@ They can be used only if you have an account with proper rights. In the same directory, copy the template `jenkins.yml.template` to a file `jenkins.yml` and fill required credentials. + +## Hints about jenkins + +- general API hint: look at ci.opensuse.org/api . For api for given page append `/api/xml`. + For config xml append to job view `/config.xml` like <https://ci.opensuse.org/view/Yast/job/yast-users-master/config.xml>. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/jenkins-tools/config.xml new/yast2-devtools-3.1.12/jenkins-tools/config.xml --- old/yast2-devtools-3.1.9/jenkins-tools/config.xml 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/jenkins-tools/config.xml 2013-12-13 09:58:52.000000000 +0100 @@ -1,16 +1,14 @@ -<?xml version='1.0' encoding='UTF-8'?> +<?xml version="1.0" encoding="UTF-8"?> <project> <actions/> - <description></description> + <description/> <keepDependencies>false</keepDependencies> <properties/> - <scm class="hudson.plugins.git.GitSCM" plugin="[email protected]"> + <scm class="hudson.plugins.git.GitSCM" plugin="[email protected]"> <configVersion>2</configVersion> <userRemoteConfigs> <hudson.plugins.git.UserRemoteConfig> - <name></name> - <refspec></refspec> - <url>https://github.com/yast/yast-core.git</url> + <url>https://github.com/yast/yast-yast2.git</url> </hudson.plugins.git.UserRemoteConfig> </userRemoteConfigs> <branches> @@ -18,28 +16,11 @@ <name>master</name> </hudson.plugins.git.BranchSpec> </branches> - <disableSubmodules>false</disableSubmodules> - <recursiveSubmodules>false</recursiveSubmodules> <doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations> - <authorOrCommitter>false</authorOrCommitter> - <clean>false</clean> - <wipeOutWorkspace>false</wipeOutWorkspace> - <pruneBranches>false</pruneBranches> - <remotePoll>false</remotePoll> - <ignoreNotifyCommit>false</ignoreNotifyCommit> - <useShallowClone>false</useShallowClone> - <buildChooser class="hudson.plugins.git.util.DefaultBuildChooser"/> - <gitTool>Default</gitTool> <submoduleCfg class="list"/> - <relativeTargetDir></relativeTargetDir> - <reference></reference> - <excludedRegions></excludedRegions> - <excludedUsers></excludedUsers> - <gitConfigName></gitConfigName> - <gitConfigEmail></gitConfigEmail> - <skipTag>false</skipTag> - <includedRegions></includedRegions> - <scmName></scmName> + <extensions> + <hudson.plugins.git.extensions.impl.CleanCheckout/> + </extensions> </scm> <assignedNode>yast-jenkins</assignedNode> <canRoam>false</canRoam> @@ -55,11 +36,15 @@ <concurrentBuild>false</concurrentBuild> <builders> <hudson.tasks.Shell> - <command> -cd $WORKSPACE; rake osc:commit; cd - - </command> + <command>cd $WORKSPACE; rake osc:sr; cd - </command> </hudson.tasks.Shell> </builders> - <publishers/> + <publishers> + <hudson.tasks.Mailer plugin="[email protected]"> + <recipients>[email protected]</recipients> + <dontNotifyEveryUnstableBuild>true</dontNotifyEveryUnstableBuild> + <sendToIndividuals>true</sendToIndividuals> + </hudson.tasks.Mailer> + </publishers> <buildWrappers/> -</project> +</project> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/jenkins-tools/yast-jenkins-create.rb new/yast2-devtools-3.1.12/jenkins-tools/yast-jenkins-create.rb --- old/yast2-devtools-3.1.9/jenkins-tools/yast-jenkins-create.rb 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/jenkins-tools/yast-jenkins-create.rb 2013-12-13 09:58:52.000000000 +0100 @@ -16,7 +16,7 @@ ARGV.each do |mod| #test if module already exist - response_code = `curl -sL -w "%{http_code}" https://#{USER}:#{PWD}@ci.opensuse.org/view/Yast/job/yast-#{mod}-master/ -o /dev/null` + response_code = `curl -sL -w "%{http_code}" https://#{USER}:#{PWD}@ci.opensuse.org/job/yast-#{mod}-master/ -o /dev/null` next if response_code == "200" FileUtils.rm_f "config.xml.tmp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/jenkins-tools/yast-jenkins-modify.rb new/yast2-devtools-3.1.12/jenkins-tools/yast-jenkins-modify.rb --- old/yast2-devtools-3.1.9/jenkins-tools/yast-jenkins-modify.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.12/jenkins-tools/yast-jenkins-modify.rb 2013-12-13 09:58:52.000000000 +0100 @@ -0,0 +1,30 @@ +#! /usr/bin/env ruby +require "fileutils" +require "yaml" + +# script for mass create of jobs in our jenkins +# credentials stored in jenkins.yml +# modify `config.xml` if needed ( git path will be automatic modify ) +# modify JOB_NAME_PATTERN before use to specify pattern of job to delete + +conf = YAML.load(File.read("jenkins.yml")) +USER = conf["user"] +PWD = conf["pwd"] + +# %s is replaced by arguments passed to program +JOB_NAME_PATTERN = "yast-%s-master" + +ARGV.each do |mod| + #test if module already exist + response_code = `curl -sL -w "%{http_code}" https://#{USER}:#{PWD}@ci.opensuse.org/job/yast-#{mod}-master/ -o /dev/null` + raise "module #{mod} do not exists" unless response_code == "200" + + FileUtils.rm_f "config.xml.tmp" + # now modify config.xml to fit given module + `sed 's/yast-.*\.git/yast-#{mod}.git/' config.xml > config.xml.tmp` + + # adress found from https://ci.opensuse.org/api + res = `curl -X POST https://#{USER}:#{PWD}@ci.opensuse.org/job/#{JOB_NAME_PATTERN % mod}/config.xml --header "Content-Type:application/xml" -d @config.xml.tmp` + puts "ERROR: #{res}" if $?.exitstatus != 0 + puts "ERROR: Wrong Credentials. \n #{res}" if res =~ /Authentication required/ +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/package/yast2-devtools.changes new/yast2-devtools-3.1.12/package/yast2-devtools.changes --- old/yast2-devtools-3.1.9/package/yast2-devtools.changes 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/package/yast2-devtools.changes 2013-12-13 09:58:52.000000000 +0100 @@ -1,4 +1,25 @@ ------------------------------------------------------------------- +Wed Dec 11 18:16:18 UTC 2013 - [email protected] + +- y2autoconf - in perl we need extra backslash escaping +- 3.1.12 + +------------------------------------------------------------------- +Wed Dec 11 14:32:06 UTC 2013 - [email protected] + +- use grep/sed instead of rpm for parsing spec files (rpm prints + the version for each subpackage, moreover it does some dependecy + resolving which might fail) +- 3.1.11 + +------------------------------------------------------------------- +Mon Dec 9 12:58:21 UTC 2013 - [email protected] + +- read the version directly from *.spec file (ignore the VERSION + files so they can be removed) +- 3.1.10 + +------------------------------------------------------------------- Tue Oct 15 11:13:39 UTC 2013 - [email protected] - y2automake: properly install required COPYING file from top diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/package/yast2-devtools.spec new/yast2-devtools-3.1.12/package/yast2-devtools.spec --- old/yast2-devtools-3.1.9/package/yast2-devtools.spec 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/package/yast2-devtools.spec 2013-12-13 09:58:52.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.9 +Version: 3.1.12 Release: 0 Url: http://github.com/yast/yast-devtools @@ -134,6 +134,7 @@ %{_datadir}/YaST2/clients/ycp2yml.rb %{_datadir}/YaST2/data/devtools/bin/check-textdomain %{_datadir}/YaST2/data/devtools/bin/check_icons +%{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck %{_datadir}/YaST2/data/devtools/bin/rny2rnc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/ytools/y2tool/Makefile.am new/yast2-devtools-3.1.12/ytools/y2tool/Makefile.am --- old/yast2-devtools-3.1.9/ytools/y2tool/Makefile.am 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/ytools/y2tool/Makefile.am 2013-12-13 09:58:52.000000000 +0100 @@ -5,12 +5,13 @@ pkgdatadir = @YAST2DEVTOOLS@/bin pkgdata_SCRIPTS = \ + check_icons \ check-textdomain \ + find-unused-published \ get-lib \ pot-spellcheck \ rny2rnc \ showy2log \ - tagversion \ - check_icons + tagversion EXTRA_DIST = $(pkgdata_SCRIPTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/ytools/y2tool/find-unused-published new/yast2-devtools-3.1.12/ytools/y2tool/find-unused-published --- old/yast2-devtools-3.1.9/ytools/y2tool/find-unused-published 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.12/ytools/y2tool/find-unused-published 2013-12-13 09:58:52.000000000 +0100 @@ -0,0 +1,43 @@ +#!/bin/bash +# Assist in API cleanup by finding published ("global") functions/variables +# that are not used by other code. +# + +usage() { + echo "Usage: + cd [a clean checkout of all yast repositories] + find-unused-published yast2/library/network/src/modules/NetworkPopup.rb" >&2 +} + + +# $1 YaST Module in Ruby, pathname +published() { + # lines like + # publish :function => :Add, :type => "boolean ()" + # transformed to + # Add + sed -n -e '/publish/s/[^>]*> :\([^,]*\),.*/\1/;T;p' "$1" +} + +# stdin: one identifier per line +# $1: namespace +find_unused() { + while read SYM; do + grep -E -r "$1(\.|::|->)$SYM" > /dev/null || echo $SYM + done +} + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + +if [ ! -f $1 ]; then + echo "ERROR: File '$1' do not exist" >&2 + usage + exit 2 +fi + +NAMESPACE="${1##*/}" +NAMESPACE="${NAMESPACE%.rb}" +published "$1" | find_unused "$NAMESPACE" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.9/ytools/y2tool/tagversion new/yast2-devtools-3.1.12/ytools/y2tool/tagversion --- old/yast2-devtools-3.1.9/ytools/y2tool/tagversion 2013-10-15 15:24:54.000000000 +0200 +++ new/yast2-devtools-3.1.12/ytools/y2tool/tagversion 2013-12-13 09:58:52.000000000 +0100 @@ -30,9 +30,9 @@ done p=`cat RPMNAME` -v=`cat VERSION | tr "." "_"` +v=`grep '^[[:space:]]*Version:' package/$p.spec | sed -e 's/Version:[[:space:]]*\([[:print:]]\+\)/\1/' | tr "." "_"` if [ -z "$p" -o -z "$v" ]; then - echo "Cannot find RPMNAME or VERSION in `pwd`" + echo "Cannot find RPMNAME or Version value in package/$p.spec in `pwd`" exit 1 fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
