Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-devtools for openSUSE:Factory checked in at 2021-04-23 17:50:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-devtools (Old) and /work/SRC/openSUSE:Factory/.yast2-devtools.new.12324 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-devtools" Fri Apr 23 17:50:31 2021 rev:101 rq:887239 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-devtools/yast2-devtools.changes 2020-11-23 16:26:12.720473839 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-devtools.new.12324/yast2-devtools.changes 2021-04-23 17:50:41.382800784 +0200 @@ -1,0 +2,8 @@ +Wed Apr 7 19:37:37 UTC 2021 - Dirk M??ller <[email protected]> + +- stop installing COPYING as documentation - it is already installed + in licensedir (bsc#1184897) +- spec file cleanups +- 4.4.0 + +------------------------------------------------------------------- @@ -6 +14 @@ -- 4.3.7 +- 4.2.7 Old: ---- yast2-devtools-4.2.7.tar.bz2 New: ---- yast2-devtools-4.4.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-devtools.spec ++++++ --- /var/tmp/diff_new_pack.kvSf12/_old 2021-04-23 17:50:41.854801596 +0200 +++ /var/tmp/diff_new_pack.kvSf12/_new 2021-04-23 17:50:41.854801596 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-devtools # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: yast2-devtools -Version: 4.2.7 +Version: 4.4.0 Release: 0 -URL: https://github.com/yast/yast-devtools Summary: YaST2 - Development Tools License: GPL-2.0-or-later Group: System/YaST - +URL: https://github.com/yast/yast-devtools Source0: %{name}-%{version}.tar.bz2 - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -35,9 +33,7 @@ BuildRequires: perl-XML-Writer BuildRequires: pkgconfig BuildRequires: sgml-skel - Requires: yast2-buildtools - BuildArch: noarch %description @@ -45,21 +41,14 @@ %package -n yast2-buildtools Summary: Minimal set of tools needed to build yast module -Group: System/YaST - -Requires: perl -Requires: perl-XML-Writer # we install our .pc under $prefix/share +Group: System/YaST Requires: autoconf Requires: automake Requires: gettext-tools +Requires: perl +Requires: perl-XML-Writer Requires: pkgconfig >= 0.16 - -%if 0%{?suse_version} <= 1230 -# extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem(%{rb_default_ruby_abi}:redcarpet) -%endif - Recommends: cmake # /usr/lib/YaST2/bin/ydoxygen needs it Recommends: doxygen @@ -79,12 +68,12 @@ %build make -f Makefile.cvs all -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make +%configure +%make_build %install -make install DESTDIR="%{buildroot}" -[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR="%{buildroot}" +%make_install +[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR=%{buildroot} for f in `find %{buildroot}%{_datadir}/applications/YaST2 -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} @@ -120,7 +109,7 @@ %dir %{_prefix}/lib/YaST2 %{_datadir}/cmake %dir %{_datadir}/YaST2 -%doc %{_datadir}/doc/packages/%{name} +%doc %{_docdir}/%{name} %dir %{_prefix}/lib/YaST2/bin %{_prefix}/lib/YaST2/bin/scrdoc %{_prefix}/lib/YaST2/bin/ycp_puttext ++++++ yast2-devtools-4.2.7.tar.bz2 -> yast2-devtools-4.4.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/.github/workflows/ci.yml new/yast2-devtools-4.4.0/.github/workflows/ci.yml --- old/yast2-devtools-4.2.7/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-devtools-4.4.0/.github/workflows/ci.yml 2021-04-21 11:08:36.000000000 +0200 @@ -0,0 +1,23 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-actions + +name: CI + +on: [push, pull_request] + +jobs: + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-cpp:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Package Build + run: yast-ci-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/.travis.yml new/yast2-devtools-4.4.0/.travis.yml --- old/yast2-devtools-4.2.7/.travis.yml 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-devtools-image . -script: - # the "yast-travis-cpp" script is included in the base yastdevel/cpp image - # see https://github.com/yast/docker-yast-cpp/blob/master/yast-travis-cpp - - docker run -it --privileged yast-devtools-image yast-travis-cpp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/Dockerfile new/yast2-devtools-4.4.0/Dockerfile --- old/yast2-devtools-4.2.7/Dockerfile 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-cpp:latest -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/README.md new/yast2-devtools-4.4.0/README.md --- old/yast2-devtools-4.2.7/README.md 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/README.md 2021-04-21 11:08:36.000000000 +0200 @@ -1,8 +1,9 @@ ## Yast Development Tools -Travis: [](https://travis-ci.org/yast/yast-devtools) -Jenkins: [](https://ci.opensuse.org/view/Yast/job/yast-devtools-master/) - +[]( +https://github.com/yast/yast-devtools/actions?query=branch%3Amaster) +[]( +https://ci.opensuse.org/view/Yast/job/yast-yast-devtools-master/) ## Directory Structure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/build-tools/Makefile.am.toplevel new/yast2-devtools-4.4.0/build-tools/Makefile.am.toplevel --- old/yast2-devtools-4.2.7/build-tools/Makefile.am.toplevel 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/build-tools/Makefile.am.toplevel 2021-04-21 11:08:36.000000000 +0200 @@ -14,9 +14,6 @@ SUBDIRS_FILE = $(shell test -e $(srcdir)/SUBDIRS && echo SUBDIRS) ACINCLUDE_FILE = $(shell test -e $(srcdir)/acinclude.m4 && echo acinclude.m4) -COPYRIGHT_files = COPYING -doc_DATA = $(COPYRIGHT_files) - # do we do Makefile.am for devtools? It is a little special... IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME)) @@ -46,8 +43,7 @@ -type f -name "*.pot") EXTRA_DIST = \ - RPMNAME MAINTAINER configure.in.in \ - $(COPYRIGHT_files) \ + RPMNAME MAINTAINER COPYING configure.in.in \ $(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-4.2.7/package/yast2-devtools.changes new/yast2-devtools-4.4.0/package/yast2-devtools.changes --- old/yast2-devtools-4.2.7/package/yast2-devtools.changes 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/package/yast2-devtools.changes 2021-04-21 11:08:36.000000000 +0200 @@ -1,9 +1,17 @@ ------------------------------------------------------------------- +Wed Apr 7 19:37:37 UTC 2021 - Dirk M??ller <[email protected]> + +- stop installing COPYING as documentation - it is already installed + in licensedir (bsc#1184897) +- spec file cleanups +- 4.4.0 + +------------------------------------------------------------------- Sun Oct 4 19:26:07 UTC 2020 - Josef Reidinger <[email protected]> - Adapt appstream builder to changes in control center (related to (fate#319035) ( thanks to Stasiek Michalski) -- 4.3.7 +- 4.2.7 ------------------------------------------------------------------- Tue May 5 13:20:44 UTC 2020 - Stefan Hundhammer <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/package/yast2-devtools.spec new/yast2-devtools-4.4.0/package/yast2-devtools.spec --- old/yast2-devtools-4.2.7/package/yast2-devtools.spec 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/package/yast2-devtools.spec 2021-04-21 11:08:36.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-devtools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: yast2-devtools -Version: 4.2.7 +Version: 4.4.0 Release: 0 -Url: https://github.com/yast/yast-devtools Summary: YaST2 - Development Tools License: GPL-2.0-or-later Group: System/YaST - +URL: https://github.com/yast/yast-devtools Source0: %{name}-%{version}.tar.bz2 - BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -35,30 +33,21 @@ BuildRequires: perl-XML-Writer BuildRequires: pkgconfig BuildRequires: sgml-skel - Requires: yast2-buildtools - BuildArch: noarch %description Scripts and templates for developing YaST2 modules and components. %package -n yast2-buildtools -Summary: Minimal set of tools needed to build yast module - -Requires: perl -Requires: perl-XML-Writer +Summary: Minimal set of tools needed to build yast module # we install our .pc under $prefix/share Requires: autoconf Requires: automake Requires: gettext-tools +Requires: perl +Requires: perl-XML-Writer Requires: pkgconfig >= 0.16 - -%if 0%{?suse_version} <= 1230 -# extra package for yard Markdown formatting in openSUSE <= 12.3 -Requires: rubygem(%{rb_default_ruby_abi}:redcarpet) -%endif - Recommends: cmake # /usr/lib/YaST2/bin/ydoxygen needs it Recommends: doxygen @@ -78,12 +67,12 @@ %build make -f Makefile.cvs all -./configure --prefix=%{_prefix} --libdir=%{_libdir} -make +%configure +%make_build %install -make install DESTDIR="%{buildroot}" -[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR="%{buildroot}" +%make_install +[ -e "%{_datadir}/YaST2/data/devtools/NO_MAKE_CHECK" ] || Y2DIR="%{buildroot}%{_datadir}/YaST2" make check DESTDIR=%{buildroot} for f in `find %{buildroot}%{_datadir}/applications/YaST2 -name "*.desktop"` ; do d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} @@ -119,7 +108,7 @@ %dir %{_prefix}/lib/YaST2 %{_datadir}/cmake %dir %{_datadir}/YaST2 -%doc %{_datadir}/doc/packages/%{name} +%doc %{_docdir}/%{name} %dir %{_prefix}/lib/YaST2/bin %{_prefix}/lib/YaST2/bin/scrdoc %{_prefix}/lib/YaST2/bin/ycp_puttext diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-devtools-4.2.7/ytools/yast2/create_maintenance_branch new/yast2-devtools-4.4.0/ytools/yast2/create_maintenance_branch --- old/yast2-devtools-4.2.7/ytools/yast2/create_maintenance_branch 2020-11-13 11:07:18.000000000 +0100 +++ new/yast2-devtools-4.4.0/ytools/yast2/create_maintenance_branch 2021-04-21 11:08:36.000000000 +0200 @@ -67,7 +67,7 @@ def already_exists? res = Cheetah.run "git", "branch", "-r", stdout: :capture - res = res.lines + res = res.lines.map{|l| l.chomp } !res.grep(/origin\/#{BRANCH_NAME}\z/).empty? end @@ -126,6 +126,19 @@ File.write("Dockerfile", lines.join("")) end +def modify_github_actions + image_path = TARGET.sub(/sp/, "/sp").sub(/sle/, "sle-") + + Dir[".github/workflows/*.{yml,yaml}"].map do |file| + content = File.read(file) + content.gsub!( + "registry.opensuse.org/yast/head/containers/yast-", + "registry.opensuse.org/yast/#{image_path}/containers/yast-" + ) + File.write(file, content) + end +end + check_real_upstream if already_exists? @@ -143,8 +156,9 @@ modify_rakefile modify_dockerfile +modify_github_actions -commit_msg = "Adapt Rakefile and Dockerfile for #{BRANCH_NAME}" +commit_msg = "Adapt Rakefile and GitHub Actions for #{BRANCH_NAME}" if DRY_RUN puts "Dry run mode active, run these commands to manually push the changes:"
