Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2014-10-11 19:25:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-09-07 11:10:05.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2014-10-11 19:25:57.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Sep 23 09:25:35 UTC 2014 - [email protected] + +- Do not read (and have ./configure evaluate) the MAINTAINER file. +- 3.1.25 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.24.tar.bz2 New: ---- yast2-devtools-3.1.25.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.HXSqZX/_old 2014-10-11 19:25:58.000000000 +0200 +++ /var/tmp/diff_new_pack.HXSqZX/_new 2014-10-11 19:25:58.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.24 +Version: 3.1.25 Release: 0 Url: http://github.com/yast/yast-devtools ++++++ yast2-devtools-3.1.24.tar.bz2 -> yast2-devtools-3.1.25.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/MAINTAINER new/yast2-devtools-3.1.25/MAINTAINER --- old/yast2-devtools-3.1.24/MAINTAINER 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/MAINTAINER 2014-10-08 14:48:11.000000000 +0200 @@ -1 +1 @@ -Martin Vidner <[email protected]> +Deprecated file. Use `osc maintainer yast2-devtools` instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/build-tools/aclocal/y2autoconf.m4 new/yast2-devtools-3.1.25/build-tools/aclocal/y2autoconf.m4 --- old/yast2-devtools-3.1.24/build-tools/aclocal/y2autoconf.m4 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/build-tools/aclocal/y2autoconf.m4 2014-10-08 14:48:11.000000000 +0200 @@ -7,7 +7,6 @@ RPMNAME=`cat RPMNAME` VERSION=`cat VERSION` -MAINTAINER=`cat MAINTAINER` AC_INIT($RPMNAME, $VERSION, http://bugs.opensuse.org/, $RPMNAME) @@ -23,7 +22,6 @@ dnl Important YaST2 variables AC_SUBST(VERSION) AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/build-tools/scripts/y2autoconf new/yast2-devtools-3.1.25/build-tools/scripts/y2autoconf --- old/yast2-devtools-3.1.24/build-tools/scripts/y2autoconf 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/build-tools/scripts/y2autoconf 2014-10-08 14:48:11.000000000 +0200 @@ -7,7 +7,6 @@ #Available macros in the configure.ac.in: # @RPMNAME@ - reads it from file RPMNAME # @VERSION@ - reads it from package/*.spec file -# @MAINTAINER@ - reads it from file MAINTAINER # # @YAST2-INIT-COMMON@ - Initialization. The generated configure.ac # will not work without it (or its equivalent) @@ -42,9 +41,6 @@ $VERSION = `grep -m 1 '^[[: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 # honor SUBDIRS in Makefiles.am and that messes with the skeletons @@ -88,7 +84,6 @@ # common variables '@RPMNAME@' => $RPMNAME, '@VERSION@' => $VERSION, - '@MAINTAINER@' => $MAINTAINER, # init: common stuff '@YAST2-INIT-COMMON@' => @@ -109,7 +104,6 @@ dnl Important YaST2 variables VERSION=\"$VERSION\" RPMNAME=\"$RPMNAME\" -MAINTAINER=\"$MAINTAINER\" ". ' dnl pkgconfig honors lib64 pkgconfigdir=\${libdir}/pkgconfig @@ -144,7 +138,6 @@ AC_SUBST(VERSION) AC_SUBST(RPMNAME) -AC_SUBST(MAINTAINER) AC_SUBST(pkgconfigdir) AC_SUBST(pkgconfigdatadir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/build-tools/scripts/y2automake new/yast2-devtools-3.1.25/build-tools/scripts/y2automake --- old/yast2-devtools-3.1.24/build-tools/scripts/y2automake 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/build-tools/scripts/y2automake 2014-10-08 14:48:11.000000000 +0200 @@ -54,7 +54,7 @@ RPMNAME=`cat ./RPMNAME` -if [ ! -e MAINTAINER ]; then +if [ ! -e RPMNAME ]; 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.24/jenkins-tools/config.xml new/yast2-devtools-3.1.25/jenkins-tools/config.xml --- old/yast2-devtools-3.1.24/jenkins-tools/config.xml 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/jenkins-tools/config.xml 2014-10-08 14:48:11.000000000 +0200 @@ -2,6 +2,12 @@ <project> <actions/> <description/> + <logRotator class="hudson.tasks.LogRotator"> + <daysToKeep>-1</daysToKeep> + <numToKeep>3</numToKeep> + <artifactDaysToKeep>-1</artifactDaysToKeep> + <artifactNumToKeep>-1</artifactNumToKeep> + </logRotator> <keepDependencies>false</keepDependencies> <properties/> <scm class="hudson.plugins.git.GitSCM" plugin="[email protected]"> @@ -48,4 +54,4 @@ </hudson.tasks.Mailer> </publishers> <buildWrappers/> -</project> \ No newline at end of file +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-create.rb new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-create.rb --- old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-create.rb 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-create.rb 2014-10-08 14:48:11.000000000 +0200 @@ -10,13 +10,15 @@ conf = YAML.load(File.read("jenkins.yml")) USER = conf["user"] PWD = conf["pwd"] +URL_BASE = "https://#{USER}:#{PWD}@ci.opensuse.org"; +#URL_BASE = "http://river.suse.de"; # %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` + response_code = `curl -sL -w "%{http_code}" #{URL_BASE}/job/#{JOB_NAME_PATTERN % mod}/ -o /dev/null` next if response_code == "200" FileUtils.rm_f "config.xml.tmp" @@ -24,7 +26,7 @@ `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/createItem?name=#{JOB_NAME_PATTERN % mod} --header "Content-Type:application/xml" -d @config.xml.tmp` + res = `curl -X POST #{URL_BASE}/createItem?name=#{JOB_NAME_PATTERN % mod} --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.24/jenkins-tools/yast-jenkins-delete.rb new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-delete.rb --- old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-delete.rb 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-delete.rb 2014-10-08 14:48:11.000000000 +0200 @@ -8,10 +8,12 @@ conf = YAML.load(File.read("jenkins.yml")) USER = conf["user"] PWD = conf["pwd"] +URL_BASE = "https://#{USER}:#{PWD}@ci.opensuse.org"; +#URL_BASE = "http://river.suse.de"; # %s is replaced by arguments passed to program JOB_NAME_PATTERN = "yast-%s-test" ARGV.each do |mod| # address to delete from http://jenkins-ci.361315.n4.nabble.com/Deleting-a-job-through-the-Remote-API-td3622851.html - `curl -X POST https://#{USER}:#{PWD}@ci.opensuse.org/job/#{JOB_NAME_PATTERN % mod}/doDelete` + `curl -X POST #{URL_BASE}/job/#{JOB_NAME_PATTERN % mod}/doDelete` end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-list-jobs.rb new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-list-jobs.rb --- old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-list-jobs.rb 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-list-jobs.rb 2014-10-08 14:48:11.000000000 +0200 @@ -7,6 +7,7 @@ #test if module already exist all_modules = `curl -sL http://ci.opensuse.org/view/Yast/api/xml` +#all_modules = `curl -sL http://river.suse.de/view/YaST/api/xml` raise "module list cannot load" if $?.exitstatus != 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-modify.rb new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-modify.rb --- old/yast2-devtools-3.1.24/jenkins-tools/yast-jenkins-modify.rb 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/jenkins-tools/yast-jenkins-modify.rb 2014-10-08 14:48:11.000000000 +0200 @@ -14,9 +14,12 @@ # %s is replaced by arguments passed to program JOB_NAME_PATTERN = "yast-%s-master" +URL_BASE = "https://#{USER}:#{PWD}@ci.opensuse.org"; +#URL_BASE = "http://river.suse.de"; + 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` + response_code = `curl -sL -w "%{http_code}" #{URL_BASE}/job/#{JOB_NAME_PATTERN % mod}/ -o /dev/null` raise "module #{mod} do not exists" unless response_code == "200" FileUtils.rm_f "config.xml.tmp" @@ -24,7 +27,7 @@ `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` + res = `curl -X POST #{URL_BASE}/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.24/package/yast2-devtools.changes new/yast2-devtools-3.1.25/package/yast2-devtools.changes --- old/yast2-devtools-3.1.24/package/yast2-devtools.changes 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/package/yast2-devtools.changes 2014-10-08 14:48:11.000000000 +0200 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Sep 23 09:25:35 UTC 2014 - [email protected] + +- Do not read (and have ./configure evaluate) the MAINTAINER file. +- 3.1.25 + +------------------------------------------------------------------- Fri Sep 5 12:51:57 UTC 2014 - [email protected] - Merged git and IBS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/package/yast2-devtools.spec new/yast2-devtools-3.1.25/package/yast2-devtools.spec --- old/yast2-devtools-3.1.24/package/yast2-devtools.spec 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/package/yast2-devtools.spec 2014-10-08 14:48:11.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.24 +Version: 3.1.25 Release: 0 Url: http://github.com/yast/yast-devtools diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch new/yast2-devtools-3.1.25/ytools/yast2/create_maintenance_branch --- old/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch 2014-09-05 15:04:22.000000000 +0200 +++ new/yast2-devtools-3.1.25/ytools/yast2/create_maintenance_branch 2014-10-08 14:48:11.000000000 +0200 @@ -8,7 +8,7 @@ BRANCH_NAME="SLE-12-GA" USE_IBS=true DEVEL_PROJECT="Devel:YaST:SLE-12" -TARGET_PROJECT="SUSE:SLE-12:GA" +TARGET_PROJECT="SUSE:SLE-12:Update:Test" BUILD_TARGET="SLE_12" # start of non-configuration part @@ -26,7 +26,7 @@ def check_real_upstream res = Cheetah.run "git", "remote", "-v", :stdout => :capture - if res.grep(/origin\s*[email protected]:yast/).empty? + if res.lines.grep(/origin\s*[email protected]:yast/).empty? raise "This script can work only on upstream clone, where upstream remote is marked as origin" end end -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
