Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2014-09-07 11:10:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06-18 10:59:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2014-09-07 11:10:05.000000000 +0200 @@ -1,0 +2,30 @@ +Fri Sep 5 12:51:57 UTC 2014 - mvid...@suse.com + +- Merged git and IBS +- 3.1.24 + +------------------------------------------------------------------- +Fri Sep 5 07:02:54 UTC 2014 - jreidin...@suse.com + +- create_maintenance_branch: fix build target for SLE-12 branch +- 3.1.23 + +------------------------------------------------------------------- +Thu Sep 4 13:19:11 UTC 2014 - jreidin...@suse.com + +- add tool for easy creation of maintenance branches to ytools +- 3.1.22 + +------------------------------------------------------------------- +Thu Sep 4 12:18:27 UTC 2014 - mvid...@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.21 + +------------------------------------------------------------------- +Fri Jul 18 14:35:20 UTC 2014 - mrueck...@suse.de + +- switch to rubygem() based buildrequires so we can easily switch + the ruby version. + +------------------------------------------------------------------- @@ -2037 +2067 @@ -Thu Sep 5 12:07:50 CEST 2002 +Thu Sep 5 12:07:50 CEST 2002 - k...@suse.de Old: ---- yast2-devtools-3.1.20.tar.bz2 New: ---- yast2-devtools-3.1.24.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.6dwd3w/_old 2014-09-07 11:10:06.000000000 +0200 +++ /var/tmp/diff_new_pack.6dwd3w/_new 2014-09-07 11:10:06.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.20 +Version: 3.1.24 Release: 0 Url: http://github.com/yast/yast-devtools @@ -56,11 +56,11 @@ Requires: gettext-tools Requires: pkgconfig >= 0.16 # for building Ruby autodocs -Requires: rubygem-yard +Requires: rubygem(yard) %if 0%{?suse_version} <= 1230 # extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem-redcarpet +Requires: rubygem(redcarpet) %endif Recommends: cmake @@ -70,7 +70,7 @@ Recommends: libtool # for extracting translatable strings from *.rb files using "make pot" command # weak dependency, "make pot" is usually not needed -Suggests: rubygem-gettext +Suggests: rubygem(gettext) %description -n yast2-buildtools Scripts and templates required for rebuilding the existing YaST2 @@ -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/create_maintenance_branch %{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck ++++++ yast2-devtools-3.1.20.tar.bz2 -> yast2-devtools-3.1.24.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/.travis.yml new/yast2-devtools-3.1.24/.travis.yml --- old/yast2-devtools-3.1.20/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.24/.travis.yml 2014-09-05 15:04:22.000000000 +0200 @@ -0,0 +1,13 @@ +language: cpp +compiler: + - gcc +# install additional packages +# http://docs.travis-ci.com/user/installing-dependencies/ +before_install: + - sudo apt-get update -qq + - sudo apt-get install -y docbook-xsl xsltproc +script: + - make -f Makefile.cvs + - make + - sudo make install + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/README.md new/yast2-devtools-3.1.24/README.md --- old/yast2-devtools-3.1.20/README.md 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/README.md 2014-09-05 15:04:22.000000000 +0200 @@ -1,3 +1,8 @@ +## Yast Development Tools + +[](https://travis-ci.org/yast/yast-devtools) + + ## Directory Structure ### [ytools](ytools) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/package/yast2-devtools.changes new/yast2-devtools-3.1.24/package/yast2-devtools.changes --- old/yast2-devtools-3.1.20/package/yast2-devtools.changes 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/package/yast2-devtools.changes 2014-09-05 15:04:22.000000000 +0200 @@ -1,4 +1,34 @@ ------------------------------------------------------------------- +Fri Sep 5 12:51:57 UTC 2014 - mvid...@suse.com + +- Merged git and IBS +- 3.1.24 + +------------------------------------------------------------------- +Fri Sep 5 07:02:54 UTC 2014 - jreidin...@suse.com + +- create_maintenance_branch: fix build target for SLE-12 branch +- 3.1.23 + +------------------------------------------------------------------- +Thu Sep 4 13:19:11 UTC 2014 - jreidin...@suse.com + +- add tool for easy creation of maintenance branches to ytools +- 3.1.22 + +------------------------------------------------------------------- +Thu Sep 4 12:18:27 UTC 2014 - mvid...@suse.com + +- Use a more flexible rubygem requirement syntax (bnc#895069) +- 3.1.21 + +------------------------------------------------------------------- +Fri Jul 18 14:35:20 UTC 2014 - mrueck...@suse.de + +- switch to rubygem() based buildrequires so we can easily switch + the ruby version. + +------------------------------------------------------------------- Fri Jun 6 14:32:01 CEST 2014 - loci...@suse.com - gettextdomains: added support for single quotes around @@ -2034,7 +2064,7 @@ - Update to version 2.6.11. ------------------------------------------------------------------- -Thu Sep 5 12:07:50 CEST 2002 +Thu Sep 5 12:07:50 CEST 2002 - k...@suse.de - devtools/devtools/admin/all-packages: add yast2-trans-da. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/package/yast2-devtools.spec new/yast2-devtools-3.1.24/package/yast2-devtools.spec --- old/yast2-devtools-3.1.20/package/yast2-devtools.spec 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/package/yast2-devtools.spec 2014-09-05 15:04:22.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.20 +Version: 3.1.24 Release: 0 Url: http://github.com/yast/yast-devtools @@ -55,11 +55,11 @@ Requires: gettext-tools Requires: pkgconfig >= 0.16 # for building Ruby autodocs -Requires: rubygem-yard +Requires: rubygem(yard) %if 0%{?suse_version} <= 1230 # extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem-redcarpet +Requires: rubygem(redcarpet) %endif Recommends: cmake @@ -69,7 +69,7 @@ Recommends: libtool # for extracting translatable strings from *.rb files using "make pot" command # weak dependency, "make pot" is usually not needed -Suggests: rubygem-gettext +Suggests: rubygem(gettext) %description -n yast2-buildtools @@ -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/create_maintenance_branch %{_datadir}/YaST2/data/devtools/bin/find-unused-published %{_datadir}/YaST2/data/devtools/bin/get-lib %{_datadir}/YaST2/data/devtools/bin/pot-spellcheck diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/ytools/yast2/Makefile.am new/yast2-devtools-3.1.24/ytools/yast2/Makefile.am --- old/yast2-devtools-3.1.20/ytools/yast2/Makefile.am 2014-06-06 14:49:28.000000000 +0200 +++ new/yast2-devtools-3.1.24/ytools/yast2/Makefile.am 2014-09-05 15:04:22.000000000 +0200 @@ -4,7 +4,7 @@ # bnc#396315 pkgdatadir = @YAST2DEVTOOLS@/bin -pkgdata_SCRIPTS = ycp_puttext +pkgdata_SCRIPTS = ycp_puttext create_maintenance_branch install-data-local: ln -snf $(pkgdatadir)/ycp_puttext $(DESTDIR)$(ybindir) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.20/ytools/yast2/create_maintenance_branch new/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch --- old/yast2-devtools-3.1.20/ytools/yast2/create_maintenance_branch 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.24/ytools/yast2/create_maintenance_branch 2014-09-05 15:04:22.000000000 +0200 @@ -0,0 +1,91 @@ +#!/usr/bin/env ruby + +# - Create maintenance branch BRANCH_NAME +# - Edit Rakefile to build and submit to corresponding projects +# - Commit and push + +# constants for tuning script to create desired branch +BRANCH_NAME="SLE-12-GA" +USE_IBS=true +DEVEL_PROJECT="Devel:YaST:SLE-12" +TARGET_PROJECT="SUSE:SLE-12:GA" +BUILD_TARGET="SLE_12" + +# start of non-configuration part +CONF_OPTIONS = { + "obs_project" => DEVEL_PROJECT, + "obs_sr_project" => TARGET_PROJECT, + "obs_target" => BUILD_TARGET, + "obs_api" => USE_IBS ? "https://api.suse.de/"; : "https://api.opensuse.org"; +} + +require "cheetah" + +# by default pass output of commands to stdout and stderr +Cheetah.default_options = { :stdout => STDOUT, :stderr => STDERR } + +def check_real_upstream + res = Cheetah.run "git", "remote", "-v", :stdout => :capture + if res.grep(/origin\s*g...@github.com:yast/).empty? + raise "This script can work only on upstream clone, where upstream remote is marked as origin" + end +end + +def already_exists? + res = Cheetah.run "git", "branch", "-r", :stdout => :capture + res = res.lines + return !res.grep(/origin\/#{BRANCH_NAME}/).empty? +end + +def modify_rakefile + raise "Cannot find Rakefile in pwd" unless File.exist?("Rakefile") + + lines = File.readlines("Rakefile") + conf_line = lines.grep(/Yast::Tasks.configuration do/).first + if conf_line + conf_var = conf_line[/do \|\s*(\S+)\s*\|/, 1] + line_index = lines.index(conf_line) + else + line_index = 2 + conf_var = "conf" + conf_line = "Yast::Tasks.configuration do |#{conf_var}|\n" + lines.insert(line_index, conf_line, "end\n") + end + + CONF_OPTIONS.each do |key, value| + config_line = lines.grep(/#{conf_var}\.#{key}\s*=/).first + new_line = " #{conf_var}.#{key} = #{value.inspect}\n" + if config_line + lines[lines.index[config_line]] = new_line + else + lines.insert(line_index + 1, new_line) + end + end + + File.write("Rakefile", lines.join("")) +end + +check_real_upstream + +if already_exists? + puts "already exists, skipping" + exit 0 +end + +#switch to master branch +Cheetah.run "git", "checkout", "master" + +#create new branch ( ensure we use the latest non modified pushed version ) +Cheetah.run "git", "fetch", "origin" +Cheetah.run "git", "branch", BRANCH_NAME, "origin/master" +Cheetah.run "git", "checkout", BRANCH_NAME + +modify_rakefile + +commit_msg = "adapt Rakefile to submit to correct build service project in maintenance branch #{BRANCH_NAME}" + +Cheetah.run "git", "commit", "-m", commit_msg, "Rakefile" + +Cheetah.run "git", "push", "--set-upstream", "origin", BRANCH_NAME + +puts "Maintenance branch properly created" -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
