Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2013-10-14 09:33:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-06 19:37:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new/yast2-devtools.changes 2013-10-14 09:33:03.000000000 +0200 @@ -1,0 +2,14 @@ +Wed Oct 9 15:11:45 UTC 2013 - jreidin...@suse.com + +- cmake module: read VERSION instead of VERSION.cmake to be + consistent across all packages +- 3.1.6 + +------------------------------------------------------------------- +Tue Oct 8 14:05:02 UTC 2013 - jreidin...@suse.com + +- rpm macros: Use "%configure" to properly configure also + sysconfdir and sbindir +- 3.1.5 + +------------------------------------------------------------------- Old: ---- yast2-devtools-3.1.4.tar.bz2 New: ---- yast2-devtools-3.1.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.YOikjj/_old 2013-10-14 09:33:04.000000000 +0200 +++ /var/tmp/diff_new_pack.YOikjj/_new 2013-10-14 09:33:04.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.4 +Version: 3.1.6 Release: 0 Url: http://github.com/yast/yast-devtools ++++++ yast2-devtools-3.1.4.tar.bz2 -> yast2-devtools-3.1.6.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/Rakefile new/yast2-devtools-3.1.6/Rakefile --- old/yast2-devtools-3.1.4/Rakefile 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/Rakefile 2013-10-11 16:21:53.000000000 +0200 @@ -1,6 +1,6 @@ require "yast/rake" -Packaging.configuration do |conf| +Yast::Tasks.configuration do |conf| #lets ignore license check for now conf.skip_license_check << /.*/ end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/VERSION new/yast2-devtools-3.1.6/VERSION --- old/yast2-devtools-3.1.4/VERSION 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/VERSION 2013-10-11 16:21:53.000000000 +0200 @@ -1 +1 @@ -3.1.4 +3.1.6 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/devtools/cmake/modules/YastCommon.cmake new/yast2-devtools-3.1.6/devtools/cmake/modules/YastCommon.cmake --- old/yast2-devtools-3.1.4/devtools/cmake/modules/YastCommon.cmake 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/devtools/cmake/modules/YastCommon.cmake 2013-10-11 16:21:53.000000000 +0200 @@ -50,8 +50,7 @@ ENDIF (NOT DEFINED RPMNAME) MESSAGE(STATUS "package name set to '${RPMNAME}'") -INCLUDE(${CMAKE_SOURCE_DIR}/VERSION.cmake) -SET ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" ) +file (STRINGS ${CMAKE_SOURCE_DIR}/VERSION VERSION) INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}) @@ -156,13 +155,7 @@ "Makefile\\\\.in$" ) - #SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Novell's package management core engine.") SET(CPACK_PACKAGE_VENDOR "Novell Inc.") - #SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") - #SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") - #SET(CPACK_PACKAGE_VERSION_MAJOR ${version_major}) - #SET(CPACK_PACKAGE_VERSION_MINOR ${version_minor}) - #SET(CPACK_PACKAGE_VERSION_PATCH ${version_patch}) SET( CPACK_GENERATOR "TBZ2") SET( CPACK_SOURCE_GENERATOR "TBZ2") SET( CPACK_SOURCE_PACKAGE_FILE_NAME "${PACKAGE}-${VERSION}" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/devtools/rpm/macros.yast new/yast2-devtools-3.1.6/devtools/rpm/macros.yast --- old/yast2-devtools-3.1.4/devtools/rpm/macros.yast 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/devtools/rpm/macros.yast 2013-10-11 16:21:53.000000000 +0200 @@ -36,14 +36,14 @@ export CFLAGS="$RPM_OPT_FLAGS -DNDEBUG" \ export CXXFLAGS="$RPM_OPT_FLAGS -DNDEBUG" \ \ - ./configure --libdir=%{_libdir} --prefix=%{_prefix} --mandir=%{_mandir} \ + %configure \ # V=1: verbose build in case we used AM_SILENT_RULES(yes) \ # so that RPM_OPT_FLAGS check works \ make %{?jobs:-j%jobs} V=1 # install the yast module using autotools/make %yast_install \ - make install DESTDIR="$RPM_BUILD_ROOT" \ + %make_install \ if [ ! -f "%{yast_ydatadir}/devtools/NO_MAKE_CHECK" ]; then \ make check \\\ VERBOSE=1 \\\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/jenkins-tools/README.md new/yast2-devtools-3.1.6/jenkins-tools/README.md --- old/yast2-devtools-3.1.4/jenkins-tools/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.6/jenkins-tools/README.md 2013-10-11 16:21:53.000000000 +0200 @@ -0,0 +1,12 @@ +Jenkins tools are intended to help with mass operations +on <http://ci.opensuse.org/> + +They are not intended to be distributed in a RPM. +Usage requires reading the source code of each tool. Configuration is partly +done directly in the source. +If you can do your task quicker than reading the script +then it is not the right tool for you. + +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. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/jenkins-tools/config.xml new/yast2-devtools-3.1.6/jenkins-tools/config.xml --- old/yast2-devtools-3.1.4/jenkins-tools/config.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.6/jenkins-tools/config.xml 2013-10-11 16:21:53.000000000 +0200 @@ -0,0 +1,65 @@ +<?xml version='1.0' encoding='UTF-8'?> +<project> + <actions/> + <description></description> + <keepDependencies>false</keepDependencies> + <properties/> + <scm class="hudson.plugins.git.GitSCM" plugin="git@1.5.0"> + <configVersion>2</configVersion> + <userRemoteConfigs> + <hudson.plugins.git.UserRemoteConfig> + <name></name> + <refspec></refspec> + <url>https://github.com/yast/yast-core.git</url> + </hudson.plugins.git.UserRemoteConfig> + </userRemoteConfigs> + <branches> + <hudson.plugins.git.BranchSpec> + <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> + </scm> + <assignedNode>yast-jenkins</assignedNode> + <canRoam>false</canRoam> + <disabled>false</disabled> + <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding> + <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding> + <triggers> + <hudson.triggers.SCMTrigger> + <spec>H/5 * * * *</spec> + <ignorePostCommitHooks>false</ignorePostCommitHooks> + </hudson.triggers.SCMTrigger> + </triggers> + <concurrentBuild>false</concurrentBuild> + <builders> + <hudson.tasks.Shell> + <command> +cd $WORKSPACE; rake osc:commit; cd - + </command> + </hudson.tasks.Shell> + </builders> + <publishers/> + <buildWrappers/> +</project> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/jenkins-tools/jenkins.yml.template new/yast2-devtools-3.1.6/jenkins-tools/jenkins.yml.template --- old/yast2-devtools-3.1.4/jenkins-tools/jenkins.yml.template 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.6/jenkins-tools/jenkins.yml.template 2013-10-11 16:21:53.000000000 +0200 @@ -0,0 +1,2 @@ +user: <jenkins_username> +pwd: <jenkins_password> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/jenkins-tools/yast-jenkins-create.rb new/yast2-devtools-3.1.6/jenkins-tools/yast-jenkins-create.rb --- old/yast2-devtools-3.1.4/jenkins-tools/yast-jenkins-create.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.6/jenkins-tools/yast-jenkins-create.rb 2013-10-11 16:21:53.000000000 +0200 @@ -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/view/Yast/job/yast-#{mod}-master/ -o /dev/null` + next if 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/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.4/jenkins-tools/yast-jenkins-delete.rb new/yast2-devtools-3.1.6/jenkins-tools/yast-jenkins-delete.rb --- old/yast2-devtools-3.1.4/jenkins-tools/yast-jenkins-delete.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-3.1.6/jenkins-tools/yast-jenkins-delete.rb 2013-10-11 16:21:53.000000000 +0200 @@ -0,0 +1,17 @@ +#! /usr/bin/env ruby +# script for mass delete of jobs in our jenkins +# credentials stored in jenkins.yml +# modify JOB_NAME_PATTERN before use to specify pattern of job to delete + +require "yaml" + +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-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` +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/package/yast2-devtools.changes new/yast2-devtools-3.1.6/package/yast2-devtools.changes --- old/yast2-devtools-3.1.4/package/yast2-devtools.changes 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/package/yast2-devtools.changes 2013-10-11 16:21:53.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Wed Oct 9 15:11:45 UTC 2013 - jreidin...@suse.com + +- cmake module: read VERSION instead of VERSION.cmake to be + consistent across all packages +- 3.1.6 + +------------------------------------------------------------------- +Tue Oct 8 14:05:02 UTC 2013 - jreidin...@suse.com + +- rpm macros: Use "%configure" to properly configure also + sysconfdir and sbindir +- 3.1.5 + +------------------------------------------------------------------- Wed Oct 2 12:14:30 UTC 2013 - mvid...@suse.com - rpm macros: Use "make check VERBOSE=1" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-3.1.4/package/yast2-devtools.spec new/yast2-devtools-3.1.6/package/yast2-devtools.spec --- old/yast2-devtools-3.1.4/package/yast2-devtools.spec 2013-10-02 16:02:42.000000000 +0200 +++ new/yast2-devtools-3.1.6/package/yast2-devtools.spec 2013-10-11 16:21:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-devtools -Version: 3.1.4 +Version: 3.1.5 Release: 0 Url: http://github.com/yast/yast-devtools -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
